From b7d9f2e23cbda587d814c7d07c1664c053c83dcb Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期二, 12 八月 2025 13:58:07 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

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

diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 9e8b054..d0799b7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -256,8 +256,10 @@
                     lbSum3.Text = dy.lbSum3;
                     lbSum4.Text = dy.lbSum4;
                     prog1.Position = dy.jd;
-                    //鑹搧鍒楄〃
                     txt_barCode.ReadOnly = false;
+                    if (txt_gx.Text.Trim() == fGxShouJian)
+                        txt_gongWei.ReadOnly = false;
+                    //鑹搧鍒楄〃
                     JObject _job = JObject.Parse(strJson);
                     JArray array = new JArray();
                     foreach (var a in _job["rtnData"]["list"])

--
Gitblit v1.9.3