From 9702c6a4dc358c7bff2eb18c8426229a0140e34a Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 15 九月 2025 08:29:16 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs |   48 ++++++++++++++++++++++++++----------------------
 1 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 9b74e45..6a6d184 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -26,7 +26,7 @@
         string isWater = "0";
         string hostName = "192.168.60.51";
         int hostNamePoint = 502;
-        string strConn = "Data Source=192.168.1.146;Initial Catalog=GS_MES;User ID=mesUser;Password =qixi1qaz@WSXmes";
+        string strConn = "Data Source=192.168.1.146,12468;Initial Catalog=GS_MES;User ID=mesUser;Password =qixi1qaz@WSXmes";
         bool isCleanDianJian = true;
         string _webServiceName = "WorkCollect/";
         string dianJianPath = "";//鐢垫鍙栧�艰矾寰�
@@ -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;
             }
@@ -107,14 +108,24 @@
             };
             btnBad.Click += (s, e) =>
             {
-                string _collectGuid = lbCollectGuid.Text.Trim();
+                string _collectGuid ="";
+                string _collCode = "";
+                var dr = gvMx1.GetFocusedDataRow();
+                if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
+                {
+                }
+                else
+                {
+                    _collectGuid = dr["guid"].ToString();
+                    _collCode = dr["barCode"].ToString();
+                }
                 if (_collectGuid.Length < 30)
                 {
                     Toast vm = new Toast(-1, "~璇峰厛閫夋嫨杩芥函鐮亊");
                     vm.Show();
                     return;
                 }
-                string _msg = "浣犲噯澶囧皢銆�" + txt_gdbh.Text + "銆戙��" + txt_currentBarCode.Text.Trim() + "銆戝彉鏇翠负涓嶈壇";
+                string _msg = "浣犲噯澶囧皢銆�" + _collCode + "銆戝彉鏇翠负涓嶈壇";
                 UcDictionarySelect frm = new UcDictionarySelect("宸ュ簭涓嶈壇鎻忚堪", " a.s_type='宸ュ簭涓嶈壇鎻忚堪' and pid<>'00000000-0000-0000-0000-000000000000'", _msg);
                 frm.UpdateParent += (ss, ee) =>
                 {
@@ -133,22 +144,14 @@
                         vm.Show();
                     }
                     else
-                        addModel(badTag, _txt, lbCollectGuid.Text.Trim());
+                        addModel(badTag, _txt, _collectGuid);
                 };
                 frm.ShowDialog();
+                this.ActiveControl = this.txt_barCode;
+                txt_barCode.Focus();
             };
             this.ActiveControl = this.txt_barCode;
             txt_barCode.Focus();
-            gvMx1.FocusedRowChanged += (s, e) =>
-            {
-                if (e.FocusedRowHandle >= 0)
-                {
-                    DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
-                    txt_gdbh.Text = row["gdbh"].ToString();
-                    txt_currentBarCode.Text = row["barCode"].ToString();
-                    lbCollectGuid.Text = row["guid"].ToString();
-                }
-            };
         }
 
         /// <summary>
@@ -347,7 +350,8 @@
                     string _msg = _rtn.rtnMsg;
                     if (!string.IsNullOrEmpty(_msg))
                     {
-                        Toast vm = new Toast((goodTag == "鈭�" ? 1 : -1), _msg);
+                        // Toast vm = new Toast((goodTag == "鈭�" ? 1 : -1), _msg); 2025-08-20 淇敼鎻愮ず澶栬
+                        Toast vm = new Toast(1, _rtn.rtnMsg);
                         vm.Show();
                     }
                 }
@@ -418,25 +422,25 @@
                 {
                     ziduan = "t007",
                     wenben = "鎺ュ湴缁撴灉",
-                    visibleIndex = -1,
+                    visibleIndex = 1,
                 });
                 _lst.Add(new
                 {
                     ziduan = "t009",
                     wenben = "浜よ�愮粨鏋�",
-                    visibleIndex = -1,
+                    visibleIndex = 1,
                 });
                 _lst.Add(new
                 {
                     ziduan = "t010",
                     wenben = "娉勬紡缁撴灉",
-                    visibleIndex = -1,
+                    visibleIndex = 1,
                 });
                 _lst.Add(new
                 {
                     ziduan = "t011",
                     wenben = "鍔熺巼缁撴灉",
-                    visibleIndex = -1,
+                    visibleIndex = 1,
                 });
             }
             if (txt_gx.Text.Trim() == fGxShouJian)

--
Gitblit v1.9.3