From 41a1dfc3a2b29c79585f5cb6e7d79cfcdfd044a9 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 24 十月 2024 14:43:50 +0800
Subject: [PATCH] 1

---
 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 2cd4637..b0a9f09 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -1732,6 +1732,11 @@
                     {
                         omodel.Gy_RoutingBill_SaveAutoLastProc = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
+                    //工艺路线是否启用多级审批,启用多级审批要求普通审批不启用
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Gy_RoutingBill_EnableMultiLevel")
+                    {
+                        omodel.Gy_RoutingBill_EnableMultiLevel = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
 
                     //=======JIT
 
@@ -3759,7 +3764,14 @@
                         omodel.MES_StationEntrustOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    
+
+
+                    //工资系统参数
+                    //==============================考勤汇报单
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Pay_WorkTimesBill_AutoCheck")
+                    {
+                        omodel.Pay_WorkTimesBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
 
 
                     //=======JIT系统参数
@@ -3850,8 +3862,12 @@
                     {
                         omodel.Gy_RoutingBill_SaveAutoLastProc = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
+                    //工艺路线是否启用多级审批,启用多级审批要求普通审批不启用
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Gy_RoutingBill_EnableMultiLevel")
+                    {
+                        omodel.Gy_RoutingBill_EnableMultiLevel = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
 
-                    
 
 
 

--
Gitblit v1.9.1