From baef454ef7dc66bc1dfbe7abef57f497ae1e05a1 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 04 六月 2025 08:28:15 +0800
Subject: [PATCH] iqc巡检导出

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

diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 3135a91..99ef870 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -49,7 +49,7 @@
             };
             btnBad.Click += (s, e) =>
             {
-                UcDictionarySelect frm = new UcDictionarySelect("涓嶈壇鎻忚堪", " s_type='宸ュ簭閲囬泦涓嶈壇椤圭洰' and pid<>'00000000-0000-0000-0000-000000000000'");
+                UcDictionarySelect frm = new UcDictionarySelect("宸ュ簭涓嶈壇鎻忚堪", " a.s_type='宸ュ簭涓嶈壇鎻忚堪' and pid<>'00000000-0000-0000-0000-000000000000'");
                 frm.UpdateParent += (ss, ee) =>
                 {
                     System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
@@ -111,7 +111,7 @@
                 {
                     return null;
                 }
-                File.WriteAllText(dianJianPath, "");
+               
                 JArray dsTemp = JArray.Parse(myStr);
                 foreach (var ss in dsTemp)  //鏌ユ壘鏌愪釜瀛楁涓庡��
                 {
@@ -121,7 +121,7 @@
                     JN = (((JObject)ss)["JiaoNai"] == null) ? "" : ((JObject)ss)["JiaoNai"]["state"].ToString();
                     XL = (((JObject)ss)["XieLou"] == null) ? "" : ((JObject)ss)["XieLou"]["state"].ToString();
                     GV = (((JObject)ss)["GongLv"] == null) ? "" : ((JObject)ss)["GongLv"]["state"].ToString();
-                    JDV = (((JObject)ss)["JieDi"] == null) ? "" : ((JObject)ss)["JieDi"]["value"].ToString().Replace(" ", ", ");
+                    JDV = (((JObject)ss)["JieDi"] == null) ? "" : ((JObject)ss)["JieDi"]["value"].ToString().Replace(" ", ",");
                     JYV = (((JObject)ss)["JueYuan"] == null) ? "" : ((JObject)ss)["JueYuan"]["value"].ToString().Replace(" ", ", ");
                     JNV = (((JObject)ss)["JiaoNai"] == null) ? "" : ((JObject)ss)["JiaoNai"]["value"].ToString().Replace(" ", ", ");
                     XLV = (((JObject)ss)["XieLou"] == null) ? "" : ((JObject)ss)["XieLou"]["value"].ToString().Replace(" ", ", ");
@@ -138,6 +138,7 @@
                 _obj.t009 = JNV;
                 _obj.t010 = XLV;
                 _obj.t011 = GVV;
+              //  File.WriteAllText(dianJianPath, "");
                 return _obj;
             }
 
@@ -167,6 +168,11 @@
                 // _obj.t012 = SJJG;杩欎釜寰呯‘瀹�
                 return _obj;
             }
+
+            if (txt_gx.Text.Trim() == fGxZhongJian)
+            {
+                return _obj;
+            }
             return null;
         }
 

--
Gitblit v1.9.3