From 86b2b0fae90e88e764258231f5a84ece758cdc1d Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期一, 19 十二月 2022 14:45:46 +0800
Subject: [PATCH] 新增委外领料校验、委外补料校验模块扫码系统参数

---
 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs     |   54 +++++++++++++++++++++++++++
 Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs |    9 ++++
 2 files changed, 63 insertions(+), 0 deletions(-)

diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 20d8bb9..19f163e 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -583,6 +583,19 @@
                     {
                         omodel.Kf_EntrustOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
+                    //委外领料单    校验
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_MustQtyCtl")
+                    {
+                        omodel.Kf_EntrustOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_WHSPCtl")
+                    {
+                        omodel.Kf_EntrustOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_MultilineCtl")
+                    {
+                        omodel.Kf_EntrustOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
 
                     //生产补料单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
@@ -633,6 +646,20 @@
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_MultilineCtl")
                     {
                         omodel.Kf_MateReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
+
+                    //委外补料单    校验
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MustQtyCtl")
+                    {
+                        omodel.Kf_EntrustReplenishOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_WHSPCtl")
+                    {
+                        omodel.Kf_EntrustReplenishOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MultilineCtl")
+                    {
+                        omodel.Kf_EntrustReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
                     //直接调拨单
@@ -1931,6 +1958,19 @@
                     {
                         omodel.Kf_EntrustOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
+                    //委外领料单    校验
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_MustQtyCtl")
+                    {
+                        omodel.Kf_EntrustOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_WHSPCtl")
+                    {
+                        omodel.Kf_EntrustOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_MultilineCtl")
+                    {
+                        omodel.Kf_EntrustOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
 
                     //生产补料单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
@@ -1983,6 +2023,20 @@
                         omodel.Kf_MateReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
+                    //委外补料单    校验
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MustQtyCtl")
+                    {
+                        omodel.Kf_EntrustReplenishOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_WHSPCtl")
+                    {
+                        omodel.Kf_EntrustReplenishOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MultilineCtl")
+                    {
+                        omodel.Kf_EntrustReplenishOutBillCheck_MultilineCtl = 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 1bc7ac6..59a59c9 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -150,6 +150,10 @@
         public string Kf_EntrustOutBill_FIFOList;        //先进先出下架清单
         public string Kf_EntrustOutBill_FIFOCtl;         //先进先出控制
         public string Kf_EntrustOutBill_SimpleMode;      //简洁模式(不显示源单列表,只显示扫码记录,但后台仍控制)
+        //委外领料    校验
+        public string Kf_EntrustOutBillCheck_MustQtyCtl;   //校验数量控制
+        public string Kf_EntrustOutBillCheck_WHSPCtl;      //校验-是否校对仓库仓位
+        public string Kf_EntrustOutBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配
 
         //生产补料
         public string Kf_MateReplenishOutBill_AutoCheck;       //是否自动审核
@@ -166,6 +170,11 @@
         public string Kf_MateReplenishOutBillCheck_WHSPCtl;      //校验-是否校对仓库仓位
         public string Kf_MateReplenishOutBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配
 
+        //委外补料    校验
+        public string Kf_EntrustReplenishOutBillCheck_MustQtyCtl;   //校验数量控制
+        public string Kf_EntrustReplenishOutBillCheck_WHSPCtl;      //校验-是否校对仓库仓位
+        public string Kf_EntrustReplenishOutBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配
+
         //直接调拨
         public string Kf_MoveStockBill_AutoCheck;       //是否自动审核
         public string Kf_MoveStockBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)

--
Gitblit v1.9.1