From b7ad7b35a094d5f9fcf4a884d876e05b4a226c98 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 13 六月 2025 14:15:49 +0800
Subject: [PATCH] 批准
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
index 84a9e62..7a24cfb 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
@@ -23,6 +23,8 @@
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
this.toolBarMenu1.getXmlConfig();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, null, "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -43,11 +45,12 @@
};
btnGood.Click += (s, e) =>
{
- getModel(lbGuid.Text.Trim(), txt_badDescription.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, goodTag);
+ getModel(lbGuid.Text.Trim(), txt_badDescription.TextTxt, txt_repairReson.TextTxt.Trim(), txt_repairMethd.TextTxt.Trim(), goodTag);
};
btnBad.Click += (s, e) =>
{
- getModel(lbGuid.Text.Trim(), txt_badDescription.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, badTag);
+
+ getModel(lbGuid.Text.Trim(), txt_badDescription.TextTxt, txt_repairReson.TextTxt.Trim(), txt_repairMethd.TextTxt.Trim(), badTag);
};
}
/// <summary>
@@ -172,6 +175,23 @@
/// <param name="_checkResult"></param>
private void getModel(string strGuid, string _badXx, string _badYy, string _badDc, string _checkResult)
{
+ if (!string.IsNullOrEmpty(_checkResult)) {
+ string _reason = txt_repairReson.TextTxt.Trim();
+ if (string.IsNullOrEmpty(_reason))
+ {
+ Toast vm = new Toast(0, "涓嶈壇鍘熷洜涓嶈兘涓虹┖锛�");
+ vm.Show();
+ return;
+ };
+ string _meth = txt_repairMethd.TextTxt.Trim();
+ if (string.IsNullOrEmpty(_meth))
+ {
+ Toast vm = new Toast(0, "涓嶈壇瀵圭瓥涓嶈兘涓虹┖锛�");
+ vm.Show();
+ return;
+ };
+ }
+
string _barCode = txt_barCode.Text.Trim();
var _obj = new
{
@@ -196,7 +216,7 @@
lbSum3.Text = dy.lbSum3;
prog1.Position = dy.jd;
txt_barCode.ReadOnly = false;
- txt_badReson.IsReadly = false;
+ txt_repairReson.IsReadly = false;
txt_repairMethd.IsReadly = false;
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
@@ -250,7 +270,5 @@
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
-
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3