From 557bbc16b5341d4e9ba1352ec48e66fc573b88cb Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 27 五月 2025 15:50:55 +0800
Subject: [PATCH] 检验

---
 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 3ffbf41..3a34c9e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -40,13 +40,22 @@
             toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            toolBarMenu1.xlsInService = "XlsInItemJyxm&" + strType;
+            //绫诲瀷锛宨qc,ipqc宸℃锛宨pqc棣栨鏌�,fqc锛宨qc鐨勬牱鍝佸�奸粯璁や负5锛屽叾瀹冧负1
             txt_ftype.Text = strType;
             if (strType == "iqc")
                 dfValue = 5;
+            //濡傛灉鏄痠pqc宸℃锛屾樉绀哄伐浣�
             if (strType != "ipqc宸℃")
             {
                 gvMx1.Columns["stationName"].Visible = false;
             }
+            //濡傛灉鏄痠pqc棣栨锛屾樉绀鸿璇�
+            if (strType != "ipqc棣栨")
+            {
+                gvMx1.Columns["isRzxx"].Visible = false;
+            }
+            //鏂拌鍒濆鍊�
             this.gvMx1.InitNewRow += (s, e) =>
         {
             this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", dfValue);
@@ -248,6 +257,13 @@
         private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
         {
             toolBarMenu1.isSetBtn = false;
+            string _orgId = txt_fSubsidiary.GetId();
+            if (string.IsNullOrEmpty(_orgId))
+            {
+                MsgHelper.Warning("璇烽�夋嫨浣跨敤缁勭粐锛�");
+                txt_fSubsidiary.Focus();
+                return;
+            }
             string _ItemId = txt_itemId.GetId();
             if (string.IsNullOrEmpty(_ItemId))
             {
@@ -309,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))
                         {
@@ -349,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,
                         });
                     }
                 }
@@ -439,7 +460,10 @@
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
-
+        /// <summary>
+        /// 璇诲彇瀹炰綋
+        /// </summary>
+        /// <param name="strGuid"></param>
         private void getModel(string strGuid)
         {
             bool isEdit = false;
@@ -639,8 +663,6 @@
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
-
-
         }
         /// <summary>
         /// 璇诲彇妫�楠屽伐鍏�
@@ -748,6 +770,11 @@
                 gvMx1.SetRowCellValue(dataIndex, "sampleSizeName", _txt);
             }
         }
+        /// <summary>
+        /// 绉诲嚭鏄庣粏
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
             gvMx1.CloseEditor();
@@ -785,5 +812,6 @@
             }
         }
         #endregion
+
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3