From 2576d7c9c25031a7478dfc4795cc1c02019f7368 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 02 四月 2025 16:57:53 +0800
Subject: [PATCH] 现场
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs | 122 +++++++++++++++++++++++++++++-----------
1 files changed, 89 insertions(+), 33 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
index 008ed43..32bfb97 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,7 @@
{
public partial class Frm_Repair : DevExpress.XtraEditors.XtraForm
{
- string _webServiceName = "SysLog/";
+ string _webServiceName = "WorkRepair/";
private List<FilterEntity> _filterList = new List<FilterEntity>();
public Frm_Repair()
{
@@ -32,23 +27,27 @@
});
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
- getModel(value);
+ txt_barCode.Text = "";
+ getModel(value, "", "","","");
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
});
- getPageList(1);
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
-
- Button button1 = new Button();
- button1.Text = "Button 1";
- Button button2 = new Button();
- button2.Text = "Button 2";
- layoutControlItem16.Control.AddControl(button1);
- layoutControlItem16.Control.AddControl(button2);
+ txt_barCode.Focus();
+ txt_barCode.KeyDown += (s, e) =>
+ {
+ if (e.KeyCode == Keys.Enter) { getModel(lbGuid.Text.Trim(), "","","",""); };
+ };
+ btnGood.Click += (s, e) =>
+ {
+ getModel(lbGuid.Text.Trim(), txt_remark.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, "鈭�");
+ };
+ btnBad.Click += (s, e) => {
+ getModel(lbGuid.Text.Trim(), txt_remark.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, "脳");
+ };
}
-
-
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -99,7 +98,7 @@
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim());
+ getModel(lbGuid.Text.Trim(), "", "","","");
else
{
//_filterList.Clear();
@@ -122,7 +121,7 @@
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());
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.createDate", "desc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
@@ -156,19 +155,25 @@
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))
- {
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
+ string _barCode = txt_barCode.Text.Trim();
var _obj = new
{
guid = strGuid,//涓诲缓
+ barCode = _barCode,
+ badXx = _badXx,//涓嶈壇鐜板儚
+ badYy = _badYy, //涓嶈壇鍘熷洜
+ badDc = _badDc, //涓嶈壇瀵圭瓥
+ checkResult = _checkResult, //妫�娴嬬粨鏋�
};
try
{
@@ -178,15 +183,66 @@
{
dynamic dy = _rtn.rtnData;
lbGuid.Text = strGuid;
- UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, false);
+ txt_barCode.ReadOnly = 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))
+ {
+ //璁剧疆鍗曠獥鍙ｅ嚭鐜板脊鍑虹殑閫熷害
+ this.alertControl1.FormDisplaySpeed = DevExpress.XtraBars.Alerter.AlertFormDisplaySpeed.Fast;
+ //璁剧疆鏄剧ず澶氬皯鏃堕棿绐楀彛浼氳嚜鍔ㄥ叧闂� 浠ユ绉掍负鍗曚綅
+ this.alertControl1.AutoFormDelay = 3000;
+ //璁剧疆鎻愬嚭绐楀彛鐨勬樉绀虹殑浣嶇疆
+ this.alertControl1.FormLocation = DevExpress.XtraBars.Alerter.AlertFormLocation.BottomLeft;
+ this.alertControl1.Show(this, "鎻愮ず!", _msg);
+ };
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3