From a80c1ccadaa85132c7ac26474e7aab3da7706cbc Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 02 六月 2025 13:24:13 +0800
Subject: [PATCH] iqc导出

---
 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs |   69 ++++++++++++++++++++--------------
 1 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 3a34c9e..48fb1fd 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -18,7 +18,6 @@
     public partial class Jyxm : DevExpress.XtraEditors.XtraUserControl
     {
         private List<FilterEntity> _filterList = new List<FilterEntity>();
-        string _ucItem = "";//鐗╂枡
         private readonly string _webServiceName = "MesQmCheckitemManager/";
         public string strType = "";//iqc type
         public decimal dfValue = 1;  //iqc鐨勬牱鍝佹暟閲忛粯璁�5锛屽惁鍒�1
@@ -91,7 +90,7 @@
                     Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ラ」鐩湭瀹℃牳锛屾殏涓嶈兘澶嶅埗鍒板叾瀹冪墿鏂欙紒");
                     return;
                 }
-                JyxmShow frm = new JyxmShow(lbGuid.Text.Trim(), strType);
+                JyxmShowCopy frm = new JyxmShowCopy(lbGuid.Text.Trim(), strType);
                 frm.ShowDialog();
             };
         }
@@ -257,14 +256,7 @@
         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();
+            string _ItemId = txt_itemId.EditValue.ToString().Trim();
             if (string.IsNullOrEmpty(_ItemId))
             {
                 MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�");
@@ -369,6 +361,7 @@
                             FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()),
                             ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),
                             stationName = row["stationName"].ToString(),
+                            FcheckType = row["FcheckType"].ToString(),
                             isRzxx = _isRzxx,
                         });
                     }
@@ -488,12 +481,10 @@
                 if (_rtn.rtnCode > 0)
                 {
                     var dy = _rtn.rtnData;
-                    _ucItem = dy.itemId;
                     lbGuid.Text = strGuid;
                     var gvList = new List<GridView>();
                     gvList.Add(gvMx1);
                     UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
-                    _ucItem = "";
                     var _job = JObject.Parse(strJson);
                     var array = new JArray();
                     foreach (var a in _job["rtnData"]["list"]) array.Add(a);
@@ -596,19 +587,27 @@
         #region 浠ヤ笅涓虹绉嶄笅鎷�
         private void _setIno()
         {
-            this.txt_fSubsidiary.EditChanged += (s, e) =>
+            txt_itemId.Click += (s, e) =>
             {
-                string _orgId = txt_fSubsidiary.GetId();
-                if (string.IsNullOrEmpty(_orgId))
-                    return;
-                txt_itemId.getSuppler(_orgId, _ucItem, " ", strType);
-            };
-            txt_itemId.EditChanged += (s, e) =>
-            {
-                if (!string.IsNullOrEmpty(this.txt_itemId.GetModel()))
-                    txt_gg.Text = this.txt_itemId.GetModel();
-                if (!string.IsNullOrEmpty(this.txt_itemId.GetCode()))
-                    txt_itemNo.Text = this.txt_itemId.GetCode();
+                var frm = new JyxmShow(this.strType);
+                frm.UpdateParent += (ss, ee) =>
+                {
+                    try
+                    {
+                        var lst = new List<dynamic>();
+                        lst = ee.DynamicList;
+                        txt_itemId.Text = lst[0].itemId;
+                        txt_gg.Text = lst[0].itemModel;
+                        txt_mc.Text = lst[0].itemName;
+                        txt_itemNo.Text = lst[0].itemNo;
+                        txt_fSubsidiary.Text = lst[0].fSubsidiary;
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show(ex.Message);
+                    }
+                };
+                frm.ShowDialog();
             };
             _getListJyxm();
             _getListJygj();
@@ -616,7 +615,9 @@
             _getListJssp();
             _getListJysp();
             _getListStation();
+            _getListGroup();
         }
+
         /// <summary>
         /// 璇诲彇妫�楠岄」鐩�
         /// </summary>
@@ -702,8 +703,6 @@
                 foreach (DataRow dr in dt.Rows)
                 {
                     rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
-                    //rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
-                    //string ddddd = dr["SampleSizeName"].ToString();
                 }
             }
             catch (Exception ex)
@@ -748,7 +747,22 @@
                 ,"7.鐗规畩妫�楠屾按骞�(S4)"
             });
         }
-
+        /// <summary>
+        /// 璇诲彇妫�楠屾按骞�
+        /// </summary>
+        private void _getListGroup()
+        {
+            rptGroup.Items.AddRange(new string[] {
+               "澶栬"
+               ,"棰滆壊"
+               ,"灏哄"
+               , "鍏抽敭閮ㄤ欢涓�鑷存��"
+               , "鍝佹按娴嬭瘯"
+                ,"鍒剁儹鎬ц兘"
+                ,"杩涙按鍘嬪姏"
+                ,"鐢垫皵鎬ц兘"
+            });
+        }
         /// <summary>
         /// 鍏宠仈妫�楠屾爣鍑嗗悕绉�
         /// </summary>
@@ -812,6 +826,5 @@
             }
         }
         #endregion
-
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3