From 10682f34abfcfcd7a3bfa8ab359bb1602a1e3503 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 25 七月 2025 08:10:40 +0800
Subject: [PATCH] 1

---
 DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs |   56 +++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index dd6eb1e..5b5cde9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -1,4 +1,5 @@
 锘縰sing DevExpress.XtraGrid.Columns;
+using DevExpress.XtraLayout.Utils;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Newtonsoft.Json;
@@ -33,15 +34,23 @@
         public Frm_Work01(string _fGx, string _fBc, string _strinOther)
         {
             InitializeComponent();
+            gvMx1.IndicatorWidth = 60;
+            gvMx1.CustomDrawRowIndicator += (s, e) =>
+            {
+                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
+            };
             txt_gx.Text = _fGx;
             txt_bc.Text = _fBc;
             txt_dianJianPath.Text = _strinOther;
-            dianJianPath= _strinOther;
+            dianJianPath = _strinOther;
             this.Text = "宸ュ簭閲囬泦銆�" + _fGx + " - " + _fBc + "銆�";
+            label8.Text = _fGx + "鏁伴噺";
             addColumn();
             txt_barCode.KeyDown += (s, e) =>
             {
-                if (e.KeyCode == Keys.Enter) { addModel(goodTag); };
+                if (e.KeyCode == Keys.Enter) { addModel(goodTag); }
+                ;
             };
             btnGood.Click += (s, e) =>
             {
@@ -49,6 +58,13 @@
             };
             btnBad.Click += (s, e) =>
             {
+                string _barCode = txt_barCode.Text.Trim();
+                if (string.IsNullOrEmpty(_barCode))
+                {
+                    Toast vm = new Toast(-1, "~璇峰厛鎵拷婧爜~");
+                    vm.Show();
+                    return;
+                }
                 UcDictionarySelect frm = new UcDictionarySelect("宸ュ簭涓嶈壇鎻忚堪", " a.s_type='宸ュ簭涓嶈壇鎻忚堪' and pid<>'00000000-0000-0000-0000-000000000000'");
                 frm.UpdateParent += (ss, ee) =>
                 {
@@ -93,6 +109,7 @@
             {
                 return _obj;
             }
+            //鐢垫
             if (txt_gx.Text.Trim() == fGxDianJian)
             {
                 string TM = "";
@@ -109,9 +126,8 @@
                 string myStr = File.ReadAllText(dianJianPath, Encoding.Default);
                 if (myStr == "")
                 {
-                    return null;
+                    return _obj;
                 }
-               
                 JArray dsTemp = JArray.Parse(myStr);
                 foreach (var ss in dsTemp)  //鏌ユ壘鏌愪釜瀛楁涓庡��
                 {
@@ -138,10 +154,11 @@
                 _obj.t009 = JNV;
                 _obj.t010 = XLV;
                 _obj.t011 = GVV;
-              //  File.WriteAllText(dianJianPath, "");
+                //姝ｅ紡涓婄嚎瑕佹竻绌烘枃鏈暟鎹�
+                //File.WriteAllText(dianJianPath, "");
                 return _obj;
             }
-
+            //姘存
             if (txt_gx.Text.Trim() == fGxShouJian)
             {
                 string strCsl1 = "strCsl1";
@@ -168,7 +185,6 @@
                 // _obj.t012 = SJJG;杩欎釜寰呯‘瀹�
                 return _obj;
             }
-
             if (txt_gx.Text.Trim() == fGxZhongJian)
             {
                 return _obj;
@@ -191,12 +207,6 @@
                 return;
             }
             dynamic _obj = getObj(_barCode, _checkResult, _badDescription);
-            if (_obj == null)
-            {
-                Toast vm = new Toast(-1, "~璇诲彇鏁版嵁澶辫触锛岃妫�鏌ヨ澶噡");
-                vm.Show();
-                return;
-            }
             try
             {
                 string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
@@ -256,7 +266,8 @@
                     {
                         Toast vm = new Toast((goodTag == "鈭�" ? 1 : -1), _msg);
                         vm.Show();
-                    };
+                    }
+                    ;
                 }
                 else
                 {
@@ -272,10 +283,21 @@
         }
 
         /// <summary>
-        /// 澧炲姞鐢垫鍙栨暟鐨勫垪
+        /// 澧炲姞鐢垫锛屾按妫�鐨勫垪
         /// </summary>
         public void addColumn()
         {
+            //鍙湁鐢垫鎵嶆樉绀�
+            if (txt_gx.Text.Trim() == fGxDianJian)
+                layDianJian.Visibility = LayoutVisibility.Always;
+            else
+                layDianJian.Visibility = LayoutVisibility.Never;
+            //鍙湁姘存鎵嶆樉绀�
+            if (txt_gx.Text.Trim() == fGxShouJian)
+                layShuiJian.Visibility = LayoutVisibility.Always;
+            else
+                layShuiJian.Visibility = LayoutVisibility.Never;
+
             List<dynamic> _lst = new List<dynamic>();
             if (txt_gx.Text.Trim() == fGxDianJian)
             {
@@ -328,7 +350,6 @@
                     kejian = true,
                     visibleIndex = 1,
                 });
-
                 _lst.Add(new
                 {
                     ziduan = "t011",
@@ -395,7 +416,6 @@
                     kejian = true,
                     visibleIndex = 1,
                 });
-
                 _lst.Add(new
                 {
                     ziduan = "t010",
@@ -421,7 +441,5 @@
                 gvMx1.Columns.Add(newColumn);
             }
         }
-
-       
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3