From 29bf38f64c14321cf435e897c396111e92ab03a7 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 26 五月 2025 16:49:52 +0800
Subject: [PATCH] 解决合并冲突
---
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 29f6969..0570502 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -3936,6 +3936,16 @@
omodel.Sc_PackUnionBill_SourceBillNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //===========下架单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MaterialLowerBill_MustQtyCtl")
+ {
+ omodel.Kf_MaterialLowerBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MaterialLowerBill_BatchNoCtl")
+ {
+ omodel.Kf_MaterialLowerBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//==============================================WMS 通用
//库存控制-ERP负库存控制
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_ERPStockCtl")
--
Gitblit v1.9.1