From 0ca2eed6b61d0acb0fef587185db0cb4b82eb0d0 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 10 九月 2025 14:38:08 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
index 7a24cfb..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,7 +39,7 @@
}, 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(), "", "", "", ""); };
};
@@ -49,9 +49,11 @@
};
btnBad.Click += (s, e) =>
{
-
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>
///
@@ -129,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
@@ -175,7 +183,8 @@
/// <param name="_checkResult"></param>
private void getModel(string strGuid, string _badXx, string _badYy, string _badDc, string _checkResult)
{
- if (!string.IsNullOrEmpty(_checkResult)) {
+ if (!string.IsNullOrEmpty(_checkResult))
+ {
string _reason = txt_repairReson.TextTxt.Trim();
if (string.IsNullOrEmpty(_reason))
{
@@ -191,8 +200,8 @@
return;
};
}
-
- string _barCode = txt_barCode.Text.Trim();
+
+ string _barCode = txt_barCode111.Text.Trim();
var _obj = new
{
guid = strGuid,//涓诲缓
@@ -215,9 +224,17 @@
lbSum2.Text = dy.lbSum2;
lbSum3.Text = dy.lbSum3;
prog1.Position = dy.jd;
- txt_barCode.ReadOnly = false;
- txt_repairReson.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