From 11720482d878d36e0651842c76873ca27cfa6615 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 07 五月 2025 15:59:31 +0800
Subject: [PATCH] 工单梳理

---
 DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs |   39 +++++++++++++++++++++++++++++++++------
 1 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index a111ee1..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;
@@ -33,19 +34,42 @@
             };
             btnBad.Click += (s, e) =>
             {
-                getModel("", badTag);
+                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(-1, "~璇峰厛鎵拷婧爜~");
@@ -55,12 +79,13 @@
             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
             {
@@ -69,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();
@@ -95,6 +122,7 @@
                     {
                         Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                     }
+                    //涓嶈壇鍝�
                     JArray array2 = new JArray();
                     foreach (var a in _job["rtnData"]["list2"])
                     {
@@ -126,7 +154,6 @@
                     Toast vm = new Toast(-1, _rtn.rtnMsg);
                     vm.Show();
                 }
-
             }
             catch (Exception ex)
             {

--
Gitblit v1.9.3