From cd47f11ebfaadb81d6efcf778542d3b44acee5a2 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 03 九月 2025 17:27:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 55dc9e3..5679160 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -26,8 +26,8 @@
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";
- bool isCleanDianJian = false;
+ 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 = "";//鐢垫鍙栧�艰矾寰�
string goodTag = "鈭�";
@@ -107,14 +107,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 +143,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 +349,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();
}
}
--
Gitblit v1.9.3