From 236874a930147c27e46c673d8c1a607f1260e8aa Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 31 三月 2025 12:43:43 +0800
Subject: [PATCH] 追溯码

---
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs |  479 ++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 305 insertions(+), 174 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index a6ef595..8f82d85 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -2,12 +2,13 @@
 using Gs.DevApp.DevFrm.QC.Models;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Drawing;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Gs.DevApp.DevFrm.QC
@@ -19,6 +20,34 @@
         public Frm_MesQmAql1()
         {
             InitializeComponent();
+            object[] _objAry = {  "A",
+            "B",
+            "C",
+            "D",
+            "E",
+            "F",
+            "G",
+            "H",
+            "I",
+            "J",
+            "K",
+            "L",
+            "M",
+            "N",
+            "O",
+            "P",
+            "Q",
+            "R",
+            "S",
+            "T"};
+            this.repositoryItemComboBox1.Items.AddRange(_objAry);
+            this.repositoryItemComboBox2.Items.AddRange(_objAry);
+            this.repositoryItemComboBox3.Items.AddRange(_objAry);
+            this.repositoryItemComboBox4.Items.AddRange(_objAry);
+            this.repositoryItemComboBox5.Items.AddRange(_objAry);
+            this.repositoryItemComboBox6.Items.AddRange(_objAry);
+            this.repositoryItemComboBox7.Items.AddRange(_objAry);
+            this.repositoryItemComboBox8.Items.AddRange(_objAry);
             this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
             this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
             this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
@@ -28,28 +57,24 @@
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
             toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
-            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
-            gridView1.FocusedRowChanged += (s, e) =>
+            this.toolBarMenu1.getXmlConfig();
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "foneChecked", "", (value) =>
+           {
+               Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+           });
+            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
             {
-                UtilityHelper.SetCheckIco(s, picCheckBox, this, "foneChecked", "");
-            };
-            getPageList(1, UtilityHelper.GetPageSize());
+                getModel(value);
+            }, (value) =>
+            {
+                getPageList(this.pageBar1.CurrentPage);
+            });
+            getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
-            gridView1.CustomDrawRowIndicator += (s, e) =>
-            {
-                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
-                {
-                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
-                }
-            };
-            gridView1.CustomDrawEmptyForeground += (s, e) =>
-            {
-                string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
-                Font f = new Font("寰蒋闆呴粦", 16);
-                Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
-                e.Graphics.DrawString(str, f, Brushes.Gray, r);
-            };
         }
+     
         /// <summary>
         /// 鎵瑰噯
         /// </summary>
@@ -59,17 +84,25 @@
         {
             string rowGuid, rowName;
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_sampleSizeNo, gridView1);
+                lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo");
             try
             {
                 string strJson = UtilityHelper.HttpPost("", _webServiceName + "Approval", JsonConvert.SerializeObject(rowGuid));
                 ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
                 if (_rtn.rtnCode > 0)
                 {
-                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
-                    getPageList(1, UtilityHelper.GetPageSize());
+                    if (xtraTabControl1.SelectedTabPageIndex == 1)
+                    {
+                        getModel(lbGuid.Text.Trim());
+                    }
+                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+                    gridView1.FocusedRowHandle = rowHandle;
+                    gridView1.SetFocusedRowCellValue("ftwoChecked", true);
+                    gridView1.SetFocusedRowCellValue("isenabled", true);
+                    gridView1.SetFocusedRowCellValue("ftwoCheckor", "宸叉壒鍑�");
+                    gridView1.SetFocusedRowCellValue("ftwoCheckdate", DateTime.Now.ToString());
                 }
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
             }
             catch (Exception ex)
             {
@@ -85,11 +118,7 @@
         /// <exception cref="NotImplementedException"></exception>
         private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
         {
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_sampleSizeNo, gridView1);
-            toolBarMenu1.guidKey = rowGuid;
+            _toolCk(0);
         }
 
         /// <summary>
@@ -99,24 +128,9 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
         {
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_sampleSizeNo, gridView1);
-            toolBarMenu1.guidKey = rowGuid;
+            _toolCk(1);
         }
 
-        /// <summary>
-        /// 鍙屽嚮浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
-        {
-            string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
-            if (!string.IsNullOrEmpty(rowGuid))
-                getModel(rowGuid, false, 999);
-        }
         /// <summary>
         /// 鍒嗛〉浜嬩欢
         /// </summary>
@@ -124,19 +138,9 @@
         /// <param name="pageSize"></param>
         private void PageBar1_PagerEvent(int curPage, int pageSize)
         {
-            getPageList(curPage, pageSize);
+            getPageList(curPage);
         }
-        /// <summary>
-        /// 鏌ヨ鍥炶皟
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
-        {
-            _filterList = e.FilterList;
-            getPageList(1, pageBar1.RowsCount);
-        }
-
+      
         /// <summary>
         /// 鍙栨秷浜嬩欢
         /// </summary>
@@ -144,7 +148,7 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
         {
-            UtilityHelper.JumpToTab(xtraTabControl1, 0);
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
         }
 
         /// <summary>
@@ -155,7 +159,7 @@
         private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
         {
             string rowGuid = "", rowName = "";
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1);
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
                 ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -172,8 +176,11 @@
                 ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                 if (_rtn.rtnCode > 0)
                 {
-                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
-                    getPageList(1, UtilityHelper.GetPageSize());
+                    if (xtraTabControl1.SelectedTabPageIndex == 0)
+                    { }
+                    else
+                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+                    getPageList(this.pageBar1.CurrentPage);
                 }
                 ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
             }
@@ -191,9 +198,19 @@
         private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
         {
             if (xtraTabControl1.SelectedTabPageIndex == 1)
-                getModel(lbGuid.Text.Trim(), false, 999);
+                getModel(lbGuid.Text.Trim());
             else
-                getPageList(1, UtilityHelper.GetPageSize());
+            {
+                //_filterList.Clear();
+                //if (gridView1.ActiveFilter.Count > 0)
+                //{
+                //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                //    gridView1.ActiveFilter.Clear();
+                //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                //}
+                //getPageList(1);
+                getPageList(this.pageBar1.CurrentPage);
+            }
         }
         /// <summary>
         /// 淇敼浜嬩欢
@@ -209,7 +226,18 @@
                 ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
-            getModel(rowGuid, true, 1);
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+            {
+                getModel(rowGuid);
+            }
+            else
+            {
+                List<GridView> gridViews = new List<GridView>();
+                gridViews.Add(gvMx1);
+                gridViews.Add(gvMx2);
+                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gridViews);
+            }
         }
         /// <summary>
         /// 鏂板浜嬩欢
@@ -218,13 +246,13 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
         {
-            UtilityHelper.JumpToTab(xtraTabControl1, 1);
             lbGuid.Text = "";
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
             List<GridView> gridViews = new List<GridView>();
             gridViews.Add(gvMx1);
             gridViews.Add(gvMx2);
-            UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
-             UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
+            UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
             UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
             txt_createDate.Text = DateTime.Now.ToString("G");
             txt_fversion.Text = "1";
@@ -251,101 +279,137 @@
                 return;
             }
             gvMx1.CloseEditor();
+            gvMx1.PostEditor();
             gvMx1.UpdateCurrentRow();
             gvMx2.CloseEditor();
+            gvMx2.PostEditor();
             gvMx2.UpdateCurrentRow();
-            var qmaql2 = new List<MesQmAql2>();
-            for (var i = 0; i < gvMx1.DataRowCount; i++)
-            {
-                var row = gvMx1.GetDataRow(i);
-                if (row != null)
-                    qmaql2.Add(new MesQmAql2
-                    {
-                        Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
-                        LotFrom = Convert.ToInt32(row["LotFrom"].ToString()),
-                        LotTo = Convert.ToInt32(row["LotTo"].ToString()),
-                        FlevelS1 = row["FlevelS1"].ToString(),
-                        FlevelS2 = row["FlevelS2"].ToString(),
-                        FlevelS3 = row["FlevelS3"].ToString(),
-                        FlevelS4 = row["FlevelS4"].ToString(),
-                        FlevelI = row["FlevelI"].ToString(),
-                        FlevelIi = row["FlevelIi"].ToString(),
-                        FlevelIii = row["FlevelIii"].ToString(),
-                        Memo = row["Memo"].ToString()
-                    });
-            }
-            var qmaql3 = new List<MesQmAql3>();
-            for (var i = 0; i < gvMx2.DataRowCount; i++)
-            {
-                var row = gvMx2.GetDataRow(i);
-                if (row != null)
-                    qmaql3.Add(new MesQmAql3
-                    {
-                        Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
-                        FsampleSizeWord = Convert.ToInt32(row["FsampleSizeWord"].ToString()),
-                        SampleSizeWord = row["SampleSizeWord"].ToString(),
-                        Aql00010 = Convert.ToInt32(row["Aql00010"].ToString()),
-                        Aql00015 = Convert.ToInt32(row["Aql00015"].ToString()),
-                        Aql00025 = Convert.ToInt32(row["Aql00025"].ToString()),
-                        Aql00040 = Convert.ToInt32(row["Aql00040"].ToString()),
-                        Aql00065 = Convert.ToInt32(row["Aql00065"].ToString()),
-                        Aql0010 = Convert.ToInt32(row["Aql0010"].ToString()),
-                        Aql0015 = Convert.ToInt32(row["Aql0015"].ToString()),
-                        Aql0025 = Convert.ToInt32(row["Aql0025"].ToString()),
-                        Aql0040 = Convert.ToInt32(row["Aql0040"].ToString()),
-                        Aql0065 = Convert.ToInt32(row["Aql0065"].ToString()),
-                        Aql0100 = Convert.ToInt32(row["Aql0100"].ToString()),
-                        Aql0150 = Convert.ToInt32(row["Aql0150"].ToString()),
-                        Aql0250 = Convert.ToInt32(row["Aql0250"].ToString()),
-                        Aql0400 = Convert.ToInt32(row["Aql0400"].ToString()),
-                        Aql0650 = Convert.ToInt32(row["Aql0650"].ToString()),
-                        Aql1000 = Convert.ToInt32(row["Aql1000"].ToString()),
-                        Memo = row["Memo"].ToString()
-                    });
-            }
-            if (qmaql2.Count <= 0)
-            {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("鏍锋湰閲忓瓙鐮佷笉鑳戒负绌猴紒");
-                return;
-            }
-            if (qmaql3.Count <= 0)
-            {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("鎶芥牱鏂规涓嶈兘涓虹┖锛�");
-                return;
-            }
-            var _obj = new MesQmAql1
-            {
-                Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
-                SampleSizeNo = txt_sampleSizeNo.Text.Trim(),
-                SampleSizeName = txt_sampleSizeName.Text.Trim(),
-                Memo = txt_memo.Text.Trim(),
-                CreateDate = DateTime.Now,
-                FtwoChecked = false,
-                Isenabled = false,
-                FoneChecked = false,
-                Fversion = Convert.ToInt32(txt_fversion.Text.Trim()),
-                MesQmAql2s = qmaql2,
-                MesQmAql3s = qmaql3
-            };
             try
             {
-                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                if (_rtn.rtnCode > 0)
+                var qmaql2 = new List<MesQmAql2>();
+                for (var i = 0; i < gvMx1.DataRowCount; i++)
                 {
-                    lbGuid.Text = _rtn.rtnData;
-                    toolBarMenu1.isSetBtn = true;
-                    List<GridView> gridViews = new List<GridView>();
-                    gridViews.Add(gvMx1);
-                    gridViews.Add(gvMx2);
-                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gridViews);
+                    var row = gvMx1.GetDataRow(i);
+                    if (row != null)
+                    {
+                        if (string.IsNullOrEmpty(row["LotFrom"].ToString()))
+                        {
+                            MsgHelper.ShowError("鎵归噺寮�濮嬩笉鑳戒负绌猴紒");
+                            return;
+                        }
+                        if (string.IsNullOrEmpty(row["LotTo"].ToString()))
+                        {
+                            MsgHelper.ShowError("鎵归噺缁撴潫涓嶈兘涓虹┖锛�");
+                            return;
+                        }
+                        qmaql2.Add(new MesQmAql2
+                        {
+                            Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
+                            LotFrom = Convert.ToInt32(row["LotFrom"].ToString()),
+                            LotTo = Convert.ToInt32(row["LotTo"].ToString()),
+                            FlevelS1 = row["FlevelS1"].ToString(),
+                            FlevelS2 = row["FlevelS2"].ToString(),
+                            FlevelS3 = row["FlevelS3"].ToString(),
+                            FlevelS4 = row["FlevelS4"].ToString(),
+                            FlevelI = row["FlevelI"].ToString(),
+                            FlevelIi = row["FlevelIi"].ToString(),
+                            FlevelIii = row["FlevelIii"].ToString(),
+                            Memo = row["Memo"].ToString()
+                        });
+                    }
+                }
+                var qmaql3 = new List<MesQmAql3>();
+                for (var i = 0; i < gvMx2.DataRowCount; i++)
+                {
+                    var row = gvMx2.GetDataRow(i);
+                    if (row != null)
+                    {
+                        if (string.IsNullOrEmpty(row["FsampleSizeWord"].ToString()))
+                        {
+                            MsgHelper.ShowError("鏍锋湰澶у皬涓嶈兘涓虹┖锛�");
+                            return;
+                        }
+                        if (string.IsNullOrEmpty(row["SampleSizeWord"].ToString()))
+                        {
+                            MsgHelper.ShowError("鏍锋湰瀛楃爜涓嶈兘涓虹┖锛�");
+                            return;
+                        }
+                        qmaql3.Add(new MesQmAql3
+                        {
+                            Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
+                            FsampleSizeWord = Convert.ToInt32(row["FsampleSizeWord"].ToString()),
+                            SampleSizeWord = row["SampleSizeWord"].ToString(),
+                            Aql00010 = Convert.ToInt32(row["Aql00010"].ToString()),
+                            Aql00015 = Convert.ToInt32(row["Aql00015"].ToString()),
+                            Aql00025 = Convert.ToInt32(row["Aql00025"].ToString()),
+                            Aql00040 = Convert.ToInt32(row["Aql00040"].ToString()),
+                            Aql00065 = Convert.ToInt32(row["Aql00065"].ToString()),
+                            Aql0010 = Convert.ToInt32(row["Aql0010"].ToString()),
+                            Aql0015 = Convert.ToInt32(row["Aql0015"].ToString()),
+                            Aql0025 = Convert.ToInt32(row["Aql0025"].ToString()),
+                            Aql0040 = Convert.ToInt32(row["Aql0040"].ToString()),
+                            Aql0065 = Convert.ToInt32(row["Aql0065"].ToString()),
+                            Aql0100 = Convert.ToInt32(row["Aql0100"].ToString()),
+                            Aql0150 = Convert.ToInt32(row["Aql0150"].ToString()),
+                            Aql0250 = Convert.ToInt32(row["Aql0250"].ToString()),
+                            Aql0400 = Convert.ToInt32(row["Aql0400"].ToString()),
+                            Aql0650 = Convert.ToInt32(row["Aql0650"].ToString()),
+                            Aql1000 = Convert.ToInt32(row["Aql1000"].ToString()),
+                            Memo = row["Memo"].ToString()
+                        });
+                    }
+                }
+                if (qmaql2.Count <= 0)
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.Warning("鏍锋湰閲忓瓙鐮佷笉鑳戒负绌猴紒");
+                    return;
+                }
+                if (qmaql3.Count <= 0)
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.Warning("鎶芥牱鏂规涓嶈兘涓虹┖锛�");
+                    return;
+                }
+                var _obj = new MesQmAql1
+                {
+                    Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
+                    SampleSizeNo = txt_sampleSizeNo.Text.Trim(),
+                    SampleSizeName = txt_sampleSizeName.Text.Trim(),
+                    Memo = txt_memo.Text.Trim(),
+                    CreateDate = DateTime.Now,
+                    FtwoChecked = false,
+                    Isenabled = false,
+                    FoneChecked = false,
+                    Fversion = Convert.ToInt32(txt_fversion.Text.Trim()),
+                    MesQmAql2s = qmaql2,
+                    MesQmAql3s = qmaql3
+                };
+                try
+                {
+                    string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+                    ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                    if (_rtn.rtnCode > 0)
+                    {
+                        lbGuid.Text = _rtn.rtnData;
+                        toolBarMenu1.isSetBtn = true;
+                        List<GridView> gridViews = new List<GridView>();
+                        gridViews.Add(gvMx1);
+                        gridViews.Add(gvMx2);
+                        UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gridViews);
+                        toolBarMenu1.currentAction = "";
+                    }
+                }
+                catch (Exception ex)
+                {
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
                 }
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+
+                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
+
         }
 
         /// <summary>
@@ -353,14 +417,10 @@
         /// </summary>
         /// <param name="curPage">绗嚑椤�</param>
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
-        private void getPageList(int curPage, int pageSize)
+        private void getPageList(int curPage)
         {
-            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
-            foreach (FilterEntity itm in _filterList)
-            {
-                _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
-            }
-            PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "create_date", "asc", "", _sbSqlWhere.ToString());
+            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
             string json = JsonConvert.SerializeObject(pgq);
             try
             {
@@ -369,15 +429,18 @@
                 if (dd.rtnCode > 0)
                 {
                     DataTable dt = dd.rtnData.list;
-                    gcMain.BindingContext = new BindingContext();
-                    gcMain.DataSource = dt;
-                    gcMain.ForceInitialize();
-                    int dddd = dd.rtnData.pages;//鎬婚〉
-                    pageBar1.TotalPages = dddd;
-                    pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+                    gcMain1.BindingContext = new BindingContext();
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMain1.DataSource = dt;
+                        gcMain1.ForceInitialize();
+                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+                    }
+                    else
+                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
                     pageBar1.CurrentPage = curPage;//褰撳墠椤�
-                    pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
-                    pageBar1.setTxt();
+                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
                 }
                 else
                 {
@@ -389,14 +452,16 @@
                 ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
-        private void getModel(string strGuid, bool isEdit, int tabIdx)
+        private void getModel(string strGuid)
         {
+            bool isEdit = false;
+            if (toolBarMenu1.currentAction == "add") return;
+            if (toolBarMenu1.currentAction == "edit") isEdit = true;
             if (string.IsNullOrEmpty(strGuid))
             {
                 ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
-            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
             var _obj = new
             {
                 guid = strGuid,//涓诲缓
@@ -412,7 +477,7 @@
                     List<GridView> gvList = new List<GridView>();
                     gvList.Add(gvMx1);
                     gvList.Add(gvMx2);
-                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
+                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
                     JObject _job = JObject.Parse(strJson);
                     JArray array = new JArray();
                     JArray mesQmAql3s = new JArray();
@@ -426,23 +491,23 @@
                         gcMx1.BindingContext = new BindingContext();
                         gcMx1.DataSource = dt;
                         gcMx1.ForceInitialize();
+                        gvMx1.BestFitColumns();
                     }
                     else
                     {
                         Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                     }
-
                     foreach (var a in _job["rtnData"]["mesQmAql3s"])
                     {
                         mesQmAql3s.Add(a);
                     }
-
                     DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(mesQmAql3s.ToString());
                     if (dt1.Rows.Count > 0)
                     {
                         gcMx2.BindingContext = new BindingContext();
                         gcMx2.DataSource = dt1;
                         gcMx2.ForceInitialize();
+                        gvMx2.BestFitColumns();
                     }
                     else
                     {
@@ -458,9 +523,15 @@
             }
         }
 
+        /// <summary>
+        /// 鍒犻櫎瀛楃爜
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
             gvMx1.CloseEditor();
+            gvMx1.PostEditor();
             gvMx1.UpdateCurrentRow();
             var rowhandle = gvMx1.FocusedRowHandle;
             if (rowhandle < 0)
@@ -486,7 +557,7 @@
                         JsonConvert.SerializeObject(lst));
                     var _rtn =
                         UtilityHelper.ReturnToDynamic(strJson);
-                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
+                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
 
                     MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
                 }
@@ -496,7 +567,11 @@
                 }
             }
         }
-
+        /// <summary>
+        /// 鍒犻櫎鏂规
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
             gvMx2.CloseEditor();
@@ -525,7 +600,7 @@
                         JsonConvert.SerializeObject(lst));
                     var _rtn =
                         UtilityHelper.ReturnToDynamic(strJson);
-                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
+                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
 
                     MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
                 }
@@ -535,5 +610,61 @@
                 }
             }
         }
+
+        /// <summary>
+        /// 宸ュ叿鏉′簨浠�
+        /// </summary>
+        /// <param name="inFieldValue"></param>
+        private void _toolCk(int _inFieldValue)
+        {
+            string strMsg = "";
+            switch (_inFieldValue)
+            {
+                case 1:
+                    strMsg = "瀹℃牳";
+                    break;
+                case 0:
+                    strMsg = "鍙嶅鏍�";
+                    break;
+            };
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+                return;
+
+            var _obj = new
+            {
+                guid = rowGuid,
+                ckValue = _inFieldValue,
+                parameter = "MES_QM_AQL1,FONE_CHECKDATE,FONE_CHECKED,FONE_CHECKOR,chk_mesQmAql1"
+            };
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+                if (_rtn.rtnCode > 0)
+                {
+                    if (xtraTabControl1.SelectedTabPageIndex == 1)
+                    {
+                        getModel(lbGuid.Text.Trim());
+                    }
+                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+                    gridView1.FocusedRowHandle = rowHandle;
+                    UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, this, _inFieldValue.ToString());
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3