From ac72a05075a2211000cd392b3f38bcbb26327d5b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 14 六月 2025 17:09:54 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index dd6eb1e..42e941b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -36,7 +36,7 @@
             txt_gx.Text = _fGx;
             txt_bc.Text = _fBc;
             txt_dianJianPath.Text = _strinOther;
-            dianJianPath= _strinOther;
+            dianJianPath = _strinOther;
             this.Text = "宸ュ簭閲囬泦銆�" + _fGx + " - " + _fBc + "銆�";
             addColumn();
             txt_barCode.KeyDown += (s, e) =>
@@ -93,6 +93,7 @@
             {
                 return _obj;
             }
+            //鐢垫
             if (txt_gx.Text.Trim() == fGxDianJian)
             {
                 string TM = "";
@@ -109,9 +110,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 +138,11 @@
                 _obj.t009 = JNV;
                 _obj.t010 = XLV;
                 _obj.t011 = GVV;
-              //  File.WriteAllText(dianJianPath, "");
+                //姝e紡涓婄嚎瑕佹竻绌烘枃鏈暟鎹�
+                //File.WriteAllText(dianJianPath, "");
                 return _obj;
             }
-
+            //姘存
             if (txt_gx.Text.Trim() == fGxShouJian)
             {
                 string strCsl1 = "strCsl1";
@@ -191,12 +192,12 @@
                 return;
             }
             dynamic _obj = getObj(_barCode, _checkResult, _badDescription);
-            if (_obj == null)
-            {
-                Toast vm = new Toast(-1, "~璇诲彇鏁版嵁澶辫触锛岃妫�鏌ヨ澶噡");
-                vm.Show();
-                return;
-            }
+            //if (_obj == null)
+            //{
+            //    Toast vm = new Toast(-1, "~璇诲彇鏁版嵁澶辫触锛岃妫�鏌ヨ澶噡");
+            //    vm.Show();
+            //    return;
+            //}
             try
             {
                 string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
@@ -421,7 +422,5 @@
                 gvMx1.Columns.Add(newColumn);
             }
         }
-
-       
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3