From ecb7a60de1639f520712ce95f99414b0dd2c9713 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 14 四月 2025 08:30:40 +0800
Subject: [PATCH] 自动打印

---
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs |  483 +++++++++++++++++++++++++++++------------------------
 1 files changed, 262 insertions(+), 221 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index fa6f27f..f33fd51 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -7,7 +7,6 @@
 using System.Collections.Generic;
 using System.Configuration;
 using System.Data;
-using System.Drawing;
 using System.Net;
 using System.Threading.Tasks;
 using System.Windows.Forms;
@@ -26,42 +25,37 @@
             this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
             this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
             this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-            this.toolBarMenu1.btnZhiLiangChkClick += ToolBarMenu1_btnZhiLiangChkClick;
-            this.toolBarMenu1.btnZhiLiangFchkClick += ToolBarMenu1_btnZhiLiangFchkClick;
-            this.toolBarMenu1.btnCaiGouChkClick += ToolBarMenu1_btnCaiGouChkClick;
-            this.toolBarMenu1.btnCaiGouFchkClick += ToolBarMenu1_btnCaiGouFchkClick;
+            this.toolBarMenu1.btnChkClick += ToolBarMenu1_btnZhiLiangChkClick;
+            this.toolBarMenu1.btnFChkClick += ToolBarMenu1_btnZhiLiangFchkClick;
             this.toolBarMenu1.btnBoHuiClick += ToolBarMenu1_btnBoHuiClick;
+            toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
+            toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
-            gcMx1.MouseClick += GcMx1_MouseClick;
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
+            this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx4);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
-            {
-                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
-            });
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "modifyFlagTxt", "", (value) =>
+           {
+               Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+           }, tips);
             Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
             {
                 getModel(value);
             }, (value) =>
             {
                 getPageList(this.pageBar1.CurrentPage);
-            });
+            }, lbGuid);
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
-            //鍒濆鍖栫墿鏂欓�夋嫨鍜屽悇绉嶄笅鎷�
-            txt_itemId.EditChanged += (s, e) =>
-            {
-                txt_itemModel.Text = this.txt_itemId.GetModel();
-                txt_itemNo.Text = this.txt_itemId.GetCode();
-            };
             ucUpFile1.UpChanged += UcUpFile1_UpChanged;
             xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
+            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
         }
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
-            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
             Task.Delay(100);
             getPageList(1);
         }
@@ -72,7 +66,17 @@
                 return;
             getList12(rowGuid);
         }
-       
+        private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
+        {
+            if (e.FocusedRowHandle >= 0)
+            {
+                DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
+                string rowGuid = row["guid"].ToString();
+                if (string.IsNullOrEmpty(rowGuid))
+                    return;
+                getList12(rowGuid);
+            }
+        }
         /// <summary>
         /// 鍒嗛〉浜嬩欢
         /// </summary>
@@ -92,7 +96,7 @@
             gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
             gridView1.ActiveFilter.Clear();
             gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-            var frm = new ShowFilter(gridView1.Columns, _filterList);
+            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
             frm.UpdateParent += Frm_UpdateParent;
             frm.ShowDialog();
         }
@@ -130,24 +134,63 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
         {
+
             toolBarMenu1.isSetBtn = false;
-            if (string.IsNullOrEmpty(txt_fngHandle.Text.Trim()))
+            if (txt_freceQty.SelectedIndex <= 0)
             {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨澶勭悊鏂瑰紡锛�");
-                txt_fngDesc.Focus();
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍒ゅ畾缁撴灉锛�");
+                txt_freceQty.Focus();
                 return;
             }
-            if (string.IsNullOrEmpty(txt_fmrmode.Text.Trim()))
+            if (txt_freceQty.SelectedIndex == 1)
             {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閫�鏂欐柟寮忥紒");
-                txt_fmrmode.Focus();
-                return;
+                if ((txt_fmrmode.SelectedIndex > 0) || txt_fngHandle.SelectedIndex > 0)
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.Warning("浣犲垽瀹氫簡鍚堟牸锛屽氨涓嶈兘鍐嶉�夋嫨鍏跺畠澶勭悊鏂瑰紡浜嗭紒");
+                    txt_fmrmode.Focus();
+                    return;
+                }
             }
+            else
+            {
+                //褰撻�夋嫨涓嶅悎鏍兼椂锛岃濉啓鍘熷洜
+                if (txt_freceQty.SelectedIndex == 2)
+                {
+                    if ((txt_fngHandle.SelectedIndex <= 0))
+                    {
+                        Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨澶勭悊缁撴灉锛�");
+                        txt_fngHandle.Focus();
+                        return;
+                    }
+                    if (txt_fngHandle.SelectedIndex == 1)
+                    {
+                        if ((txt_fmrmode.SelectedIndex <= 0))
+                        {
+                            Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閫�鏂欐柟寮忥紒");
+                            txt_fmrmode.Focus();
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        if ((txt_fmrmode.SelectedIndex > 0))
+                        {
+                            Gs.DevApp.ToolBox.MsgHelper.Warning("浣犻�夋嫨浜嗙壒閲囦娇鐢紝灏变笉鑳藉啀閫夋嫨閫�鏂欐柟寮忎簡锛�");
+                            txt_fmrmode.Focus();
+                            return;
+                        }
+                    }
+                }
+            }
+            string _fmrmode = txt_fmrmode.SelectedIndex > 0 ? txt_fmrmode.Text.Trim() : "";
+            string _freceQty = txt_freceQty.SelectedIndex > 0 ? txt_freceQty.Text.Trim() : "";
+            string _fngHandle = txt_fngHandle.SelectedIndex > 0 ? txt_fngHandle.Text.Trim() : "";
             var _obj = new
             {
                 guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-                fngHandle = txt_fngHandle.Text.Trim(),
-                fmrmode = txt_fmrmode.Text.Trim(),
+                freceQty = _freceQty,
+                fngHandle = _fngHandle,
+                fmrmode = _fmrmode,
             };
             try
             {
@@ -158,7 +201,9 @@
                 {
                     lbGuid.Text = _rtn.rtnData;
                     toolBarMenu1.isSetBtn = true;
-                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
+                    toolBarMenu1.currentAction = "";
+                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                 }
             }
             catch (Exception ex)
@@ -174,16 +219,49 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
         {
+            toolBarMenu1.currentAction = "edit";
             string rowGuid = "", rowName = "";
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1);
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
                 ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
-            UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+            {
+                getModel(rowGuid);
+            }
+            else
+            {
+                List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+                gvList.Add(gvMx1);
+                gvList.Add(gvMx2);
+                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
+            }
         }
+        private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)
+        {
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_itemName, gridView1);
+            toolBarMenu1.guidKey = rowGuid;
+            toolBarMenu1.rptParameter = "rpt_Detect01{}";
+        }
+        private void ToolBarMenu1_btnReportClick(object sender, EventArgs e)
+        {
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_itemName, gridView1);
+            toolBarMenu1.guidKey = rowGuid;
+            this.toolBarMenu1.rptParameter = "rpt_Detect01{" + "1"
+                   + "," + "1"
+                   + "," + "1"
+                   + "," + "1"
+                   + "," + "1"
+                   + "}";
+        }
+
         /// <summary>
         /// 椹冲洖
         /// </summary>
@@ -192,102 +270,7 @@
         private void ToolBarMenu1_btnBoHuiClick(object sender, EventArgs e)
         {
             toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_releaseNo, gridView1);
-            toolBarMenu1.guidKey = rowGuid;
-
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾瑕侀┏鍥炲悧锛�"))
-                return;
-
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("", _webServiceName + "IqcQcSubmit13",
-                    JsonConvert.SerializeObject(rowGuid));
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-
-                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-        /// <summary>
-        /// 閲囪喘鍙嶅鏍�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnCaiGouFchkClick(object sender, EventArgs e)
-        {
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_releaseNo, gridView1);
-            toolBarMenu1.guidKey = rowGuid;
-
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾瑕侀噰璐弽瀹℃牳鍚楋紵"))
-                return;
-
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("", _webServiceName + "IqcQcSubmit12",
-                    JsonConvert.SerializeObject(rowGuid));
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-
-                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-        /// <summary>
-        /// 閲囪喘瀹℃牳
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnCaiGouChkClick(object sender, EventArgs e)
-        {
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_releaseNo, gridView1);
-            toolBarMenu1.guidKey = rowGuid;
-
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾瑕侀噰璐鏍稿悧锛�"))
-                return;
-
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("", _webServiceName + "IqcQcCGAudit",
-                    JsonConvert.SerializeObject(rowGuid));
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-
-                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
+            _toolCk(-1);
         }
         /// <summary>
         /// 璐ㄩ噺鍙嶅鏍�
@@ -296,33 +279,7 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnZhiLiangFchkClick(object sender, EventArgs e)
         {
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_releaseNo, gridView1);
-            toolBarMenu1.guidKey = rowGuid;
-
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾璐ㄩ噺瀹℃牳鍚楋紵"))
-                return;
-
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("", _webServiceName + "IqcQcSubmit11",
-                    JsonConvert.SerializeObject(rowGuid));
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-
-                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
+            _toolCk(0);
         }
         /// <summary>
         /// 璐ㄩ噺瀹℃牳
@@ -331,33 +288,7 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnZhiLiangChkClick(object sender, EventArgs e)
         {
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_releaseNo, gridView1);
-            toolBarMenu1.guidKey = rowGuid;
-
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾璐ㄩ噺瀹℃牳鍚楋紵"))
-                return;
-
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("", _webServiceName + "IqcQcSubmit",
-                    JsonConvert.SerializeObject(rowGuid));
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-
-                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
+            _toolCk(1);
         }
 
         /// <summary>
@@ -368,17 +299,18 @@
         private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
         {
             if (xtraTabControl1.SelectedTabPageIndex == 1)
-                getModel(lbGuid.Text.Trim(), false, 999);
+                getModel(lbGuid.Text.Trim());
             else
             {
-                _filterList.Clear();
-                if (gridView1.ActiveFilter.Count > 0)
-                {
-                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-                    gridView1.ActiveFilter.Clear();
-                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-                }
-                getPageList(1);
+                //_filterList.Clear();
+                //if (gridView1.ActiveFilter.Count > 0)
+                //{
+                //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                //    gridView1.ActiveFilter.Clear();
+                //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                //}
+                //getPageList(1);
+                getPageList(this.pageBar1.CurrentPage);
             }
         }
 
@@ -387,9 +319,10 @@
         /// </summary>
         /// <param name="curPage">绗嚑椤�</param>
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
-        private   void getPageList(int curPage)
+        private void getPageList(int curPage)
         {
             var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            _sbSqlWhere += " and isnull(fsubmit,0)=1";
             PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
             string json = JsonConvert.SerializeObject(pgq);
             try
@@ -399,15 +332,16 @@
                 if (dd.rtnCode > 0)
                 {
                     DataTable dt = dd.rtnData.list;
-                    gcMain.BindingContext = new BindingContext();
+                    gcMain1.BindingContext = new BindingContext();
                     gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                     if (dt.Rows.Count > 0)
                     {
-                        gcMain.DataSource = dt;
-                        gcMain.ForceInitialize();
+                        gcMain1.DataSource = dt;
+                        gcMain1.ForceInitialize();
+                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                     }
                     else
-                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
+                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
                     gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                     pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
                     pageBar1.CurrentPage = curPage;//褰撳墠椤�
@@ -422,9 +356,9 @@
             {
                 ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
-            
+
         }
-        private   void getModel(string strGuid)
+        private void getModel(string strGuid)
         {
             bool isEdit = false;
             if (toolBarMenu1.currentAction == "add") return;
@@ -448,7 +382,7 @@
                     lbGuid.Text = strGuid;
                     List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                     gvList.Add(gvMx1);
-                    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();
                     foreach (var a in _job["rtnData"]["list5"])
@@ -461,6 +395,7 @@
                         gcMx1.BindingContext = new BindingContext();
                         gcMx1.DataSource = dt;
                         gcMx1.ForceInitialize();
+                        gvMx1.BestFitColumns();
                         ucUpFile1.parentGuid = lbGuid.Text.Trim();
                         getList12(dt.Rows[0]["guid"].ToString());
                     }
@@ -476,7 +411,7 @@
             {
                 ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
-            
+
         }
         /// <summary>
         /// 閫夐」鍗″垏鎹�
@@ -485,7 +420,7 @@
         /// <param name="e"></param>
         private void XtraTabControl2_SelectedPageChanged(object sender, DevExpress.XtraTab.TabPageChangedEventArgs e)
         {
-            if (e.Page.Name == "tabMxPage3")
+            if (e.Page.Name == "tabMxPage2")
             {
                 getFileList();
             }
@@ -512,9 +447,9 @@
                 if (dd.rtnCode > 0)
                 {
                     DataTable dt = dd.rtnData.list;
-                    gcMx3.BindingContext = new BindingContext();
-                    gcMx3.DataSource = dt;
-                    gcMx3.ForceInitialize();
+                    gcMx4.BindingContext = new BindingContext();
+                    gcMx4.DataSource = dt;
+                    gcMx4.ForceInitialize();
                 }
                 else
                 {
@@ -530,9 +465,8 @@
         /// 鏍规嵁妫�楠岄」鐩鍙栨娊鏍风粨鏋� 
         /// </summary>
         /// <param name="guid5"></param>
-        private   void getList12(string guid5)
+        private void getList12(string guid5)
         {
-            
             var _obj = new
             {
                 parentGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
@@ -540,27 +474,47 @@
             };
             try
             {
-                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
-                var dd = UtilityHelper.ReturnToList(strReturn);
-                var dt = dd.rtnData;
+                var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
+                JObject _job = JObject.Parse(strJson);
+                JArray array = new JArray();
+                foreach (var a in _job["rtnData"]["list"])
+                {
+                    array.Add(a);
+                }
+                DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                 gcMx2.BindingContext = new BindingContext();
                 gcMx2.DataSource = dt;
                 gcMx2.ForceInitialize();
+                gvMx2.BestFitColumns();
+                JArray array1 = new JArray();
+                foreach (var a in _job["rtnData"]["list2"])
+                {
+                    array1.Add(a);
+                }
+                DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
+                gcMx4.BindingContext = new BindingContext();
+                gcMx4.DataSource = dt1;
+                gcMx4.ForceInitialize();
+                gvMx4.BestFitColumns();
             }
             catch (Exception ex)
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
-            
         }
+        /// <summary>
+        /// 鍒犻櫎
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
-            var rowhandle = gvMx3.FocusedRowHandle;
+            var rowhandle = gvMx4.FocusedRowHandle;
             if (rowhandle < 0)
                 return;
             if (e.Button.Index == 0)
             {
-                var dr = gvMx3.GetDataRow(rowhandle);
+                var dr = gvMx4.GetDataRow(rowhandle);
                 var mxGuid = dr["guid"].ToString();
                 if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
                     return;
@@ -572,7 +526,7 @@
                     strJson = UtilityHelper.HttpPost("", "MesFile/DeleteModel",
                         JsonConvert.SerializeObject(lst));
                     var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                    if (_rtn.rtnCode > 0) gvMx3.DeleteRow(rowhandle);
+                    if (_rtn.rtnCode > 0) gvMx4.DeleteRow(rowhandle);
                     MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
                 }
                 catch (Exception ex)
@@ -581,16 +535,21 @@
                 }
             }
         }
+        /// <summary>
+        /// 娴忚
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
-            var rowhandle = gvMx3.FocusedRowHandle;
+            var rowhandle = gvMx4.FocusedRowHandle;
             if (rowhandle < 0)
                 return;
             if (e.Button.Index == 0)
             {
                 try
                 {
-                    var dr = gvMx3.GetDataRow(rowhandle);
+                    var dr = gvMx4.GetDataRow(rowhandle);
                     var urlPath = dr["urlPath"].ToString();
                     Gs.DevApp.UserControl.ShowFile frm = new ShowFile(urlPath);
                     frm.ShowDialog();
@@ -599,20 +558,23 @@
                 {
                     Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
                 }
-
             }
         }
-
+        /// <summary>
+        /// 涓嬭浇
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
-            var rowhandle = gvMx3.FocusedRowHandle;
+            var rowhandle = gvMx4.FocusedRowHandle;
             if (rowhandle < 0)
                 return;
             if (e.Button.Index == 0)
             {
                 try
                 {
-                    var dr = gvMx3.GetDataRow(rowhandle);
+                    var dr = gvMx4.GetDataRow(rowhandle);
                     var urlPath = dr["urlPath"].ToString();
                     using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
                     {
@@ -635,9 +597,88 @@
                 {
                     Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
                 }
-
             }
+        }
 
+        /// <summary>
+        /// 宸ュ叿鏉′簨浠�
+        /// </summary>
+        /// <param name="inFieldValue"></param>
+        private void _toolCk(int _inFieldValue)
+        {
+            string strMsg = "";
+            switch (_inFieldValue)
+            {
+                case 1:
+                    strMsg = "瀹℃牳";
+                    break;
+                case 0:
+                    strMsg = "鍙嶅鏍�";
+                    break;
+                case -1:
+                    strMsg = "椹冲洖";
+                    break;
+            };
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+                return;
+            if (_inFieldValue == 1)
+            {
+                if (txt_fcheckResu.Text == "涓嶅悎鏍�")
+                {
+                    if (txt_fngHandle.Text.Trim().Length == 0)
+                    {
+                        MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃惰閫夋嫨澶勭悊鏂瑰紡锛�");
+                        return;
+                    }
+                }
+            }
+            var _obj = new
+            {
+                guid = rowGuid,
+                inFieldValue = _inFieldValue,
+            };
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("",
+                    _webServiceName + "EditModelSubmitZhiLiang",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
+                {
+                    if (_inFieldValue >= 0)
+                    {
+                        if (xtraTabControl1.SelectedTabPageIndex == 1)
+                        {
+                            getModel(lbGuid.Text.Trim());
+                        }
+                        int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+                        gridView1.FocusedRowHandle = rowHandle;
+                        UtilityHelper.SetCheckIco(gridView1, "modifyFlagTxt", "modify1By", "modify1Date", picCheckBox, this, _inFieldValue.ToString());
+                    }
+                    else
+                    {
+                        //if (xtraTabControl1.SelectedTabPageIndex == 1)
+                        //    getModel(lbGuid.Text.Trim());
+                        //else
+                        //    getPageList(this.pageBar1.CurrentPage);
+                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
+                        getPageList(this.pageBar1.CurrentPage);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
         }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3