From 1fd408a9ba01142cd824894f01ee0d3affff547e Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 12 五月 2025 13:52:12 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 62 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 15 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index ca37dfb..f4937ee 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -134,7 +134,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
- string _fmrmode = txt_fmrmode.Text.Trim();
+
toolBarMenu1.isSetBtn = false;
if (txt_freceQty.SelectedIndex <= 0)
{
@@ -142,33 +142,54 @@
txt_freceQty.Focus();
return;
}
- //褰撻�夋嫨涓嶅悎鏍兼椂锛岃濉啓鍘熷洜
- if (txt_freceQty.SelectedIndex == 2)
+ if (txt_freceQty.SelectedIndex == 1)
{
- if ((txt_fngHandle.SelectedIndex <= 0))
+ if ((txt_fmrmode.SelectedIndex > 0) || txt_fngHandle.SelectedIndex > 0)
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨澶勭悊缁撴灉锛�");
- txt_fngHandle.Focus();
+ Gs.DevApp.ToolBox.MsgHelper.Warning("浣犲垽瀹氫簡鍚堟牸锛屽氨涓嶈兘鍐嶉�夋嫨鍏跺畠澶勭悊鏂瑰紡浜嗭紒");
+ txt_fmrmode.Focus();
return;
}
- if (txt_fngHandle.SelectedIndex == 1)
+ }
+ else
+ {
+ //褰撻�夋嫨涓嶅悎鏍兼椂锛岃濉啓鍘熷洜
+ if (txt_freceQty.SelectedIndex == 2)
{
- if ((txt_fmrmode.SelectedIndex <= 0))
+ if ((txt_fngHandle.SelectedIndex <= 0))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨澶勭悊鏂瑰紡锛�");
- txt_fmrmode.Focus();
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨澶勭悊缁撴灉锛�");
+ txt_fngHandle.Focus();
return;
}
+ if (txt_fngHandle.SelectedIndex == 1)
+ {
+ if ((txt_fmrmode.SelectedIndex <= 0))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閫�鏂欐柟寮忥紒");
+ txt_fmrmode.Focus();
+ return;
+ }
+ }
+ else
+ {
+ if ((txt_fmrmode.SelectedIndex > 0))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("浣犻�夋嫨浜嗙壒閲囦娇鐢紝灏变笉鑳藉啀閫夋嫨閫�鏂欐柟寮忎簡锛�");
+ txt_fmrmode.Focus();
+ return;
+ }
+ }
}
- else
- _fmrmode = "";
-
}
-
+ string _fmrmode = txt_fmrmode.SelectedIndex > 0 ? txt_fmrmode.Text.Trim() : "";
+ string _freceQty = txt_freceQty.SelectedIndex > 0 ? txt_freceQty.Text.Trim() : "";
+ string _fngHandle = txt_fngHandle.SelectedIndex > 0 ? txt_fngHandle.Text.Trim() : "";
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- fngHandle = txt_fngHandle.Text.Trim(),
+ freceQty = _freceQty,
+ fngHandle = _fngHandle,
fmrmode = _fmrmode,
};
try
@@ -659,5 +680,16 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+ public event Action CallMainFormMethod; // 瀹氫箟涓�涓簨浠�
+ /// <summary>
+ /// 鏌ョ湅寮傚父鎶ュ憡
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptBtnError_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ CallMainFormMethod?.Invoke(); // 瑙﹀彂浜嬩欢锛岃皟鐢ㄤ富绐椾綋鐨勬柟娉�
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3