lu
2024-12-06 fb9833058a473035607dcdc82b2ace4f1c3e9bd6
检验细节
已修改7个文件
332 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs 98 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs 91 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs 78 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/ToolBox/MsgHelper.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
@@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
@@ -12,7 +12,6 @@
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using static DevExpress.XtraPrinting.Native.PageSizeInfo;
namespace Gs.DevApp.DevFrm.QC
{
@@ -31,28 +30,16 @@
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            gridView1.FocusedRowChanged += (s, e) =>
            {
                UtilityHelper.SetCheckIco(s, picCheckBox, this, "checkStatus", "");
            };
            getPageList(1, UtilityHelper.GetPageSize());
            Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "checkStatus", "");
            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) =>
            {
                var str = "暂未查找到匹配的数据!";
                var f = new Font("微软雅黑", 16);
                var 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);
            };
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
            Task.Delay(100);
            getPageList(1);
        }
        /// <summary>
        ///     双击事件
        /// </summary>
@@ -74,7 +61,7 @@
        /// <param name="pageSize"></param>
        private void PageBar1_PagerEvent(int curPage, int pageSize)
        {
            getPageList(curPage, pageSize);
            getPageList(curPage);
        }
      
        /// <summary>
@@ -126,7 +113,16 @@
            if (xtraTabControl1.SelectedTabPageIndex == 1)
                getModel(lbGuid.Text.Trim(), false, 999);
            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);
            }
        }
        /// <summary>
@@ -161,7 +157,6 @@
                txt_lookupTypeCode.Focus();
                return;
            }
            gvMx1.CloseEditor();
            gvMx1.UpdateCurrentRow();
            var lst = new List<MesSysLookups>();
@@ -211,34 +206,37 @@
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage, int pageSize)
        private void getPageList(int curPage)
        {
            var _sbSqlWhere =
                new StringBuilder();
            foreach (var itm in _filterList)
                _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
                                   itm.fileValue + "'");
            System.Text.StringBuilder _sbSqlWhere = new StringBuilder( UtilityHelper.GetSearchWhere(_filterList));
            _sbSqlWhere.Append("and LOOKUP_TYPE_CODE = 'QCITEM'");
            var pgq = new PageQueryModel(curPage, pageSize,
                "create_date", "asc", "", _sbSqlWhere.ToString());
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
                var strReturn = UtilityHelper.HttpPost("",
                    _webServiceName + "GetListPage", json);
                var dd =
                    UtilityHelper.ReturnToTablePage(strReturn);
                var dt = dd.rtnData.list;
                gcMain.BindingContext = new BindingContext();
                gcMain.DataSource = dt;
                gcMain.ForceInitialize();
                var dddd = dd.rtnData.pages; //总页
                pageBar1.TotalPages = dddd;
                pageBar1.RecordCount = dd.rtnData.total; //记录总数
                pageBar1.CurrentPage = curPage; //当前页
                pageBar1.setTxt();
                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain.BindingContext = new BindingContext();
                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                    if (dt.Rows.Count > 0)
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
                    pageBar1.RecordCount = dd.rtnData.total;//总记录数
                }
                else
                {
                    ToolBox.MsgHelper.ShowError("提示:" + dd.rtnMsg);
                }
            }
            catch (Exception ex)
            {
@@ -278,7 +276,6 @@
                    var _job = JObject.Parse(strJson);
                    var array = new JArray();
                    foreach (var a in _job["rtnData"]["list"]) array.Add(a);
                    var dt =
                        JsonConvert.DeserializeObject<DataTable>(
                            array.ToString());
@@ -290,8 +287,7 @@
                    }
                    else
                    {
                        UtilityHelper.SetDefaultTable(gcMx1,
                            gvMx1);
                        UtilityHelper.SetDefaultTable(gcMx1,gvMx1);
                    }
                }
                else
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -29,8 +29,8 @@
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            getPageList(1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "status", "");
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            txt_itemId.EditChanged += (s, e) =>
            {
@@ -147,7 +147,6 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            if (xtraTabControl1.SelectedTabPageIndex == 1)
                getModel(lbGuid.Text.Trim(), false, 999);
            else
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
@@ -186,7 +186,7 @@
            this.gvMx2aql00065.FieldName = "aql00065";
            this.gvMx2aql00065.MinWidth = 50;
            this.gvMx2aql00065.Name = "gvMx2aql00065";
            this.gvMx2aql00065.Tag = "query_a.AQL_0_0065";
            this.gvMx2aql00065.Tag = "yz_quantity_0";
            this.gvMx2aql00065.Visible = true;
            this.gvMx2aql00065.VisibleIndex = 6;
            this.gvMx2aql00065.Width = 94;
@@ -199,7 +199,7 @@
            this.gvMx2aql00040.FieldName = "aql00040";
            this.gvMx2aql00040.MinWidth = 50;
            this.gvMx2aql00040.Name = "gvMx2aql00040";
            this.gvMx2aql00040.Tag = "query_a.AQL_0_0040";
            this.gvMx2aql00040.Tag = "yz_quantity_0";
            this.gvMx2aql00040.Visible = true;
            this.gvMx2aql00040.VisibleIndex = 5;
            this.gvMx2aql00040.Width = 94;
@@ -212,7 +212,7 @@
            this.gvMx2aql00025.FieldName = "aql00025";
            this.gvMx2aql00025.MinWidth = 50;
            this.gvMx2aql00025.Name = "gvMx2aql00025";
            this.gvMx2aql00025.Tag = "query_a.AQL_0_0025";
            this.gvMx2aql00025.Tag = "yz_quantity_0";
            this.gvMx2aql00025.Visible = true;
            this.gvMx2aql00025.VisibleIndex = 4;
            this.gvMx2aql00025.Width = 94;
@@ -225,7 +225,7 @@
            this.gvMx2aql00015.FieldName = "aql00015";
            this.gvMx2aql00015.MinWidth = 50;
            this.gvMx2aql00015.Name = "gvMx2aql00015";
            this.gvMx2aql00015.Tag = "query_a.AQL_0_0015";
            this.gvMx2aql00015.Tag = "yz_quantity_0";
            this.gvMx2aql00015.Visible = true;
            this.gvMx2aql00015.VisibleIndex = 3;
            this.gvMx2aql00015.Width = 94;
@@ -238,7 +238,7 @@
            this.gvMx2aql00010.FieldName = "aql00010";
            this.gvMx2aql00010.MinWidth = 50;
            this.gvMx2aql00010.Name = "gvMx2aql00010";
            this.gvMx2aql00010.Tag = "query_a.AQL_0_0010";
            this.gvMx2aql00010.Tag = "yz_quantity_0";
            this.gvMx2aql00010.Visible = true;
            this.gvMx2aql00010.VisibleIndex = 2;
            this.gvMx2aql00010.Width = 94;
@@ -306,7 +306,7 @@
            this.gvMx2aql1000.FieldName = "aql1000";
            this.gvMx2aql1000.MinWidth = 50;
            this.gvMx2aql1000.Name = "gvMx2aql1000";
            this.gvMx2aql1000.Tag = "query_a.AQL_1_000";
            this.gvMx2aql1000.Tag = "yz_quantity_0";
            this.gvMx2aql1000.Visible = true;
            this.gvMx2aql1000.VisibleIndex = 17;
            this.gvMx2aql1000.Width = 94;
@@ -319,7 +319,7 @@
            this.gvMx2aql0650.FieldName = "aql0650";
            this.gvMx2aql0650.MinWidth = 50;
            this.gvMx2aql0650.Name = "gvMx2aql0650";
            this.gvMx2aql0650.Tag = "query_a.AQL_0_650";
            this.gvMx2aql0650.Tag = "yz_quantity_0";
            this.gvMx2aql0650.Visible = true;
            this.gvMx2aql0650.VisibleIndex = 16;
            this.gvMx2aql0650.Width = 94;
@@ -332,7 +332,7 @@
            this.gvMx2aql0400.FieldName = "aql0400";
            this.gvMx2aql0400.MinWidth = 50;
            this.gvMx2aql0400.Name = "gvMx2aql0400";
            this.gvMx2aql0400.Tag = "query_a.AQL_0_400";
            this.gvMx2aql0400.Tag = "yz_quantity_0";
            this.gvMx2aql0400.Visible = true;
            this.gvMx2aql0400.VisibleIndex = 15;
            this.gvMx2aql0400.Width = 94;
@@ -345,7 +345,7 @@
            this.gvMx2aql0250.FieldName = "aql0250";
            this.gvMx2aql0250.MinWidth = 50;
            this.gvMx2aql0250.Name = "gvMx2aql0250";
            this.gvMx2aql0250.Tag = "query_a.AQL_0_250";
            this.gvMx2aql0250.Tag = "yz_quantity_0";
            this.gvMx2aql0250.Visible = true;
            this.gvMx2aql0250.VisibleIndex = 14;
            this.gvMx2aql0250.Width = 94;
@@ -358,7 +358,7 @@
            this.gvMx2aql0150.FieldName = "aql0150";
            this.gvMx2aql0150.MinWidth = 50;
            this.gvMx2aql0150.Name = "gvMx2aql0150";
            this.gvMx2aql0150.Tag = "query_a.AQL_0_150";
            this.gvMx2aql0150.Tag = "yz_quantity_0";
            this.gvMx2aql0150.Visible = true;
            this.gvMx2aql0150.VisibleIndex = 13;
            this.gvMx2aql0150.Width = 94;
@@ -371,7 +371,7 @@
            this.gvMx2aql0100.FieldName = "aql0100";
            this.gvMx2aql0100.MinWidth = 50;
            this.gvMx2aql0100.Name = "gvMx2aql0100";
            this.gvMx2aql0100.Tag = "query_a.AQL_0_100";
            this.gvMx2aql0100.Tag = "yz_quantity_0";
            this.gvMx2aql0100.Visible = true;
            this.gvMx2aql0100.VisibleIndex = 12;
            this.gvMx2aql0100.Width = 94;
@@ -384,7 +384,7 @@
            this.gvMx2aql0065.FieldName = "aql0065";
            this.gvMx2aql0065.MinWidth = 50;
            this.gvMx2aql0065.Name = "gvMx2aql0065";
            this.gvMx2aql0065.Tag = "query_a.AQL_0_065";
            this.gvMx2aql0065.Tag = "yz_quantity_0";
            this.gvMx2aql0065.Visible = true;
            this.gvMx2aql0065.VisibleIndex = 11;
            this.gvMx2aql0065.Width = 94;
@@ -397,7 +397,7 @@
            this.gvMx2aql0040.FieldName = "aql0040";
            this.gvMx2aql0040.MinWidth = 50;
            this.gvMx2aql0040.Name = "gvMx2aql0040";
            this.gvMx2aql0040.Tag = "query_a.AQL_0_040";
            this.gvMx2aql0040.Tag = "yz_quantity_0";
            this.gvMx2aql0040.Visible = true;
            this.gvMx2aql0040.VisibleIndex = 10;
            this.gvMx2aql0040.Width = 94;
@@ -410,7 +410,7 @@
            this.gvMx2aql0025.FieldName = "aql0025";
            this.gvMx2aql0025.MinWidth = 50;
            this.gvMx2aql0025.Name = "gvMx2aql0025";
            this.gvMx2aql0025.Tag = "query_a.AQL_0_025";
            this.gvMx2aql0025.Tag = "yz_quantity_0";
            this.gvMx2aql0025.Visible = true;
            this.gvMx2aql0025.VisibleIndex = 9;
            this.gvMx2aql0025.Width = 94;
@@ -423,7 +423,7 @@
            this.gvMx2aql0015.FieldName = "aql0015";
            this.gvMx2aql0015.MinWidth = 50;
            this.gvMx2aql0015.Name = "gvMx2aql0015";
            this.gvMx2aql0015.Tag = "query_a.AQL_0_015";
            this.gvMx2aql0015.Tag = "yz_quantity_0";
            this.gvMx2aql0015.Visible = true;
            this.gvMx2aql0015.VisibleIndex = 8;
            this.gvMx2aql0015.Width = 94;
@@ -436,7 +436,7 @@
            this.gvMx2aql0010.FieldName = "aql0010";
            this.gvMx2aql0010.MinWidth = 50;
            this.gvMx2aql0010.Name = "gvMx2aql0010";
            this.gvMx2aql0010.Tag = "query_a.AQL_0_010";
            this.gvMx2aql0010.Tag = "yz_quantity_0";
            this.gvMx2aql0010.Visible = true;
            this.gvMx2aql0010.VisibleIndex = 7;
            this.gvMx2aql0010.Width = 94;
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -2,12 +2,14 @@
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
@@ -25,30 +27,20 @@
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            gridView1.FocusedRowChanged += (s, e) =>
            {
                UtilityHelper.SetCheckIco(s, picCheckBox, this, "foneChecked", "");
            };
            getPageList(1, UtilityHelper.GetPageSize());
            Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "foneChecked", "");
            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);
            };
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
            Task.Delay(100);
            getPageList(1);
        }
        /// <summary>
        /// 批准
@@ -67,7 +59,7 @@
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
                    getPageList(1, UtilityHelper.GetPageSize());
                    getPageList(1);
                }
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
            }
@@ -124,7 +116,21 @@
        /// <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 ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
        {
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            var frm = new ShowFilter(gridView1.Columns, _filterList);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
        /// <summary>
        /// 查询回调
@@ -134,9 +140,8 @@
        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
        {
            _filterList = e.FilterList;
            getPageList(1, pageBar1.RowsCount);
            getPageList(1);
        }
        /// <summary>
        /// 取消事件
        /// </summary>
@@ -173,7 +178,7 @@
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
                    getPageList(1, UtilityHelper.GetPageSize());
                    getPageList(1);
                }
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
            }
@@ -193,7 +198,16 @@
            if (xtraTabControl1.SelectedTabPageIndex == 1)
                getModel(lbGuid.Text.Trim(), false, 999);
            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);
            }
        }
        /// <summary>
        /// 修改事件
@@ -353,14 +367,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
            {
@@ -370,13 +380,18 @@
                {
                    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;//记录总数
                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                    if (dt.Rows.Count > 0)
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
                    pageBar1.setTxt();
                    pageBar1.RecordCount = dd.rtnData.total;//总记录数
                }
                else
                {
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
@@ -35,27 +33,9 @@
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            gridView1.FocusedRowChanged += (s, e) =>
            {
                UtilityHelper.SetCheckIco(s, picCheckBox, this, "foneChecked", "");
            };
            getPageList(1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
            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) =>
            {
                var str = "暂未查找到匹配的数据!";
                var f = new Font("微软雅黑", 16);
                var 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);
            };
            //初始化物料选择和各种下拉
            _setIno();
        }
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
@@ -3,6 +3,7 @@
using System.Data;
using System.Drawing;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.RichEdit.Export;
using DevExpress.XtraEditors;
@@ -32,28 +33,16 @@
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            gridView1.FocusedRowChanged += (s, e) =>
            {
                UtilityHelper.SetCheckIco(s, picCheckBox, this, "checkStatus", "");
            };
            getPageList(1, UtilityHelper.GetPageSize());
            Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "checkStatus", "");
            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) =>
            {
                var str = "暂未查找到匹配的数据!";
                var f = new Font("微软雅黑", 16);
                var 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);
            };
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
            Task.Delay(100);
            getPageList(1);
        }
        /// <summary>
        ///     双击事件
        /// </summary>
@@ -75,7 +64,7 @@
        /// <param name="pageSize"></param>
        private void PageBar1_PagerEvent(int curPage, int pageSize)
        {
            getPageList(curPage, pageSize);
            getPageList(curPage);
        }
        /// <summary>
        ///     反审核
@@ -125,7 +114,7 @@
            if (xtraTabControl1.SelectedTabPageIndex == 1)
                getModel(lbGuid.Text.Trim(), false, 999);
            else
                getPageList(1, UtilityHelper.GetPageSize());
                getPageList(1);
        }
        /// <summary>
@@ -210,33 +199,38 @@
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage, int pageSize)
        private void getPageList(int curPage)
        {
            var _sbSqlWhere =
                new StringBuilder();
            foreach (var itm in _filterList)
                _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
                                   itm.fileValue + "'");
            System.Text.StringBuilder _sbSqlWhere = new StringBuilder(UtilityHelper.GetSearchWhere(_filterList));
            _sbSqlWhere.Append("and LOOKUP_TYPE_CODE = 'QATOOLS'");
            var pgq = new PageQueryModel(curPage, pageSize,
                "create_date", "asc", "", _sbSqlWhere.ToString());
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
                var strReturn = UtilityHelper.HttpPost("",
                    _webServiceName + "GetListPage", json);
                var dd =
                    UtilityHelper.ReturnToTablePage(strReturn);
                var dt = dd.rtnData.list;
                gcMain.BindingContext = new BindingContext();
                gcMain.DataSource = dt;
                gcMain.ForceInitialize();
                var dddd = dd.rtnData.pages; //总页
                pageBar1.TotalPages = dddd;
                pageBar1.RecordCount = dd.rtnData.total; //记录总数
                pageBar1.CurrentPage = curPage; //当前页
                pageBar1.setTxt();
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain.BindingContext = new BindingContext();
                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                    if (dt.Rows.Count > 0)
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
                    pageBar1.RecordCount = dd.rtnData.total;//总记录数
                }
                else
                {
                    ToolBox.MsgHelper.ShowError("提示:" + dd.rtnMsg);
                }
            }
            catch (Exception ex)
            {
DevApp/Gs.DevApp/ToolBox/MsgHelper.cs
@@ -19,7 +19,7 @@
            r = MessageBox.Show(msg, "提示",
                MessageBoxButtons.YesNo,
                MessageBoxIcon.Question,
                MessageBoxDefaultButton.Button2, MessageBoxOptions.ServiceNotification);
                MessageBoxDefaultButton.Button2);
            return r == DialogResult.Yes;
        }
@@ -32,7 +32,7 @@
            MessageBox.Show(msg, "警告",
                MessageBoxButtons.OK,
                MessageBoxIcon.Hand,
                MessageBoxDefaultButton.Button1, MessageBoxOptions.ServiceNotification);
                MessageBoxDefaultButton.Button1);
        }
        /// <summary>
@@ -78,7 +78,7 @@
            MessageBox.Show(msg, "信息",
                MessageBoxButtons.OK,
                MessageBoxIcon.Asterisk,
                MessageBoxDefaultButton.Button1, MessageBoxOptions.ServiceNotification);
                MessageBoxDefaultButton.Button1);
        }
        /// <summary>
@@ -90,7 +90,7 @@
            MessageBox.Show(msg, "警告",
                MessageBoxButtons.OK,
                MessageBoxIcon.Exclamation,
                MessageBoxDefaultButton.Button1, MessageBoxOptions.ServiceNotification);
                MessageBoxDefaultButton.Button1);
        }
    }
}