From c2e1de823e648ca7e62bc868d8aaf9ad5c65a287 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 14 九月 2025 09:17:28 +0800
Subject: [PATCH] 到货单版本冲突

---
 DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index d1be399..6a6d184 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -36,19 +36,20 @@
         string fGxDianJian = "G002:鐢垫";
         string fGxShouJian = "G003:姘存";
         string fGxZhongJian = "G004:缁堟";
-
+       
         /// <summary>
         /// 
         /// </summary>
         /// <param name="_fGx">宸ュ簭</param>
         /// <param name="_fBc">鐝</param>
         /// <param name="_strinOther">鐩墠涓虹數妫�璺緞</param>
-        public Frm_Work01(string _fGx, string _fBc, string _strinOther)
+        /// <param name="chkWater">鏄惁姘存</param>
+        public Frm_Work01(string _fGx, string _fBc, string _strinOther,int chkWater=0)
         {
             InitializeComponent();
             try
             {
-                string _vanishingSeconds = ConfigurationManager.AppSettings["IsWater"];
+                string _vanishingSeconds = chkWater.ToString();
                 if (!string.IsNullOrEmpty(_vanishingSeconds))
                     isWater = _vanishingSeconds;
             }

--
Gitblit v1.9.3