From f8ef4acfc742e9f32f0a2aa5d8bf9e122d26857f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 08 五月 2025 14:19:52 +0800
Subject: [PATCH] fqc流程
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 69 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 19 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 0b71328..105ff5e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -1,4 +1,5 @@
-锘縰sing Gs.DevApp.Entity;
+锘縰sing DevExpress.Utils.MVVM.Services;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -13,51 +14,78 @@
string _webServiceName = "WorkCollect/";
string fGx = "";
string fBc = "";
+ string goodTag = "鈭�";
+ string badTag = "脳";
public Frm_Work01(string _fGx, string _fBc)
{
InitializeComponent();
- this.Text = "宸ュ簭閲囬泦 - " + _fGx+ " - "+ fBc;
this.fGx = _fGx;
this.fBc = _fBc;
+ this.Text = "宸ュ簭閲囬泦 - " + fGx + " - " + fBc;
txt_gx.Text = fGx;
txt_bc.Text = fBc;
txt_barCode.KeyDown += (s, e) =>
{
- if (e.KeyCode == Keys.Enter) { getModel("", "鈭�"); };
+ if (e.KeyCode == Keys.Enter) { getModel("", goodTag); };
};
btnGood.Click += (s, e) =>
{
- getModel("", "鈭�");
+ getModel("", goodTag);
};
- btnBad.Click += (s, e) => {
- getModel("", "脳");
+ btnBad.Click += (s, e) =>
+ {
+ UcDictionarySelect frm = new UcDictionarySelect("缂洪櫡鎻忚堪", " s_type='宸ュ簭閲囬泦涓嶈壇椤圭洰'");
+ frm.UpdateParent += (ss, ee) =>
+ {
+ System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
+ var lst = ee.DynamicList;
+ foreach (dynamic dym in lst)
+ {
+ if (stringBuilder.Length > 0)
+ stringBuilder.Append("|");
+ stringBuilder.Append(dym.dicTxt);
+ }
+ string _txt = stringBuilder.ToString();
+ if (string.IsNullOrEmpty(_txt))
+ {
+ Toast vm = new Toast(-1, "~褰撲负涓嶈壇鏃讹紝璇烽�夋嫨涓嶈壇椤圭洰~");
+ vm.Show();
+ }
+ else
+ getModel("", badTag, _txt);
+ };
+ frm.ShowDialog();
};
}
+
+
/// <summary>
///
/// </summary>
/// <param name="_checkVal">妫�娴嬪��</param>
/// <param name="_checkResult">妫�娴嬬粨鏋�</param>
- private void getModel(string _checkVal, string _checkResult)
+ /// <param name="_badReson">涓嶈壇鍘熷洜</param>
+ /// <param name="_inBz">澶囨敞</param>
+ private void getModel(string _checkVal, string _checkResult, string _badReson = "", string _inBz = "")
{
string _barCode = txt_barCode.Text.Trim();
- string _inBz = ""; ; //澶囨敞
if (string.IsNullOrEmpty(_barCode))
{
- Toast vm = new Toast(System.Drawing.Color.DodgerBlue, "璇峰厛鎵爜");
+ Toast vm = new Toast(-1, "~璇峰厛鎵拷婧爜~");
vm.Show();
return;
}
var _obj = new
{
barCode = _barCode,
- inBz = _inBz,
+ inBz = _inBz.Trim(),
checkVal = _checkVal,
checkResult = _checkResult,
processNo = txt_gx.Text.Trim(),//宸ュ簭
banCi = txt_bc.Text.Trim(),//鐝
gongWei = txt_gw.Text.Trim(),//宸ヤ綅
+ badReson = _badReson.Trim()
};
try
{
@@ -66,12 +94,14 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
+ //澶磋〃鍜屾眹鎬�
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, false);
lbSum1.Text = dy.lbSum1;
lbSum2.Text = dy.lbSum2;
lbSum3.Text = dy.lbSum3;
lbSum4.Text = dy.lbSum4;
prog1.Position = dy.jd;
+ //鑹搧
txt_barCode.ReadOnly = false;
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
@@ -92,6 +122,7 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
+ //涓嶈壇鍝�
JArray array2 = new JArray();
foreach (var a in _job["rtnData"]["list2"])
{
@@ -113,21 +144,21 @@
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);
+
+ Toast vm = new Toast((goodTag == "鈭�" ? 1 : -1), _msg);
+ vm.Show();
};
}
else
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ {
+ Toast vm = new Toast(-1, _rtn.rtnMsg);
+ vm.Show();
+ }
}
catch (Exception ex)
{
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ Toast vm = new Toast(-1, ex.Message);
+ vm.Show();
}
}
}
--
Gitblit v1.9.3