From a0f8fee1feea1e1425f7061bbadda9a2f45f0ea1 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 27 三月 2026 10:48:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index 8633075..7e3250d 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -874,6 +874,12 @@
         // 巡检单 首检控制
         public string QC_PatrolProcCheckOtherBill_FirstCheckCtl; // 巡检单 是否启用 首检控制
 
+
+        //返修条码
+        public string Gy_BarCodeBill_Rework_Ctrl;  //生成物料条码时,机型码不允许为空
+
+        // 取样单
+        public string QC_TakeSampleCheckBill_AutoCheck; // 生成取样单时,是否自动审核
     }
 
 }

--
Gitblit v1.9.1