From e5414022999d94626b0d55d29d0dba3ce700fea9 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 22 九月 2025 15:40:13 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs | 167 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 133 insertions(+), 34 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
index 008ed43..55ec800 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
@@ -1,16 +1,11 @@
-锘縰sing DevExpress.Utils.Extensions;
-using DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -18,7 +13,9 @@
{
public partial class Frm_Repair : DevExpress.XtraEditors.XtraForm
{
- string _webServiceName = "SysLog/";
+ string _webServiceName = "WorkRepair/";
+ string goodTag = "OK";
+ string badTag = "NG";
private List<FilterEntity> _filterList = new List<FilterEntity>();
public Frm_Repair()
{
@@ -26,30 +23,43 @@
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);
- });
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
- getModel(value);
+ txt_barCode111.Text = "";
+ getModel(value, "", "", "", "");
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
- });
- getPageList(1);
+ }, lbGuid);
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+ 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_repairReson.TextTxt.Trim(), txt_repairMethd.TextTxt.Trim(), goodTag);
+ };
+ btnBad.Click += (s, e) =>
+ {
+ getModel(lbGuid.Text.Trim(), txt_badDescription.TextTxt, txt_repairReson.TextTxt.Trim(), txt_repairMethd.TextTxt.Trim(), badTag);
+ };
- Button button1 = new Button();
- button1.Text = "Button 1";
- Button button2 = new Button();
- button2.Text = "Button 2";
- layoutControlItem16.Control.AddControl(button1);
- layoutControlItem16.Control.AddControl(button2);
+ this.ActiveControl = this.txt_barCode111;
+ txt_barCode111.Focus();
}
-
-
-
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -99,7 +109,7 @@
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim());
+ getModel(lbGuid.Text.Trim(), "", "", "", "");
else
{
//_filterList.Clear();
@@ -121,8 +131,15 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "OPERATION_TIME", "desc,ABT_HNO desc", "", _sbSqlWhere.ToString());
+ 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
{
@@ -156,19 +173,43 @@
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
- private void getModel(string strGuid)
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
+ /// <param name="_badXx"></param>
+ /// <param name="_badYy"></param>
+ /// <param name="_badDc"></param>
+ /// <param name="_checkResult"></param>
+ private void getModel(string strGuid, string _badXx, string _badYy, string _badDc, string _checkResult)
{
- bool isEdit = false;
- if (toolBarMenu1.currentAction == "add") return;
- if (toolBarMenu1.currentAction == "edit") isEdit = true;
- if (string.IsNullOrEmpty(strGuid))
+ if (!string.IsNullOrEmpty(_checkResult))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
+ 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,//涓诲缓
+ barCode = _barCode,
+ badXx = _badXx,//涓嶈壇鐜板儚
+ badYy = _badYy, //涓嶈壇鍘熷洜
+ badDc = _badDc, //涓嶈壇瀵圭瓥
+ checkResult = _checkResult, //妫�娴嬬粨鏋�
};
try
{
@@ -178,14 +219,72 @@
{
dynamic dy = _rtn.rtnData;
lbGuid.Text = strGuid;
- UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, false);
+ lbSum1.Text = dy.lbSum1;
+ lbSum2.Text = dy.lbSum2;
+ lbSum3.Text = dy.lbSum3;
+ prog1.Position = dy.jd;
+ 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"])
+ {
+ array.Add(a);
+ }
+ DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ if (dt.Rows.Count > 0)
+ {
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = dt;
+ gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ }
+ JArray array2 = new JArray();
+ foreach (var a in _job["rtnData"]["list2"])
+ {
+ array2.Add(a);
+ }
+ DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+ if (dt2.Rows.Count > 0)
+ {
+ gcMx2.BindingContext = new BindingContext();
+ gcMx2.DataSource = dt2;
+ gcMx2.ForceInitialize();
+ gvMx2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+ }
+ string _msg = _rtn.rtnMsg;
+ if (!string.IsNullOrEmpty(_msg))
+ {
+ Toast vm = new Toast(1, _msg);
+ vm.Show();
+ };
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
--
Gitblit v1.9.3