From 3eb6c5917fce0e31b08c73f180b97494302c0518 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 02 六月 2022 13:58:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 8 ++++++++
WebAPI/Controllers/WebAPIController.cs | 2 +-
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 2 ++
3 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index e95380d..7fc3709 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -406,6 +406,10 @@
{
omodel.Kf_OtherInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_MustQtyCtl")
+ {
+ omodel.Kf_OtherInBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//其他出库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_AutoCheck")
{
@@ -423,6 +427,10 @@
{
omodel.Kf_OtherOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_MustQtyCtl")
+ {
+ omodel.Kf_OtherOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//调拨单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_AutoCheck")
{
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index c920232..92fa632 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -98,12 +98,14 @@
public string Kf_OtherInBill_MustQtyCtl;
public string Kf_OtherInBill_BarCodeMustSameSourceBill; // 条码必须同源单一致
public string Kf_OtherInBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
+ public string Kf_OtherInBillCheck_MustQtyCtl; //校验数量控制
//其他出库
public string Kf_OtherOutBill_AutoCheck;
public string Kf_OtherOutBill_ERPMode;
public string Kf_OtherOutBill_MustQtyCtl;
public string Kf_OtherOutBill_BarCodeMustSameSourceBill; // 条码必须同源单一致
public string Kf_OtherOutBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
+ public string Kf_OtherOutBillCheck_MustQtyCtl; //校验数量控制
//调拨
public string Kf_MoveStockBill_AutoCheck;
public string Kf_MoveStockBill_ERPMode;
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index bdd2421..dfa6370 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1234,7 +1234,7 @@
//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
if (sWhere != "")
{
- sWhere = sWhere + " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
+ sWhere = " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
}
try
{
--
Gitblit v1.9.1