From c3ebc2116abc274eb2220e7a24c4ca03acad3a1d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 21 四月 2025 17:49:19 +0800
Subject: [PATCH] iqc

---
 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs |  173 ++++++++++++++++-----------------------------------------
 1 files changed, 48 insertions(+), 125 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 9fcc701..c19a8f9 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -1,9 +1,4 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
 using DevExpress.XtraGrid.Views.Grid;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
@@ -11,6 +6,11 @@
 using MES.Service.Modes;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
 
 
 namespace Gs.DevApp.DevFrm.QC
@@ -19,7 +19,8 @@
     {
         private List<FilterEntity> _filterList = new List<FilterEntity>();
         private readonly string _webServiceName = "MesQmCheckitemManager/";
-        public string strType = "";
+        public string strType = "";//iqc type
+        public decimal dfValue = 1;  //iqc鐨勬牱鍝佹暟閲忛粯璁�5锛屽惁鍒�1
         public Jyxm(string _strType)
         {
             InitializeComponent();
@@ -37,13 +38,13 @@
             toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
             toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
-            toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
-            //iqc鐨勬牱鍝佹暟閲忛粯璁�5锛屽惁鍒�1
-            decimal _dfValue = 1;
+            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            txt_ftype.Text = strType;
             if (strType == "iqc")
-                _dfValue = 5;
-            this.gvMx1.InitNewRow += (s, e) => { 
-                this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", _dfValue);
+                dfValue = 5;
+            this.gvMx1.InitNewRow += (s, e) =>
+            {
+                this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", dfValue);
                 int newIndex = gvMx1.DataRowCount + 1;
                 this.gvMx1.SetRowCellValue(e.RowHandle, "forder", newIndex);
             };
@@ -53,7 +54,7 @@
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, parentForm, "foneChecked", "", (value) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
-            });
+            }, tips);
             Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
             {
                 getModel(value);
@@ -64,33 +65,21 @@
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
             _setIno();
-            btnSelect.Click += (s, e) =>
+            btnCopy.Click += (s, e) =>
             {
-                var frm = new SelectCheckDt("jyxm");
-                frm.UpdateParent += (ss, ee) =>
+                if ((lbGuid.Text.Trim().Length < 10))
                 {
-                    var lst = ee.DynamicList;
-                    var json = JsonConvert.SerializeObject(lst);
-                    DataTable _newTable = (DataTable)JsonConvert.DeserializeObject(json, (typeof(DataTable)));
-                    DataTable _oldTable = (DataTable)gridControl2.DataSource;
-                    DataRow[] sourceRows = _newTable.Select();
-                    for (int i = 0; i < sourceRows.Length; i++)
-                    {
-                        _oldTable.ImportRow(sourceRows[i]);
-                    }
-                    gridControl2.BindingContext = new BindingContext();
-                    gridControl2.DataSource = _oldTable;
-                    gridControl2.ForceInitialize();
-                };
+                    Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇峰厛淇濆瓨褰撳墠淇℃伅锛�");
+                    return;
+                }
+                JyxmShow frm = new JyxmShow(lbGuid.Text.Trim(), strType);
                 frm.ShowDialog();
             };
-            btnSave.Click += BtnSave_Click;
         }
-
 
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
-            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
             Task.Delay(100);
             getPageList(1);
         }
@@ -117,11 +106,10 @@
                 parentForm = this.Parent as Form;
             else
                 parentForm = this.Parent.Parent as Form;
-
             gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
             gridView1.ActiveFilter.Clear();
             gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-              var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
+            var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
             frm.UpdateParent += Frm_UpdateParent;
             frm.ShowDialog();
         }
@@ -136,14 +124,16 @@
             _filterList = e.FilterList;
             getPageList(1);
         }
+
         /// <summary>
-        /// 鎵瑰噯
+        /// 鍙嶅鏍�
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void ToolBarMenu1_btnPiZhunClick(object sender, EventArgs e)
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
         {
-            _toolCk(2);
+            _toolCk(0);
         }
 
         /// <summary>
@@ -221,7 +211,6 @@
             {
                 List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                 gvList.Add(gvMx1);
-                gvList.Add(gridView2);
                 UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
             }
         }
@@ -237,10 +226,8 @@
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
             var gridViews = new List<GridView>();
             gridViews.Add(gvMx1);
-            gridViews.Add(gridView2);
             UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
             UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
-            xtraTabPageCopy.PageEnabled = false;
         }
 
         /// <summary>
@@ -315,7 +302,6 @@
                         //鍋囧涓変釜閮戒负绌洪�氳繃
                         if (string.IsNullOrEmpty(_Fstand) && string.IsNullOrEmpty(_FupAllow) && string.IsNullOrEmpty(_FdownAllow))
                         {
-
                         }
                         else
                         {
@@ -362,7 +348,7 @@
                     Memo = txt_memo.Text.Trim(),
                     ItemNo = txt_itemNo.Text.Trim(),
                     Ftype = this.strType,
-                    Fversion = Gs.DevApp.ToolBox.UtilityHelper.ToLong(txt_fversion.Text.Trim()),
+                    Fversion = 0,
                     list = lst
                 };
                 try
@@ -379,7 +365,6 @@
                         toolBarMenu1.isSetBtn = true;
                         var gridViews = new List<GridView>();
                         gridViews.Add(gvMx1);
-                        gridViews.Add(gridView2);
                         UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gridViews);
                         toolBarMenu1.currentAction = "";
                         Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
@@ -402,7 +387,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 b.guid is not null";
             _sbSqlWhere += " and a.FTYPE='" + this.strType + "'";
             var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount,
@@ -425,7 +410,6 @@
                         gcMain1.DataSource = dt;
                         gcMain1.ForceInitialize();
                         gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
-                      
                     }
                     else
                         UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -455,7 +439,6 @@
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
-            xtraTabPageCopy.PageEnabled = !isEdit;
             var _obj = new
             {
                 guid = strGuid //涓诲缓
@@ -490,7 +473,6 @@
                     {
                         UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                     }
-                    UtilityHelper.SetDefaultTable(gridControl2, gridView2);
                 }
                 else
                 {
@@ -514,6 +496,9 @@
             {
                 case -1:
                     strMsg = "鍒犻櫎";
+                    break;
+                case 0:
+                    strMsg = "鍙嶅鏍�";
                     break;
                 case 1:
                     strMsg = "瀹℃牳";
@@ -543,23 +528,28 @@
                     _webServiceName + "EditModelSubmit",
                     JsonConvert.SerializeObject(_obj));
                 var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+              
+                if (_inFieldValue < 0 && _rtn.rtnCode > 0)
+                {
+                    if (xtraTabControl1.SelectedTabPageIndex == 0)
+                    {
+                        getPageList(this.pageBar1.CurrentPage);
+                    }
+                    else
+                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+                }
                 if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                 {
                     if (xtraTabControl1.SelectedTabPageIndex == 1)
                     {
                         getModel(lbGuid.Text.Trim());
-                        Form parentForm = this.FindForm();
-                        UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, parentForm, _inFieldValue > 0 ? "1" : "0");
                     }
-                    else
-                    {
-                        //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
-                        getPageList(this.pageBar1.CurrentPage);
-                        int rowHandle = gridView1.LocateByValue("guid", rowGuid);
-                        gridView1.FocusedRowHandle = rowHandle;
-                    }
+                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+                    gridView1.FocusedRowHandle = rowHandle;
+                    Form parentForm = this.FindForm();
+                    UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, parentForm, _inFieldValue.ToString());
                 }
+                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
             }
             catch (Exception ex)
             {
@@ -757,72 +747,5 @@
             }
         }
         #endregion
-        /// <summary>
-        /// 鍒犻櫎澶嶅埗椤�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
-        {
-            gridView2.CloseEditor();
-            gridView2.UpdateCurrentRow();
-            var rowhandle = gridView2.FocusedRowHandle;
-            if (rowhandle < 0)
-                return;
-            if (e.Button.Index == 0)
-            {
-                var dr = gridView2.GetDataRow(rowhandle);
-                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
-                    return;
-                gridView2.DeleteRow(rowhandle);
-                return;
-            }
-        }
-        /// <summary>
-        /// 鎻愪氦鐗╂枡澶嶅埗
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// <exception cref="NotImplementedException"></exception>
-        private void BtnSave_Click(object sender, EventArgs e)
-        {
-            int _rows = gridView2.RowCount;
-            if (_rows <= 0)
-            {
-                MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
-                return;
-            }
-
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�" + _rows.ToString() + "鏉℃暟鎹紝纭畾淇濆瓨鍚楋紵"))
-                return;
-            System.Text.StringBuilder _sbGuids = new System.Text.StringBuilder();
-            for (var i = 0; i < gridView2.DataRowCount; i++)
-            {
-                var row = gridView2.GetDataRow(i);
-                if (_sbGuids.Length > 0)
-                    _sbGuids.Append(",");
-                Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
-                _sbGuids.Append(_guid.ToString());
-            }
-            var _obj = new
-            {
-                sourceGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
-                itemGuids = _sbGuids.ToString()
-            };
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("", _webServiceName + "ItemsComyMx", JsonConvert.SerializeObject(_obj));
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                if (_rtn.rtnCode > 0)
-                {
-                    UtilityHelper.SetDefaultTable(gridControl2, gridView2);
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3