From 1b799e1d64e6a2e151f52092542c6892ea858f0c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 09 五月 2025 13:13:56 +0800
Subject: [PATCH] 工序采集

---
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs |   43 +++++++++++++++++++++++++++++++++++--------
 1 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index fd90553..1523e56 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -14,6 +14,7 @@
 {
     public partial class Frm_MesQaItemsDetect01 : DevExpress.XtraEditors.XtraForm
     {
+        string _strTag = "N:涓嶅悎鏍�";
         string _webServiceName = "MesQaItemsDetect01Manager/";
         List<FilterEntity> _filterList = new List<FilterEntity>();
         public Frm_MesQaItemsDetect01()
@@ -48,7 +49,9 @@
             xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
             gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
             btnIpt.Click += BtnIpt_Click;
+            btnYcReport.Click += BtnYcReport_Click;
         }
+
         /// <summary>
         /// 鎵归噺褰曞叆
         /// </summary>
@@ -246,11 +249,11 @@
             }
             if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎻愪氦妫�楠屽悧锛�"))
                 return;
-            if (txt_fcheckResu.Text.Trim() == "涓嶅悎鏍�")
+            if (txt_fcheckResu.Text.Trim() == _strTag)
             {
-                if (string.IsNullOrEmpty(txt_remarks.Text.Trim()))
+                if (string.IsNullOrEmpty(txt_fngDesc.Text.Trim()))
                 {
-                    MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃讹紝璇峰～鍐欏娉ㄨ鏄庯紒");
+                    MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃讹紝璇峰～鍐欏紓甯稿娉ㄨ鏄庯紒");
                     return;
                 }
             };
@@ -355,16 +358,16 @@
         private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
         {
             toolBarMenu1.isSetBtn = false;
-            if (txt_fcheckResu.Text.Trim() == "N:涓嶅悎鏍�" && string.IsNullOrEmpty(txt_remarks.Text.Trim()))
+            if (txt_fcheckResu.Text.Trim() == _strTag && string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim()))
             {
                 Gs.DevApp.ToolBox.MsgHelper.Warning("褰撴楠岀粨鏋滀笉鍚堟牸鏃讹紝璇峰～鍐欏娉ㄨ鏄庯紒");
-                txt_remarks.Focus();
+                txt_fngDesc.Focus();
                 return;
             }
             var _obj = new
             {
                 guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-                remarks = txt_remarks.Text.Trim(),
+               fngDesc = txt_fngDesc.TextTxt.Trim(),
             };
             try
             {
@@ -379,6 +382,7 @@
                     this.setEable(false);
                     toolBarMenu1.currentAction = "";
                     Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+
                 }
             }
             catch (Exception ex)
@@ -394,7 +398,7 @@
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage)
         {
-            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
             // _sbSqlWhere += " and isnull(fsubmit,0)=0";
             PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
             string json = JsonConvert.SerializeObject(pgq);
@@ -452,6 +456,7 @@
                 if (_rtn.rtnCode > 0)
                 {
                     dynamic dy = _rtn.rtnData;
+                    btnYcReport.ToolTip = dy.toGuid.ToString();
                     lbGuid.Text = strGuid;
                     List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                     gvList.Add(gvMx1);
@@ -554,10 +559,32 @@
 
         private void setEable(bool bl)
         {
-
             txtJianYan.ReadOnly = !bl;
             btnLoad.Enabled = bl;
             btnIpt.Text = (bl == true ? "褰曞叆鏍锋湰" : "鏌ョ湅鏍锋湰");
         }
+
+        #region 鎵撳紑鐖朵翰绐楀彛濮旀墭
+        public event EventHandler<UpdateParentEventArgs> ToUpdateParent;
+        private void BtnYcReport_Click(object sender, EventArgs e)
+        {
+            string _toGuid = (btnYcReport.ToolTip == null ? "" : btnYcReport.ToolTip.ToString());
+            if (string.IsNullOrEmpty(_toGuid))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ュ崟鏃犲紓甯告姤鍛婏紝鏌ョ湅澶辫触锛�");
+                return;
+            }
+            if (ToUpdateParent != null)
+            {
+                List<string> lst = new List<string>();
+                lst.Add("Gs.DevApp.DevFrm.QC.MesQcExceptional");//绫诲悕
+                lst.Add(_toGuid);//寮傚父鎶ュ憡涓婚敭
+                lst.Add("tab1");//鍏跺畠
+                ToUpdateParent?.Invoke(this,
+                new UpdateParentEventArgs { StringList = lst });
+            }
+        }
+        #endregion
+
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3