From e3b7fd23fa49bc0329e43d274d9a3e0563e4420d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 30 五月 2025 13:57:19 +0800
Subject: [PATCH] 缺陷描述

---
 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 741dbc8..3a34c9e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -40,7 +40,7 @@
             toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
-            toolBarMenu1.xlsInService = "XlsInItemJyxm&"+ strType;
+            toolBarMenu1.xlsInService = "XlsInItemJyxm&" + strType;
             //绫诲瀷锛宨qc,ipqc宸℃锛宨pqc棣栨鏌�,fqc锛宨qc鐨勬牱鍝佸�奸粯璁や负5锛屽叾瀹冧负1
             txt_ftype.Text = strType;
             if (strType == "iqc")
@@ -49,6 +49,11 @@
             if (strType != "ipqc宸℃")
             {
                 gvMx1.Columns["stationName"].Visible = false;
+            }
+            //濡傛灉鏄痠pqc棣栨锛屾樉绀鸿璇�
+            if (strType != "ipqc棣栨")
+            {
+                gvMx1.Columns["isRzxx"].Visible = false;
             }
             //鏂拌鍒濆鍊�
             this.gvMx1.InitNewRow += (s, e) =>
@@ -86,7 +91,7 @@
                     Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ラ」鐩湭瀹℃牳锛屾殏涓嶈兘澶嶅埗鍒板叾瀹冪墿鏂欙紒");
                     return;
                 }
-                Frm_WorkTechniqueShow frm = new Frm_WorkTechniqueShow(lbGuid.Text.Trim(), strType);
+                JyxmShow frm = new JyxmShow(lbGuid.Text.Trim(), strType);
                 frm.ShowDialog();
             };
         }
@@ -320,6 +325,10 @@
                         string _Fstand = row["Fstand"].ToString();
                         string _FupAllow = row["FupAllow"].ToString();
                         string _FdownAllow = row["FdownAllow"].ToString();
+                        string _isRzxxTxt = row["isRzxx"].ToString();
+                        bool _isRzxx = false;
+                        if (_isRzxxTxt == "1" || _isRzxxTxt.ToUpper() == "true".ToUpper())
+                            _isRzxx = true;
                         //鍋囧涓変釜閮戒负绌洪�氳繃
                         if (string.IsNullOrEmpty(_Fstand) && string.IsNullOrEmpty(_FupAllow) && string.IsNullOrEmpty(_FdownAllow))
                         {
@@ -360,6 +369,7 @@
                             FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()),
                             ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),
                             stationName = row["stationName"].ToString(),
+                            isRzxx = _isRzxx,
                         });
                     }
                 }
@@ -802,5 +812,6 @@
             }
         }
         #endregion
+
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3