From 3efb1daac3a9d4b5c8436059f3480dd539979ba5 Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期日, 24 七月 2022 09:43:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 8 ++++++++
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 2 ++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index d313bbe..e9ab141 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -172,6 +172,10 @@
{
omodel.Kf_MateOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_WHSPCtl") //校验-是否校对仓库仓位
+ {
+ omodel.Kf_MateOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//生产退料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoCheck")
{
@@ -480,6 +484,10 @@
{
omodel.Kf_MoveStockBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_WHSPCtl") //校验-是否校对仓库仓位
+ {
+ omodel.Kf_MoveStockBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//补料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
{
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index bc770e9..16be230 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -30,6 +30,7 @@
public string Kf_MateOutBill_SimpleMode; //简洁模式（不显示源单列表，只显示扫码记录，但后台仍控制）
public string Kf_MateOutBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
public string Kf_MateOutBillCheck_MustQtyCtl; //校验数量控制
+ public string Kf_MateOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位
//生产退料
public string Kf_MateOutBackBill_AutoCheck;
public string Kf_MateOutBackBill_ERPMode;
@@ -120,6 +121,7 @@
public string Kf_MoveStockBill_BarCodeMustSameSourceBill; // 条码必须同源单一致
public string Kf_MoveStockBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
public string Kf_MoveStockBillCheck_MustQtyCtl; //校验数量控制
+ public string Kf_MoveStockBillCheck_WHSPCtl; //校验-是否校对仓库仓位
//补料单
public string Kf_MateReplenishOutBill_AutoCheck;
public string Kf_MateReplenishOutBill_ERPMode;
--
Gitblit v1.9.1