From a44e14cc44c5beea13cfa0accd2237c3a8a07202 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 01 四月 2025 16:56:35 +0800
Subject: [PATCH] 现场修理
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 74 ++++++++++++++++++++++++------------
1 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 2b1f46d..e5b8d2f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -1,18 +1,13 @@
-锘縰sing DevExpress.Utils.DirectXPaint;
-using DevExpress.XtraBars.Alerter;
+锘縰sing DevExpress.XtraBars.Alerter;
+using DevExpress.XtraBars.ToastNotifications;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
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;
namespace Gs.DevApp.DevFrm.Work
@@ -20,22 +15,39 @@
public partial class Frm_Work01 : DevExpress.XtraEditors.XtraForm
{
string _webServiceName = "WorkCollect/";
- public Frm_Work01()
+
+ string fGx = "";
+ string fBc = "";
+ public Frm_Work01(string _fGx, string _fBc)
{
InitializeComponent();
+ this.fGx = _fGx;
+ this.fBc = _fBc;
+ txt_gx.Text = fGx;
+ txt_bc.Text = fBc;
+ txt_barCode.Focus();
txt_barCode.KeyDown += (s, e) =>
{
- if (e.KeyCode == Keys.Enter) { getModel(); };
+ if (e.KeyCode == Keys.Enter) { getModel("", ""); };
+ };
+ btnGood.Click += (s, e) =>
+ {
+ getModel("", "鈭�");
+ };
+ btnBad.Click += (s, e) => {
+ getModel("", "脳");
};
}
- private void getModel()
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="_checkVal">妫�娴嬪��</param>
+ /// <param name="_checkResult">妫�娴嬬粨鏋�</param>
+ private void getModel(string _checkVal, string _checkResult)
{
- string _barCode =txt_barCode.Text.Trim();
- //string _guid = "";
+ string _barCode = txt_barCode.Text.Trim();
string _inBz = ""; ; //澶囨敞
- string _checkVal = ""; ; //妫�娴嬪��
- string _checkResult = ""; ; //妫�娴嬬粨鏋�
if (string.IsNullOrEmpty(_barCode))
{
ToolBox.MsgHelper.ShowError("璇峰厛鎵爜锛�");
@@ -43,11 +55,13 @@
}
var _obj = new
{
- // guid = _guid,
barCode = _barCode,
inBz = _inBz,
checkVal = _checkVal,
checkResult = _checkResult,
+ processNo = txt_gx.Text.Trim(),//宸ュ簭
+ banCi = txt_bc.Text.Trim(),//鐝
+ gongWei = txt_gw.Text.Trim(),//宸ヤ綅
};
try
{
@@ -56,6 +70,13 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
+ txt_gdbh.Text = dy.gdbh;
+ txt_itemNo.Text = dy.itemNo;
+ txt_itemName.Text = dy.itemName;
+ txt_itemModel.Text = dy.itemModel;
+ txt_sjXt.Text = dy.sjXt;
+ txt_sjDate.Text = dy.sjDate;
+ txt_yjDate.Text = dy.yjDate;
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
@@ -94,22 +115,25 @@
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
}
string _msg = _rtn.rtnMsg;
- //璁剧疆鍗曠獥鍙ｅ嚭鐜板脊鍑虹殑閫熷害
- this.alertControl1.FormDisplaySpeed = DevExpress.XtraBars.Alerter.AlertFormDisplaySpeed.Fast;
- //璁剧疆鏄剧ず澶氬皯鏃堕棿绐楀彛浼氳嚜鍔ㄥ叧闂� 浠ユ绉掍负鍗曚綅
- this.alertControl1.AutoFormDelay = 3000;
- //璁剧疆鎻愬嚭绐楀彛鐨勬樉绀虹殑浣嶇疆
- this.alertControl1.FormLocation = DevExpress.XtraBars.Alerter.AlertFormLocation.BottomRight;
- this.alertControl1.Show(this, "鎻愮ず!", _msg);
-
+ 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