From 2e3496c2bc19c1dcb25dbbde0022a6a6d2b4ff7b Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 22 十一月 2025 13:27:18 +0800
Subject: [PATCH] ID转人名：受托退料申请、受托退料单
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 10 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
index ec270ad..55ec800 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
@@ -31,7 +31,7 @@
}, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
- txt_barCode.Text = "";
+ txt_barCode111.Text = "";
getModel(value, "", "", "", "");
}, (value) =>
{
@@ -39,18 +39,21 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- txt_barCode.KeyDown += (s, e) =>
+ txt_barCode111.KeyDown += (s, e) =>
{
if (e.KeyCode == Keys.Enter) { getModel(lbGuid.Text.Trim(), "", "", "", ""); };
};
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);
};
+
+ this.ActiveControl = this.txt_barCode111;
+ txt_barCode111.Focus();
}
/// <summary>
///
@@ -128,8 +131,14 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- txt_barCode.Text = "";
- gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ txt_barCode111.Text = "";
+ gcMain1.DataSource = null;
+
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and d.erp_sczz in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
+
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.createDate", "desc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -174,7 +183,25 @@
/// <param name="_checkResult"></param>
private void getModel(string strGuid, string _badXx, string _badYy, string _badDc, string _checkResult)
{
- string _barCode = txt_barCode.Text.Trim();
+ 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_barCode111.Text.Trim();
var _obj = new
{
guid = strGuid,//涓诲缓
@@ -197,9 +224,17 @@
lbSum2.Text = dy.lbSum2;
lbSum3.Text = dy.lbSum3;
prog1.Position = dy.jd;
- txt_barCode.ReadOnly = false;
- txt_badReson.IsReadly = false;
- txt_repairMethd.IsReadly = false;
+ txt_barCode111.ReadOnly = false;
+ string _repairResult = dy.repairResult;
+ if (!string.IsNullOrEmpty(_repairResult))
+ {
+ txt_repairReson.IsReadly = true;
+ txt_repairMethd.IsReadly = true;
+ }
+ else {
+ txt_repairReson.IsReadly = false;
+ txt_repairMethd.IsReadly = false;
+ }
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
--
Gitblit v1.9.3