From 592fbe143bda7d096d5722a88477ad1078a22742 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 17 八月 2025 18:47:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
index 38563dc..db63ff7 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
@@ -55,6 +55,7 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+ txt_DAA001.EditValueChanged += txt_DAA001_EditValueChanged;
//閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
btnSelect.Click += (s, e) =>
@@ -292,7 +293,7 @@
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "errorNo");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_ErrorNo, gridView1, "errorNo");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -435,7 +436,6 @@
var row = gridView2.GetDataRow(i);
if (row != null)
{
- Guid? _guid = UtilityHelper.ToGuid(row["id"].ToString());
if (string.IsNullOrEmpty(row["staffId"].ToString()))
{
MsgHelper.ShowError("鍛樺伐涓嶈兘涓虹┖锛�");
@@ -459,8 +459,8 @@
_obj.list.Add(new
{
- Guid = _guid,
- ID = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["id"].ToString()),
+ Guid = "",
+ ID = "",
Staff_Id = row["staffId"].ToString(),
Staff_No = row["staffNo"].ToString(),
Staff_Name = row["staffName"].ToString(),
@@ -625,7 +625,7 @@
;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "errorNo");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_ErrorNo, gridView1, "errorNo");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -765,5 +765,24 @@
}
gridView2.RefreshData();
}
+
+ /// <summary>
+ /// 宸ュ崟涓嬫媺妗嗛�夋嫨浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void txt_DAA001_EditValueChanged(object sender, EventArgs e)
+ {
+ SearchLookUpEdit lookupEdit = sender as SearchLookUpEdit;
+ DataRowView selectedDataRow = (DataRowView)lookupEdit.GetSelectedDataRow();
+ if (selectedDataRow != null)
+ {
+ txt_DAAType.Text = selectedDataRow["宸ュ崟绫诲瀷"].ToString();
+ }
+ else
+ {
+ txt_DAAType.Text = "";
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3