自动打印

lu

2025-04-14 ecb7a60de1639f520712ce95f99414b0dd2c9713

自动打印

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs

@@ -23,7 +23,7 @@
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            },tips);
            }, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                getModel(value);
@@ -60,7 +60,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs

@@ -1,13 +1,13 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm
{

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs

@@ -1,8 +1,3 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
@@ -12,6 +7,11 @@
using MES.Service.Modes;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm
{

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs

@@ -1,13 +1,13 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm
{
@@ -37,11 +37,11 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
      

        /// <summary>
        ///     分页事件
        /// </summary>
@@ -62,7 +62,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs

@@ -1,13 +1,13 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm
{
@@ -36,8 +36,8 @@
            pageBar1.PagerEvent += PageBar1_PagerEvent;
        }

        private   void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        { 
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
@@ -62,7 +62,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -105,7 +105,7 @@
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private   void getPageList(int curPage)
        private void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.item_no asc", "",

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs

@@ -1,13 +1,13 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm
{
@@ -62,7 +62,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs

@@ -25,7 +25,7 @@
            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, null, null, "", "", (value) =>
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            }, tips);
@@ -66,7 +66,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
             var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs

@@ -1,13 +1,13 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm
{
@@ -38,7 +38,7 @@

        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -63,7 +63,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs

@@ -1,13 +1,13 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm
{
@@ -21,7 +21,7 @@
            toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1,null, null, "", "", (value) =>
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            }, tips);
@@ -35,10 +35,10 @@
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
        }
        private   void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
           Task.Delay(100);
            Task.Delay(100);
            getPageList(1);
        }

@@ -62,7 +62,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -105,7 +105,7 @@
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private   void getPageList(int curPage)
        private void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.supp_no",

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs

@@ -35,7 +35,7 @@
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "status", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            },tips);
            }, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                getModel(value);
@@ -132,7 +132,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs

@@ -66,7 +66,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs

@@ -69,7 +69,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -125,7 +125,7 @@
        {
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
        }
 

        /// <summary>
        /// 刷新事件
        /// </summary>

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.cs

@@ -1,26 +1,14 @@
using DevExpress.XtraEditors;
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.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm
{
    public partial class Frm_MesItemBl : DevExpress.XtraEditors.XtraForm
    {
     

        public Frm_MesItemBl()
        {
            InitializeComponent();
           

        }

        

    }
}

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBlDJ.cs

@@ -1,23 +1,12 @@
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.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm
{
    public partial class Frm_MesItemBlDJ : DevExpress.XtraEditors.XtraForm
    {
     

        public Frm_MesItemBlDJ()
        {
            InitializeComponent();
          

        }
    }
}

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemCl.cs

@@ -1,15 +1,3 @@
using DevExpress.XtraEditors;
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.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm
{
    public partial class Frm_MesItemCl : DevExpress.XtraEditors.XtraForm
@@ -17,7 +5,7 @@
        public Frm_MesItemCl()
        {
            InitializeComponent();
           

        }
    }
}

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemClDj.cs

@@ -1,14 +1,3 @@
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.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm
{
    public partial class Frm_MesItemClDj : DevExpress.XtraEditors.XtraForm

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs

@@ -88,7 +88,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -124,7 +124,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -624,6 +624,6 @@
            }
        }

     

    }
}

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs

@@ -81,7 +81,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs

@@ -107,7 +107,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -116,7 +116,7 @@
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
 

        /// <summary>
        /// 日志
        /// </summary>
@@ -151,11 +151,11 @@
                parentForm = this.Parent as Form;
            else
                parentForm = this.Parent.Parent as Form;
          

            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs

@@ -53,11 +53,11 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
      

        /// <summary>
        /// 日志
        /// </summary>
@@ -96,7 +96,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/FQC/Frm_Fqc.cs

@@ -1,15 +1,4 @@
using DevExpress.XtraEditors;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.FQC
namespace Gs.DevApp.DevFrm.FQC
{
    public partial class Frm_Fqc : DevExpress.XtraEditors.XtraForm
    {
@@ -17,6 +6,6 @@
        {
            InitializeComponent();
        }
 

    }
}

 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs

@@ -6,7 +6,6 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using System.Windows.Forms;

@@ -234,7 +233,7 @@
            string _txt_fzrId = txt_fzrId.GetId();
            string _txt_workNo = txt_workNo.Text.Trim();
            string _txt_msg = txt_msg.TextTxt;
            string _txt_zrType=txt_zrType.Text.Trim();
            string _txt_zrType = txt_zrType.Text.Trim();
            if (txt_freceQty.SelectedIndex <= 0)
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择判定结果！");
@@ -250,7 +249,7 @@
                    txt_fngHandle.Focus();
                    return;
                }
                if (_txt_fzrId.Length<= 0)
                if (_txt_fzrId.Length <= 0)
                {
                    Gs.DevApp.ToolBox.MsgHelper.Warning("请选择责任人！");
                    txt_fzrId.Focus();
@@ -280,7 +279,8 @@
                        return;
                    }
                }
                else {
                else
                {
                    if (!string.IsNullOrEmpty(_txt_workNo))
                    {
                        Gs.DevApp.ToolBox.MsgHelper.Warning("不需要填写反工单号！");
@@ -296,8 +296,9 @@
                }
            }
            //当为合格时，就不应该选择其它项目了
            else {
                if (( _txt_fmrmode.Length + _txt_fzrId.Length + _txt_workNo.Length) > 0  || txt_zrType.SelectedIndex>0 || txt_fngHandle.SelectedIndex > 0)
            else
            {
                if ((_txt_fmrmode.Length + _txt_fzrId.Length + _txt_workNo.Length) > 0 || txt_zrType.SelectedIndex > 0 || txt_fngHandle.SelectedIndex > 0)
                {
                    Gs.DevApp.ToolBox.MsgHelper.Warning("当判定结果为合格时，就不应该选择其它项目了！");
                    txt_freceQty.Focus();
@@ -314,7 +315,7 @@
                workNo = _txt_workNo,
                fmrmode = _txt_fmrmode,
                msg = _txt_msg,
                zrType= _txt_zrType,
                zrType = _txt_zrType,
                edtType = 1
            };
            try

 DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.cs

@@ -183,7 +183,7 @@
        private void getModel(string strGuid)
        {
            ucUpFileList1.parentGroup = "问题图片";
            ucUpFileList1.pGuid= strGuid;
            ucUpFileList1.pGuid = strGuid;
            ucUpFileList1.getFileList();
            ucUpFileList2.parentGroup = "改善图片";
            ucUpFileList2.pGuid = strGuid;

 DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.cs

@@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
 


namespace Gs.DevApp.DevFrm.FQC
{
@@ -20,7 +20,7 @@
            getPageList(1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
        }
      

        /// <summary>
        /// </summary>
        /// <param name="curPage">第几页</param>

 DevApp/Gs.DevApp/DevFrm/FrmLogin.cs

@@ -1,17 +1,17 @@
using System;
using System.Configuration;
using System.Linq;
using System.Management;
using System.Net.Sockets;
using System.Net;
using System.Windows.Forms;
using AutoUpdaterDotNET;
using AutoUpdaterDotNET;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Properties;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Configuration;
using System.Linq;
using System.Management;
using System.Net;
using System.Net.Sockets;
using System.Windows.Forms;


namespace Gs.DevApp.DevFrm
@@ -29,7 +29,7 @@
            Text = lbVersion.Text = ConfigurationManager.AppSettings["ProductName"];
            btnLogin.Click += BtnLogin_Click;
            btnCancel.Click += BtnCancel_Click;
            

        }

        private void BtnCancel_Click(object sender, EventArgs e)

 DevApp/Gs.DevApp/DevFrm/FrmMain.cs

@@ -1,12 +1,4 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Configuration;
using System.Data;
using System.Drawing;
using System.Reflection;
using System.Windows.Forms;
using DevExpress.XtraBars;
using DevExpress.XtraBars;
using DevExpress.XtraBars.FluentDesignSystem;
using DevExpress.XtraBars.Navigation;
using DevExpress.XtraTab;
@@ -16,6 +8,14 @@
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Configuration;
using System.Data;
using System.Drawing;
using System.Reflection;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm
{
@@ -99,7 +99,7 @@
                Gs.DevApp.DevFrm.User.SysMenu frm = new SysMenu();
                frm.ShowDialog();
            };
          //  tab.ContextMenuStrip = cms1;
            //  tab.ContextMenuStrip = cms1;
        }

        private void Tab_MouseDown(object sender, MouseEventArgs e)
@@ -187,7 +187,7 @@
                var strJson = UtilityHelper.HttpPost("",
                    "User/GetUserLoginInfo", JsonConvert.SerializeObject(_obj));
                Size _size; string _caption; Color _color; Padding _pad;
                (_size, _caption, _color, _pad) =Gs.DevApp.ToolBox.UtilityHelper.getLoading();
                (_size, _caption, _color, _pad) = Gs.DevApp.ToolBox.UtilityHelper.getLoading();
                DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("加载进度:", _caption, _size);
                wdf.BackColor = _color;
                wdf.Padding = _pad;

 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJian.cs

@@ -1,15 +1,4 @@
using DevExpress.XtraEditors;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.IPQC
namespace Gs.DevApp.DevFrm.IPQC
{
    public partial class Frm_ShouJian : DevExpress.XtraEditors.XtraForm
    {
@@ -18,6 +7,6 @@
            InitializeComponent();
        }

     

    }
}

 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs

@@ -28,7 +28,7 @@
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fsubmitTxt", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            },tips);
            }, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                getModel(value, "0");
@@ -73,7 +73,7 @@
                getList12(rowGuid);
            }
        }
      

        /// <summary>
        /// 分页事件
        /// </summary>
@@ -120,7 +120,7 @@
                lbGuid, txt_releaseNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
        }
       

        /// <summary>
        /// 刷新事件
        /// </summary>

 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJian.cs

@@ -1,15 +1,4 @@
using DevExpress.XtraEditors;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.IPQC
namespace Gs.DevApp.DevFrm.IPQC
{
    public partial class Frm_XunJian : DevExpress.XtraEditors.XtraForm
    {

 DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs

@@ -1,17 +1,11 @@
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using Gs.DevApp.DevFrm.User;
using DevExpress.XtraEditors.Controls;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

@@ -29,7 +23,7 @@
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            },tips);
            }, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                getModel(value);
@@ -67,7 +61,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -83,7 +77,7 @@
            getPageList(1);
        }

         

        /// <summary>
        ///     刷新事件
        /// </summary>
@@ -106,7 +100,7 @@
            }
        }

         

        /// <summary>
        /// </summary>
        /// <param name="curPage">第几页</param>
@@ -187,7 +181,7 @@
                MsgHelper.Warning("提示：" + ex.Message);
            }
        }
        

        /// <summary>
        /// pda页面
        /// </summary>

 DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs

@@ -22,11 +22,11 @@
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
            {
               
            },tips);

            }, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
              

            }, (value) =>
            {
                getPageList(this.pageBar1.CurrentPage);
@@ -36,7 +36,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -61,7 +61,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -173,7 +173,8 @@
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0)
                    {
                        if (_rtn.rtnCode > 0) {
                        if (_rtn.rtnCode > 0)
                        {
                            getPageList(this.pageBar1.CurrentPage);
                            //int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], mxGuid);
                            //gridView1.FocusedRowHandle = rowHandle;

 DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs

@@ -2,7 +2,6 @@
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;

@@ -41,7 +40,7 @@
                {
                    userGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(userGuid),
                    bindGuidslist = sbList.ToString(),
                    fType="仓库",
                    fType = "仓库",
                };
                try
                {
@@ -61,15 +60,15 @@
                }
            };
        }
       

        /// <summary>
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            var _sbSqlWhere ="";
            var pgq = new PageQueryModel(curPage,999999, "org.FNumber asc ,a.depot_code", "asc",
            var _sbSqlWhere = "";
            var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.depot_code", "asc",
                "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try

 DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs

@@ -59,15 +59,15 @@
                }
            };
        }
       

        /// <summary>
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            var _sbSqlWhere ="";
            var pgq = new PageQueryModel(curPage, 999999, "a.PAGE_GROUP", "asc","", _sbSqlWhere.ToString(), userGuid);
            var _sbSqlWhere = "";
            var pgq = new PageQueryModel(curPage, 999999, "a.PAGE_GROUP", "asc", "", _sbSqlWhere.ToString(), userGuid);
            var json = JsonConvert.SerializeObject(pgq);
            try
            {

 DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs

@@ -1,9 +1,3 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
@@ -12,6 +6,11 @@
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Text;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.QC
{
@@ -30,11 +29,11 @@
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1,picCheckBox, this, "checkStatus", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            },tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
           {
               Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
           }, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                getModel(value);
@@ -44,7 +43,7 @@
            }, lbGuid);
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
           

        }
        /// <summary>
        ///     分页事件
@@ -55,7 +54,7 @@
        {
            getPageList(curPage);
        }
      

        /// <summary>
        ///     反审核
        /// </summary>
@@ -85,7 +84,7 @@
        {
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
        }
 

        /// <summary>
        ///     刷新事件
        /// </summary>
@@ -169,7 +168,7 @@

            var _obj = new MesSysLookupTypes
            {
                

                Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
                LookupTypeCode = txt_lookupTypeCode.Text,
                LookupTypeName = txt_lookupTypeName.Text,
@@ -190,7 +189,7 @@
                    toolBarMenu1.isSetBtn = true;
                    var gridViews = new List<GridView>();
                    gridViews.Add(gvMx1);
                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false,gridViews);
                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gridViews);
                    toolBarMenu1.currentAction = "";
                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                }
@@ -207,7 +206,7 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            System.Text.StringBuilder _sbSqlWhere = new StringBuilder( UtilityHelper.GetSearchWhere(_filterList));
            System.Text.StringBuilder _sbSqlWhere = new StringBuilder(UtilityHelper.GetSearchWhere(_filterList));
            _sbSqlWhere.Append("and LOOKUP_TYPE_CODE = 'QCITEM'");
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
@@ -219,7 +218,7 @@
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain1.BindingContext = new BindingContext();
                   

                    if (dt.Rows.Count > 0)
                    {
                        gcMain1.DataSource = dt;
@@ -228,7 +227,7 @@
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
                  

                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
                    pageBar1.RecordCount = dd.rtnData.total;//总记录数
@@ -288,7 +287,7 @@
                    }
                    else
                    {
                        UtilityHelper.SetDefaultTable(gcMx1,gvMx1);
                        UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                    }
                }
                else

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs

@@ -41,18 +41,18 @@
                {
                    strUpGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
                }
                Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid,strUpGuid);
                Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid);
                frm.UpdateParent += (s2, ee2) =>
                {
                    getPageList(1);
                };
                frm.ShowDialog(); 
                frm.ShowDialog();
            };
            this.toolStripMenuItemRoot.Click += (s, ee) =>
            {
                string strGuid = "";
                string strUpGuid = "";
                Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid,strUpGuid);
                Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid);
                frm.UpdateParent += (s2, ee2) =>
                {
                    getPageList(1);
@@ -103,7 +103,7 @@
                    strGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
                    strUpGuid = tlMenu.FocusedNode.GetValue("pid").ToString();
                }
                Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid,strUpGuid);
                Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid);
                frm.UpdateParent += (s2, ee2) =>
                {
                    getPageList(1);
@@ -128,7 +128,8 @@
                    toolStripMenuItemRoot.Visible = false;
                    tlMenu.ContextMenuStrip = contextMenuStrip1;
                }
                else {
                else
                {
                    toolStripMenuItemAdd.Visible = false;
                    toolStripMenuItemEdt.Visible = false;
                    toolStripMenuItemDel.Visible = false;
@@ -171,7 +172,7 @@
            try
            {
                var strReturn =
                    UtilityHelper.HttpPost("", _webServiceName+"GetListPage", json);
                    UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                var dt = dd.rtnData.list;
                tlMenu.DataSource = dt;

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs

@@ -21,7 +21,8 @@
            this.strUpGuid = _strUpGuid;

            //这是更新
            if (!string.IsNullOrEmpty(this.strGuid)) {
            if (!string.IsNullOrEmpty(this.strGuid))
            {
                getMode(strGuid);
                this.Text = "更新【" + txt_defectName.Text + "】";
                txt_sType.Enabled = false;
@@ -39,7 +40,7 @@
            }

            this.Text = "增加新项";
           

        }

        private void btnQuery_Click(object sender, EventArgs e)
@@ -129,7 +130,7 @@
                {
                    dynamic dy = _rtn.rtnData;
                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, true);
                  

                }
                else
                    ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs

@@ -6,9 +6,7 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Net;
using System.Threading.Tasks;
using System.Windows.Forms;

@@ -42,7 +40,7 @@
            }, (value) =>
            {
                getPageList(this.pageBar1.CurrentPage);
            },lbGuid);
            }, lbGuid);
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            txtJianYan.KeyDown += TxtJianYan_KeyDown;
@@ -60,7 +58,7 @@
        private void BtnIpt_Click(object sender, EventArgs e)
        {
            bool bl = btnLoad.Enabled;
            Frm_MesQaItemsDetect01Input frm = new Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim(),bl);
            Frm_MesQaItemsDetect01Input frm = new Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim(), bl);
            frm.ShowDialog();
        }

@@ -357,7 +355,7 @@
        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
        {
            toolBarMenu1.isSetBtn = false;
            if ( txt_fcheckResu.Text.Trim()== "N:不合格" && string.IsNullOrEmpty(txt_remarks.Text.Trim()))
            if (txt_fcheckResu.Text.Trim() == "N:不合格" && string.IsNullOrEmpty(txt_remarks.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("当检验结果不合格时，请填写备注说明！");
                txt_remarks.Focus();
@@ -397,7 +395,7 @@
        private void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
           // _sbSqlWhere += " and isnull(fsubmit,0)=0";
            // _sbSqlWhere += " and isnull(fsubmit,0)=0";
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
@@ -511,7 +509,7 @@
                ucUpFileList1.getFileList();
            }
        }
      

        /// <summary>
        /// 根据检验项目读取抽样结果 
        /// </summary>
@@ -553,12 +551,13 @@
                MsgHelper.Warning("提示：" + ex.Message);
            }
        }
       
        private void setEable(bool bl) {

        private void setEable(bool bl)
        {

            txtJianYan.ReadOnly = !bl;
            btnLoad.Enabled = bl;
            btnIpt.Text = ( bl==true?"录入样本":"查看样本");
            btnIpt.Text = (bl == true ? "录入样本" : "查看样本");
        }
    }
}

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs

@@ -134,7 +134,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
        {
           

            toolBarMenu1.isSetBtn = false;
            if (txt_freceQty.SelectedIndex <= 0)
            {
@@ -182,13 +182,13 @@
                    }
                }
            }
            string _fmrmode = txt_fmrmode.SelectedIndex>0?   txt_fmrmode.Text.Trim():"";
            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()), //主建
                freceQty= _freceQty,
                freceQty = _freceQty,
                fngHandle = _fngHandle,
                fmrmode = _fmrmode,
            };

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs

@@ -87,7 +87,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs

@@ -2,13 +2,11 @@
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.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.QC
@@ -74,7 +72,7 @@
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
        }
     

        /// <summary>
        /// 批准
        /// </summary>
@@ -140,7 +138,7 @@
        {
            getPageList(curPage);
        }
      

        /// <summary>
        /// 取消事件
        /// </summary>
@@ -492,7 +490,7 @@
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                      //gvMx1.BestFitColumns();
                        //gvMx1.BestFitColumns();
                    }
                    else
                    {
@@ -508,7 +506,7 @@
                        gcMx2.BindingContext = new BindingContext();
                        gcMx2.DataSource = dt1;
                        gcMx2.ForceInitialize();
                       // gvMx2.BestFitColumns();
                        // gvMx2.BestFitColumns();
                    }
                    else
                    {

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs

@@ -1,16 +1,4 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using MES.Service.Modes;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;

namespace Gs.DevApp.DevFrm.QC
{
@@ -20,6 +8,6 @@
        {
            InitializeComponent();
        }
      

    }
}

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs

@@ -1,9 +1,3 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
@@ -12,6 +6,11 @@
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Text;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.QC
{
@@ -30,11 +29,11 @@
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1,picCheckBox, this, "checkStatus", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            }, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
           {
               Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
           }, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                getModel(value);
@@ -45,7 +44,7 @@
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
        }
      

        /// <summary>
        ///     分页事件
        /// </summary>
@@ -132,7 +131,7 @@
            {
                var gvList = new List<GridView>();
                gvList.Add(gvMx1);
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true,gvList);
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
            }
        }


 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -11,6 +6,11 @@
using MES.Service.Modes;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;


namespace Gs.DevApp.DevFrm.QC
@@ -41,7 +41,8 @@
            toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
            if (strType == "iqc")
                dfValue = 5;
            this.gvMx1.InitNewRow += (s, e) => { 
            this.gvMx1.InitNewRow += (s, e) =>
            {
                this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", dfValue);
                int newIndex = gvMx1.DataRowCount + 1;
                this.gvMx1.SetRowCellValue(e.RowHandle, "forder", newIndex);
@@ -89,7 +90,7 @@

        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -119,7 +120,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -422,7 +423,7 @@
                        gcMain1.DataSource = dt;
                        gcMain1.ForceInitialize();
                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                      

                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -805,8 +806,8 @@
            {
                sourceGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
                itemGuids = _sbGuids.ToString(),
                iqcType=this.strType,
                ypsl=this.dfValue
                iqcType = this.strType,
                ypsl = this.dfValue
            };
            try
            {

 DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs

@@ -77,7 +77,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -92,7 +92,7 @@
            _filterList = e.FilterList;
            getPageList(1);
        }
         

        /// <summary>
        /// 刷新事件
        /// </summary>
@@ -136,8 +136,8 @@
            _toolCk(0);
        }

      
        


        /// <summary>
        /// 
        /// </summary>

 DevApp/Gs.DevApp/DevFrm/QC/Models/MesDefectCode.cs

@@ -127,7 +127,7 @@
        /// 主表ID 
        ///</summary>
        public Guid? Pid { get; set; }
        
       


    }
}

 DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaMj.cs

@@ -2,65 +2,65 @@

namespace Gs.DevApp.DevFrm.QC.Models
{
/// <summary>
///     免检表
/// </summary> 
public class MesQaMj
{
    /// <summary>
    ///     默认值: (newid())
    /// </summary>
    public Guid Guid { get; set; }
    ///     免检表
    /// </summary> 
    public class MesQaMj
    {
        /// <summary>
        ///     默认值: (newid())
        /// </summary>
        public Guid Guid { get; set; }

    /// <summary>
    ///     物料编码
    /// </summary>
    public string ItemNo { get; set; }
        /// <summary>
        ///     物料编码
        /// </summary>
        public string ItemNo { get; set; }

    /// <summary>
    ///     创建人
    /// </summary>
    public string CreateBy { get; set; }
        /// <summary>
        ///     创建人
        /// </summary>
        public string CreateBy { get; set; }

    /// <summary>
    ///     创建时间
    /// </summary>
    public DateTime? CreateDate { get; set; }
        /// <summary>
        ///     创建时间
        /// </summary>
        public DateTime? CreateDate { get; set; }

    /// <summary>
    ///     最后更新人
    /// </summary>
    public string LastupdateBy { get; set; }
        /// <summary>
        ///     最后更新人
        /// </summary>
        public string LastupdateBy { get; set; }

    /// <summary>
    ///     最后更新时间
    /// </summary>
    public DateTime? LastupdateDate { get; set; }
        /// <summary>
        ///     最后更新时间
        /// </summary>
        public DateTime? LastupdateDate { get; set; }

    /// <summary>
    ///     审核人
    /// </summary>
    public string CheckUser { get; set; }
        /// <summary>
        ///     审核人
        /// </summary>
        public string CheckUser { get; set; }

    /// <summary>
    ///     审核时间
    /// </summary>
    public DateTime? CheckDate { get; set; }
        /// <summary>
        ///     审核时间
        /// </summary>
        public DateTime? CheckDate { get; set; }

    /// <summary>
    ///     审核标识
    ///     默认值: ((0))
    /// </summary>
    public int? Status { get; set; }
        /// <summary>
        ///     审核标识
        ///     默认值: ((0))
        /// </summary>
        public int? Status { get; set; }

    /// <summary>
    ///     物料ID
    /// </summary>
    public int? ItemId { get; set; }
        /// <summary>
        ///     物料ID
        /// </summary>
        public int? ItemId { get; set; }

    /// <summary>
    ///     供应商编码
    /// </summary>
    public string SuppId { get; set; }
}
        /// <summary>
        ///     供应商编码
        /// </summary>
        public string SuppId { get; set; }
    }
}

 DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmAql1.cs

@@ -12,95 +12,95 @@
        ///  
        /// 默认值: (newid())
        ///</summary>
         public Guid Guid { get; set; }
        public Guid Guid { get; set; }
        /// <summary>
        /// 创建人 
        ///</summary>
         public string CreateBy { get; set; }
        public string CreateBy { get; set; }
        /// <summary>
        /// 创建人姓名 
        ///</summary>
         public string CreateName { get; set; }
        public string CreateName { get; set; }
        /// <summary>
        /// 创建时间 
        ///</summary>
         public DateTime? CreateDate { get; set; }
        public DateTime? CreateDate { get; set; }
        /// <summary>
        /// 最后更新人 
        ///</summary>
         public string LastupdateBy { get; set; }
        public string LastupdateBy { get; set; }
        /// <summary>
        /// 更新人姓名 
        ///</summary>
         public string LastupdateName { get; set; }
        public string LastupdateName { get; set; }
        /// <summary>
        /// 最后更新时间 
        ///</summary>
         public DateTime? LastupdateDate { get; set; }
        public DateTime? LastupdateDate { get; set; }
        /// <summary>
        /// 标准编码 
        ///</summary>
         public string SampleSizeNo { get; set; }
        public string SampleSizeNo { get; set; }
        /// <summary>
        /// 标准名称 
        ///</summary>
         public string SampleSizeName { get; set; }
        public string SampleSizeName { get; set; }
        /// <summary>
        /// 备注信息 
        ///</summary>
         public string Memo { get; set; }
        public string Memo { get; set; }
        /// <summary>
        /// 所属工厂 
        ///</summary>
         public string Factory { get; set; }
        public string Factory { get; set; }
        /// <summary>
        /// 审批标记 
        /// 默认值: ((0))
        ///</summary>
         public bool? FoneChecked { get; set; }
        public bool? FoneChecked { get; set; }
        /// <summary>
        /// 审批人 
        ///</summary>
         public string FoneCheckor { get; set; }
        public string FoneCheckor { get; set; }
        /// <summary>
        /// 审批日期 
        ///</summary>
         public DateTime? FoneCheckdate { get; set; }
        public DateTime? FoneCheckdate { get; set; }
        /// <summary>
        /// 确认标记 
        /// 默认值: ((0))
        ///</summary>
         public bool? FtwoChecked { get; set; }
        public bool? FtwoChecked { get; set; }
        /// <summary>
        /// 确认人 
        ///</summary>
         public string FtwoCheckor { get; set; }
        public string FtwoCheckor { get; set; }
        /// <summary>
        /// 确认日期 
        ///</summary>
         public DateTime? FtwoCheckdate { get; set; }
        public DateTime? FtwoCheckdate { get; set; }
        /// <summary>
        /// 修改/新增状态 
        /// 默认值: ((0))
        ///</summary>
         public bool? EditStatus { get; set; }
        public bool? EditStatus { get; set; }
        /// <summary>
        /// 版本号 
        /// 默认值: ((0))
        ///</summary>
         public int? Fversion { get; set; }
        public int? Fversion { get; set; }
        /// <summary>
        /// 是否可用 
        /// 默认值: ((0))
        ///</summary>
         public bool? Isenabled { get; set; }
        public bool? Isenabled { get; set; }
        /// <summary>
        /// 公司 
        ///</summary>
         public string Company { get; set; }
        public string Company { get; set; }

        public List<MesQmAql2> MesQmAql2s { get; set; }
         

        public List<MesQmAql3> MesQmAql3s { get; set; }
    }
}

 DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs

@@ -1,185 +1,185 @@
using System;
using System.Collections.Generic;
 

namespace MES.Service.Modes
{
    /// <summary>
    /// IQC、OQC检验项目
    ///</summary>
   

    public class MesQmCheckitem
    {
        /// <summary>
        ///  
        /// 默认值: (newid())
        ///</summary>
       
         public Guid Guid { get; set; }

        public Guid Guid { get; set; }
        /// <summary>
        /// 创建人 
        ///</summary>
       
         public string CreateBy { get; set; }

        public string CreateBy { get; set; }
        /// <summary>
        /// 创建时间 
        ///</summary>
     
         public DateTime? CreateDate { get; set; }

        public DateTime? CreateDate { get; set; }
        /// <summary>
        /// 最后更新人 
        ///</summary>
       
         public string LastupdateBy { get; set; }

        public string LastupdateBy { get; set; }
        /// <summary>
        /// 最后更新时间 
        ///</summary>
         
         public DateTime? LastupdateDate { get; set; }

        public DateTime? LastupdateDate { get; set; }
        /// <summary>
        /// 备注 
        ///</summary>
         
         public string Memo { get; set; }

        public string Memo { get; set; }
        /// <summary>
        /// 物料产品编码 
        ///</summary>
        
         public string ItemNo { get; set; }

        public string ItemNo { get; set; }
        /// <summary>
        /// 分类 
        ///</summary>
       
         public string Ftype { get; set; }

        public string Ftype { get; set; }
        /// <summary>
        /// 项目分类(1:抽检 2:巡检 3:完工检验) 
        ///</summary>
      
         public string CheckType { get; set; }

        public string CheckType { get; set; }
        /// <summary>
        /// 客户名称 
        ///</summary>
        
         public string Name1 { get; set; }

        public string Name1 { get; set; }
        /// <summary>
        /// 特殊规格物料 
        ///</summary>
       
         public long? FspecialItem { get; set; }

        public long? FspecialItem { get; set; }
        /// <summary>
        /// 所属工厂 
        ///</summary>
     
         public string Factory { get; set; }

        public string Factory { get; set; }
        /// <summary>
        /// 检验水准 
        ///</summary>
      
         public string FinspectionLevel { get; set; }

        public string FinspectionLevel { get; set; }
        /// <summary>
        /// 检验水平 
        ///</summary>
       
         public string FcheckLevel { get; set; }

        public string FcheckLevel { get; set; }
        /// <summary>
        /// 接收水平 
        ///</summary>
       
         public string FreceivingLevel { get; set; }

        public string FreceivingLevel { get; set; }
        /// <summary>
        /// 审批标记 
        /// 默认值: ((0))
        ///</summary>
      
         public bool? FoneChecked { get; set; }

        public bool? FoneChecked { get; set; }
        /// <summary>
        /// 审批人 
        ///</summary>
       
         public string FoneCheckor { get; set; }

        public string FoneCheckor { get; set; }
        /// <summary>
        /// 审批日期 
        ///</summary>
      
         public DateTime? FoneCheckdate { get; set; }

        public DateTime? FoneCheckdate { get; set; }
        /// <summary>
        /// 批准标记 
        /// 默认值: ((0))
        ///</summary>
       
         public bool? FtwoChecked { get; set; }

        public bool? FtwoChecked { get; set; }
        /// <summary>
        /// 批准人 
        ///</summary>
       
         public string FtwoCheckor { get; set; }

        public string FtwoCheckor { get; set; }
        /// <summary>
        /// 批准日期 
        ///</summary>
        
         public DateTime? FtwoCheckdate { get; set; }

        public DateTime? FtwoCheckdate { get; set; }
        /// <summary>
        /// 修改/ 新增状态 
        /// 默认值: ((0))
        ///</summary>
        
         public bool? EditStatus { get; set; }

        public bool? EditStatus { get; set; }
        /// <summary>
        /// 版本 
        /// 默认值: ((0))
        ///</summary>
      
         public long? Fversion { get; set; }

        public long? Fversion { get; set; }
        /// <summary>
        /// 是否可用 
        /// 默认值: ((0))
        ///</summary>
      
         public bool? Isenabled { get; set; }

        public bool? Isenabled { get; set; }
        /// <summary>
        ///  
        ///</summary>
  
         public string Company { get; set; }

        public string Company { get; set; }
        /// <summary>
        /// 客户编码 
        ///</summary>
      
         public string Kunnr { get; set; }

        public string Kunnr { get; set; }
        /// <summary>
        /// 最大抽检数 
        ///</summary>
 
         public long? MaxCheckQty { get; set; }

        public long? MaxCheckQty { get; set; }
        /// <summary>
        /// 提醒次数 
        ///</summary>
       
         public long? RemQty { get; set; }

        public long? RemQty { get; set; }
        /// <summary>
        /// 未论证物料 
        ///</summary>
     
         public bool? Otherflag { get; set; }

        public bool? Otherflag { get; set; }
        /// <summary>
        /// 成品电池类型：动力/ 储能 
        ///</summary>
       
         public string Battype { get; set; }

        public string Battype { get; set; }
        /// <summary>
        /// 项目名称 
        ///</summary>
      
         public string ProjectName { get; set; }

        public string ProjectName { get; set; }
        /// <summary>
        /// 物料名称 
        ///</summary>
       
         public string Tname { get; set; }

        public string Tname { get; set; }
        /// <summary>
        /// 物料ID 
        ///</summary>
 
         public long? ItemId { get; set; }

        public long? ItemId { get; set; }

        public List<MesQmCheckitemDt> list { get; set; }
    }

 DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs

@@ -1,222 +1,220 @@
using System;
using System.Collections.Generic;
using System.Linq;
 

namespace MES.Service.Modes
{
    /// <summary>
    /// 检验项目从表
    ///</summary>
  

    public class MesQmCheckitemDt
    {
        /// <summary>
        ///  
        /// 默认值: (newid())
        ///</summary>
        
         public Guid? Guid { get; set; }

        public Guid? Guid { get; set; }
        /// <summary>
        /// 创建人 
        ///</summary>
      
         public string CreateBy { get; set; }

        public string CreateBy { get; set; }
        /// <summary>
        /// 创建时间 
        ///</summary>
    
         public DateTime? CreateDate { get; set; }

        public DateTime? CreateDate { get; set; }
        /// <summary>
        /// 最后更新人 
        ///</summary>
         
         public string LastupdateBy { get; set; }

        public string LastupdateBy { get; set; }
        /// <summary>
        /// 最后更新时间 
        ///</summary>
  
         public DateTime? LastupdateDate { get; set; }

        public DateTime? LastupdateDate { get; set; }
        /// <summary>
        /// 备注 
        ///</summary>
 
         public string Memo { get; set; }

        public string Memo { get; set; }
        /// <summary>
        /// 物料产品编码 
        ///</summary>
 
         public string ItemNo { get; set; }

        public string ItemNo { get; set; }
        /// <summary>
        /// 顺序 
        ///</summary>
   
         public long? Forder { get; set; }

        public long? Forder { get; set; }
        /// <summary>
        /// 上公差 
        ///</summary>
    
         public decimal? FupAllow { get; set; }

        public decimal? FupAllow { get; set; }
        /// <summary>
        /// 检验项目 
        ///</summary>
   
         public string FcheckItem { get; set; }

        public string FcheckItem { get; set; }
        /// <summary>
        /// 特殊特性类别 
        ///</summary>
 
         public string FspecType { get; set; }

        public string FspecType { get; set; }
        /// <summary>
        /// 备用 
        ///</summary>
 
         public long? WorkshopCenterCode { get; set; }

        public long? WorkshopCenterCode { get; set; }
        /// <summary>
        /// 工序 
        ///</summary>
    
         public string ProcNo { get; set; }

        public string ProcNo { get; set; }
        /// <summary>
        /// 检验水准编码 
        ///</summary>
 
         public string SampleSizeNo { get; set; }

        public string SampleSizeNo { get; set; }
        /// <summary>
        /// 检验工具 
        ///</summary>
     
         public string FcheckTool { get; set; }

        public string FcheckTool { get; set; }
        /// <summary>
        /// 下公差 
        ///</summary>
    
         public decimal? FdownAllow { get; set; }

        public decimal? FdownAllow { get; set; }
        /// <summary>
        /// 检验水平 
        ///</summary>
 
         public string FcheckLevel { get; set; }

        public string FcheckLevel { get; set; }
        /// <summary>
        /// 标准值 
        ///</summary>
 
         public decimal? Fstand { get; set; }

        public decimal? Fstand { get; set; }
        /// <summary>
        /// 接收水平 
        ///</summary>
  
         public string FacLevel { get; set; }

        public string FacLevel { get; set; }
        /// <summary>
        /// 备用 
        ///</summary>
 
         public string FeatuProc { get; set; }

        public string FeatuProc { get; set; }
        /// <summary>
        /// 备用 
        ///</summary>
    
         public string FeatuProd { get; set; }

        public string FeatuProd { get; set; }
        /// <summary>
        /// 备用 
        ///</summary>
 
         public string Aql1Id { get; set; }

        public string Aql1Id { get; set; }
        /// <summary>
        /// 备用 
        ///</summary>
 
         public string FqaType { get; set; }

        public string FqaType { get; set; }
        /// <summary>
        /// 是否档位 
        /// 默认值: ((0))
        ///</summary>
 
         public bool? Isdanwei { get; set; }

        public bool? Isdanwei { get; set; }
        /// <summary>
        /// 默认用于在库重检 
        /// 默认值: ((1))
        ///</summary>
 
         public long? Ftype { get; set; }

        public long? Ftype { get; set; }
        /// <summary>
        /// 修改/ 新增状态 
        /// 默认值: ((0))
        ///</summary>
 
         public bool? EditStatus { get; set; }

        public bool? EditStatus { get; set; }
        /// <summary>
        /// 抽检数量 
        ///</summary>
 
         public long? CheckQty { get; set; }

        public long? CheckQty { get; set; }
        /// <summary>
        /// 允收数量 
        /// 默认值: ((0))
        ///</summary>
    
         public long? FacQty { get; set; }

        public long? FacQty { get; set; }
        /// <summary>
        ///  
        ///</summary>
   
         public string Company { get; set; }

        public string Company { get; set; }
        /// <summary>
        ///  
        ///</summary>
 
         public string Factory { get; set; }

        public string Factory { get; set; }
        /// <summary>
        /// 频次 
        ///</summary>
 
         public string Frequency { get; set; }

        public string Frequency { get; set; }
        /// <summary>
        /// 规格要求 
        ///</summary>
 
         public string FspecRequ { get; set; }

        public string FspecRequ { get; set; }
        /// <summary>
        /// 项目类别 
        ///</summary>
 
         public string FcheckType { get; set; }

        public string FcheckType { get; set; }
        /// <summary>
        /// 单位 
        ///</summary>
   
         public string Funit { get; set; }

        public string Funit { get; set; }
        /// <summary>
        /// 报表选择 
        /// 默认值: ((0))
        ///</summary>
         
         public bool? ReporfCheck { get; set; }

        public bool? ReporfCheck { get; set; }
        /// <summary>
        /// 特定修改 
        /// 默认值: ((0))
        ///</summary>
 
         public bool? GivenModify { get; set; }

        public bool? GivenModify { get; set; }
        /// <summary>
        /// UCL_X设定值 
        ///</summary>
       
         public decimal? Fucl { get; set; }

        public decimal? Fucl { get; set; }
        /// <summary>
        /// LCL_X设定值 
        ///</summary>
 
         public decimal? Flcl { get; set; }

        public decimal? Flcl { get; set; }
        /// <summary>
        /// UCL_R设定值 
        ///</summary>
 
         public decimal? Frucl { get; set; }

        public decimal? Frucl { get; set; }
        /// <summary>
        /// 物料ID 
        ///</summary>
 
         public long? ItemId { get; set; }

        public long? ItemId { get; set; }
        /// <summary>
        ///  
        ///</summary>

 DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.cs

@@ -1,12 +1,11 @@
using System;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.Charts.Native;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;

namespace Gs.DevApp.UserControl
{

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs

@@ -1,8 +1,3 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
@@ -11,6 +6,11 @@
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm
{
@@ -112,7 +112,7 @@
                };
                frm.ShowDialog();
            };
           

        }

        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -142,7 +142,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs

@@ -42,7 +42,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -66,7 +66,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs

@@ -120,9 +120,9 @@
            //自动计算打印量
            txt_psnQty_1.TextChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan( txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
            };
          

            radOut.SelectedIndexChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
@@ -167,7 +167,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -520,7 +520,7 @@
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                         Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                    }
                    else
                    {

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs

@@ -79,7 +79,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs

@@ -147,7 +147,7 @@
            };
            radOut.SelectedIndexChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1,radOut);
                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
            };
        }
        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs

@@ -42,7 +42,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -78,7 +78,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -307,6 +307,6 @@

        }

       

    }
}

 DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.cs

@@ -38,7 +38,7 @@
        /// </summary>
        public event EventHandler<UpdateParentEventArgs> UpdateParent;

       


        /// <summary>
        /// </summary>

 DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs

@@ -1,4 +1,3 @@
using DevExpress.Utils.DirectXPaint;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -23,7 +22,7 @@
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", (value) =>
            {
               

            });
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
@@ -36,7 +35,7 @@
        }
        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            await Task.Delay(100);
            getPageList(1);
        }
@@ -60,7 +59,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -109,7 +108,7 @@
                        gcMain1.DataSource = dt;
                        gcMain1.ForceInitialize();
                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                       

                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);

 DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs

@@ -1,12 +1,10 @@
using System;
using System.Data;
using System.IO;
using DevExpress.Utils.VisualEffects;
using DevExpress.XtraEditors;
using FastReport;
using DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.IO;

namespace Gs.DevApp.DevFrm.Rpt
{
@@ -52,17 +50,17 @@
                    //主表
                    var array = new JArray();
                    foreach (var a in _job["rtnData"]["zb"]) array.Add(a);
                    var _zb =JsonConvert.DeserializeObject<DataTable>(array.ToString());
                    var _zb = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                    _zb.TableName = "zb";
                    //明细表1
                    var array1 = new JArray();
                    foreach (var a in _job["rtnData"]["mx1"]) array1.Add(a);
                    var _mx1 =JsonConvert.DeserializeObject<DataTable>( array1.ToString());
                    var _mx1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
                    _mx1.TableName = "mx1";
                    //明细表2
                    var array2 = new JArray();
                    foreach (var a in _job["rtnData"]["mx2"]) array2.Add(a);
                    var _mx2 =JsonConvert.DeserializeObject<DataTable>(array2.ToString());
                    var _mx2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
                    _mx2.TableName = "mx2";
                    //加到数据集中
                    var ds = new DataSet();

 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs

@@ -34,7 +34,7 @@
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            },tips);
            }, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                getModel(value);
@@ -76,7 +76,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -99,7 +99,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs

@@ -81,7 +81,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs

@@ -62,7 +62,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -163,7 +163,7 @@
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
                   lbGuid.Text = strGuid;
                    lbGuid.Text = strGuid;
                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    gvList.Add(gvMx1);
                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);

 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs

@@ -57,7 +57,7 @@
                txt_custName.Text = txt_salesOrderId.GetSalesCusName();
                txt_xsOrgName.Text = txt_salesOrderId.GetSalesOrgName();
                string _xsOrgFid = txt_salesOrderId.GetSalesOrgFid();
                txt_fstockid.getSuppler(_xsOrgFid,_ucCk);
                txt_fstockid.getSuppler(_xsOrgFid, _ucCk);
                System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
                var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _sqGuid);
                var json = JsonConvert.SerializeObject(_obj);
@@ -148,7 +148,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs

@@ -79,7 +79,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs

@@ -1,12 +1,12 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.Sys
{
@@ -27,7 +27,7 @@
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            },tips);
            }, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                getModel(value);
@@ -47,9 +47,9 @@
            txt_noLength.ValueChanged += (s, e) => { DoPreviewCode(); };
            txt_isIncludeDoc.CheckedChanged += (s, e) => { DoPreviewCode(); };
            txt_isSpilit.CheckedChanged += (s, e) => { DoPreviewCode(); };
          

        }
 

        /// <summary>
        ///     分页事件
        /// </summary>

 DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs

@@ -1,12 +1,11 @@
using System;
using System.Data;
using System.IO;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using FastReport;
using DevExpress.XtraEditors;
using FastReport.Design;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Data;
using System.IO;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.Sys
{

 DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs

@@ -1,18 +1,10 @@
using DevExpress.Utils.VisualEffects;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.Sys
{
@@ -47,7 +39,7 @@
                    btn.TabIndex = 1;
                    btn.Text = row["reportType"].ToString() + "\n" + row["reportName"].ToString();
                    btn.Margin = new System.Windows.Forms.Padding(20);
                    btn.Tag = row["reportType"].ToString()+ "{}";
                    btn.Tag = row["reportType"].ToString() + "{}";
                    this.flowLayoutPanel1.Controls.Add(btn);
                    btn.Click += Btn_Click;
                }
@@ -60,7 +52,7 @@

        private void Btn_Click(object sender, EventArgs e)
        {
            string _guid =Guid.NewGuid().ToString();
            string _guid = Guid.NewGuid().ToString();
            SimpleButton btn = (SimpleButton)sender;
            string rptParameter = btn.Tag.ToString();
            if (string.IsNullOrEmpty(rptParameter))
@@ -69,7 +61,7 @@
                return;
            }
            var _bl = false;
            _bl = _ckRptService(_guid,rptParameter);
            _bl = _ckRptService(_guid, rptParameter);
            //如果已经有模板了，直接打开设置模板
            if (_bl)
            {
@@ -82,7 +74,7 @@
            rptWizard.ShowDialog();
        }

        private bool _ckRptService(string _guid,  string rptParameter)
        private bool _ckRptService(string _guid, string rptParameter)
        {
            try
            {

 DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs

@@ -214,7 +214,7 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            var _sbSqlWhere ="";
            var _sbSqlWhere = "";
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.PAGE_GROUP", "desc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try

 DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs

@@ -28,7 +28,7 @@
            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1,null, null, "", "", (value) =>
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            }, tips);
@@ -48,7 +48,7 @@
            await Task.Delay(100);
            getPageList(1);
        }
       

        /// <summary>
        /// 分页事件
        /// </summary>
@@ -68,7 +68,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -216,7 +216,8 @@
                txt_port.Focus();
                return;
            }
            if (!validateIpAddress(txt_ip.Text.Trim())) {
            if (!validateIpAddress(txt_ip.Text.Trim()))
            {
                MessageBox.Show("请输入正确的IP地址");
                txt_ip.Focus();
                return;

 DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs

@@ -6,7 +6,6 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;

@@ -67,7 +66,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/Sys/Mode/PrintUser.cs

@@ -44,7 +44,7 @@
        /// 默认值: ((0))
        ///</summary>
        public bool? IsStatus { get; set; }
        

        public string userName { get; set; }

        public string printNo { get; set; }

 DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs

@@ -1,11 +1,11 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.User
{

 DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs

@@ -33,7 +33,7 @@
        {
            Gs.DevApp.ToolBox.MsgHelper.ShowInformation("该窗体不支持查询，若想更新页面，请点击 刷新");
        }
       

        /// <summary>
        /// 刷新事件
        /// </summary>

 DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs

@@ -1,13 +1,13 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.Sys
{
@@ -61,7 +61,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            var frm = new ShowFilter(gridView1.Columns, _filterList,this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Reflection;
using System.Resources;
using System.Windows.Forms;
using DevExpress.Utils;
using DevExpress.Utils;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraTreeList;
@@ -12,6 +6,12 @@
using Gs.DevApp.Properties;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Reflection;
using System.Resources;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.User
{
@@ -161,7 +161,7 @@
                //getPageList(1);
                getTree();
            }
        

        }

        /// <summary>
@@ -199,7 +199,7 @@
                UtilityHelper.ChangeEnableByControl(this.panel1.Controls, true);
            }

         

        }

        /// <summary>
@@ -212,7 +212,7 @@
            lbGuid.Text = "";
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
            UtilityHelper.CleanValueByControl(panel1.Controls, true);
           

        }

        /// <summary>

 DevApp/Gs.DevApp/DevFrm/User/Role.cs

@@ -1,14 +1,14 @@
using System;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;

namespace Gs.DevApp.DevFrm.User
{
@@ -30,20 +30,20 @@
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            },tips);
            }, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                getModel(value);
            }, (value) =>
            {
                getPageList(this.pageBar1.CurrentPage);
            },lbGuid);
            }, lbGuid);
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }

 DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs

@@ -46,7 +46,7 @@
                    node.Name = _dy["guid"].ToString();
                    node.ImageIndex = 0;
                    node.Checked = _dy["isCk"].ToString() == "1" ? true : false;
                    var drItem = dt.Select("upGuid='" + _dy["guid"] +"'");
                    var drItem = dt.Select("upGuid='" + _dy["guid"] + "'");
                    foreach (var _dy2 in drItem)
                    {
                        var node22 = new TreeNode(); //定义结点
@@ -54,12 +54,12 @@
                        node22.Name = _dy2["guid"].ToString();
                        node22.ImageIndex = 1;
                        node22.Checked = _dy2["isCk"].ToString() == "1" ? true : false;
                        var drItem33 = dt.Select("upGuid='" + _dy2["guid"] +"'");
                        var drItem33 = dt.Select("upGuid='" + _dy2["guid"] + "'");
                        foreach (var _dy3 in drItem33)
                        {
                            var node33 = new TreeNode(); //定义结点
                            node33.Text = _dy3["name"].ToString(); //为结点赋值
                            node33.Name =_dy3["guid"].ToString();
                            node33.Name = _dy3["guid"].ToString();
                            node33.ImageIndex = 2;
                            node33.Checked = _dy3["isCk"].ToString() == "1" ? true : false;
                            node22.Nodes.Add(node33);

 DevApp/Gs.DevApp/DevFrm/User/User.cs

@@ -1,14 +1,14 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.User
{
@@ -29,7 +29,7 @@
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            },tips);
            }, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                getModel(value);

 DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs

@@ -1,11 +1,11 @@
using System;
using System.Data;
using System.Text;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors;
using Gs.DevApp.Properties;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Data;
using System.Text;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.User
{
@@ -104,7 +104,7 @@
            imageList.Images.Add("icon0", Resources.addfooter_32x32);
            imageList.Images.Add("icon1", Resources.listmultilevel_16x16);
            imageList.Images.Add("icon2", Resources.addcalculatedfield_16x16);
         //   trv.ImageList = imageList;
            //   trv.ImageList = imageList;
            var _obj = new
            {
                userGuid
@@ -138,7 +138,7 @@
                        node22.Text =
                            (_dy2["isCk"].ToString() == "1" ? _gou : "") +
                            _dy2["name"]; //为结点赋值
                        node22.Name =  _dy2["guid"].ToString();
                        node22.Name = _dy2["guid"].ToString();
                        node22.ImageIndex = 1;
                        node22.Checked = _dy2["isCk"].ToString() == "1" ? true : false;
                        var drItem33 = dt.Select("upGuid='" + _dy2["guid"] + "'");
@@ -150,7 +150,7 @@
                                _dy3["name"]; //为结点赋值
                            node33.Name = _dy3["guid"].ToString();
                            node33.ImageIndex = 2;
                            node33.Checked = _dy3["isCk"].ToString() == "1"? true : false;
                            node33.Checked = _dy3["isCk"].ToString() == "1" ? true : false;
                            node22.Nodes.Add(node33);
                        }
                        node22.Expand();

 DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs

@@ -1,8 +1,8 @@
using System;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.User
{

 DevApp/Gs.DevApp/DevFrm/User/ViewRole.cs

@@ -1,15 +1,8 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Properties;
using Gs.DevApp.Properties;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.User
@@ -23,7 +16,7 @@
        {
            InitializeComponent();
            _userGuid = userGuid;
           

            GetTree(_userGuid);
        }
        /// <summary>

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs

@@ -25,7 +25,7 @@
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -66,7 +66,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -98,7 +98,7 @@
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private   void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
        {
            _toolCk(1);
        }
@@ -109,10 +109,10 @@
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private   void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
        {
            _toolCk(0);
          

        }

        /// <summary>
@@ -142,7 +142,7 @@
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private   void getPageList(int curPage)
        private void getPageList(int curPage)
        {

            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
@@ -180,7 +180,7 @@
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
            }
        }
        private   void getModel(string strGuid)
        private void getModel(string strGuid)
        {
            bool isEdit = false;
            if (toolBarMenu1.currentAction == "add") return;
@@ -275,7 +275,7 @@
            var _obj = new
            {
                guid = rowGuid,
                inFieldValue= _inFieldValue
                inFieldValue = _inFieldValue
            };
            try
            {
@@ -299,6 +299,6 @@
            }
        }

      

    }
}

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs

@@ -77,7 +77,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs

@@ -38,7 +38,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -62,7 +62,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -145,7 +145,7 @@
            }

        }
      

        private void getModel(string strGuid)
        {
            bool isEdit = false;

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs

@@ -80,7 +80,7 @@
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
            };
           

            radOut.SelectedIndexChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
@@ -607,7 +607,7 @@
                this.ucBtnPrint98.rptParameter = "return false";
                return;
            }
            this.ucBtnPrint98.rptParameter = "rpt_trace{" 
            this.ucBtnPrint98.rptParameter = "rpt_trace{"
                   + ""
                   + "," + txt_printRemark98.Text.Trim()
                   + "," + ""

 DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs

@@ -6,7 +6,6 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;

@@ -22,11 +21,11 @@
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, this, "auditStatusChk", "", (value) =>
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "auditStatusChk", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            },tips);
            }, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                getModel(value);
@@ -43,7 +42,7 @@
            await Task.Delay(100);
            getPageList(1);
        }
       

        /// <summary>
        /// 分页事件
        /// </summary>
@@ -63,7 +62,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -100,20 +99,20 @@
                getPageList(this.pageBar1.CurrentPage);
            }
        }
        

        /// <summary>
        /// 
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private  void getPageList(int curPage)
        private void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "order_no", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
            {
                var strReturn =  UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                if (dd.rtnCode > 0)
                {

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.cs

@@ -1,15 +1,3 @@
using DevExpress.XtraEditors;
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.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm
{
    public partial class Frm_WwBl : DevExpress.XtraEditors.XtraForm

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBlDj.cs

@@ -1,24 +1,13 @@
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.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm
{
    public partial class Frm_WwBlDj : DevExpress.XtraEditors.XtraForm
    {
        

        public Frm_WwBlDj()
        {
            InitializeComponent();
           

        }
      

    }
}

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.cs

@@ -1,20 +1,8 @@
using DevExpress.XtraEditors;
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.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm
{
    public partial class Frm_WwCl : DevExpress.XtraEditors.XtraForm
    {
       

        public Frm_WwCl()
        {
            InitializeComponent();

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwClDj.cs

@@ -1,14 +1,3 @@
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.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm
{
    public partial class Frm_WwClDj : DevExpress.XtraEditors.XtraForm
@@ -16,7 +5,7 @@
        /// <summary>
        /// 超领和补料单是同一个
        /// </summary>
     

        public Frm_WwClDj()
        {
            InitializeComponent();

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs

@@ -29,8 +29,8 @@
            this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, this, "pcShChk", "", (value) =>
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "pcShChk", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            }, tips);
@@ -46,7 +46,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -63,7 +63,7 @@
                lbGuid, txt_daa001, gridView1);
            toolBarMenu1.guidKey = rowGuid;
        }
        

        /// <summary>
        /// 分页事件
        /// </summary>
@@ -83,7 +83,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs

@@ -44,7 +44,7 @@

        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -69,7 +69,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -83,7 +83,7 @@
            _filterList = e.FilterList;
            getPageList(1);
        }
        

        /// <summary>
        /// 日志
        /// </summary>
@@ -263,7 +263,7 @@
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
            }
        }
 

        /// <summary>
        /// 工具条事件
        /// </summary>

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs

@@ -28,8 +28,8 @@
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, this, "shChk", "", (value) =>
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "shChk", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            }, tips);
@@ -79,7 +79,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -230,11 +230,11 @@
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
           

            if (xtraTabControl1.SelectedTabPageIndex == 1)
            {
                getModel(rowGuid);
               

            }
            else
            {

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs

@@ -172,7 +172,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -187,7 +187,7 @@
            getPageList(1);
        }

    


        /// <summary>
        ///     审核事件
@@ -385,7 +385,7 @@
                        Guid = _guid,
                        AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
                        Sl = _sl, //申请数量
                        Remark= row["tld014"].ToString()
                        Remark = row["tld014"].ToString()
                    });
                }
            }

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs

@@ -27,7 +27,7 @@
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, this, "checkStatus", "", (value) =>
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            }, tips);
@@ -44,7 +44,7 @@

        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -81,7 +81,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -125,7 +125,7 @@
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
        }

       

        /// <summary>
        /// 刷新事件
        /// </summary>

 DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.cs

@@ -1,21 +1,15 @@
using DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
{
    public partial class SelectWwPc : DevExpress.XtraEditors.XtraForm
    {
      

        private readonly string _webServiceName = "WWPCManager/";
        private string lineId = "";
        public SelectWwPc(string _lineId)

 DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs

@@ -1,14 +1,7 @@
using DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
@@ -49,7 +42,7 @@
        /// </summary>
        public event EventHandler<UpdateParentEventArgs> UpdateParent;

      

        /// <summary>
        /// </summary>
        /// <param name="curPage">第几页</param>

 DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs

@@ -41,8 +41,8 @@
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            this.toolBarMenu1.getXmlConfig();
            Form parentForm = this.FindForm();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, parentForm, "bl018", "", (value) =>
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, parentForm, "bl018", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            }, tips);
@@ -95,7 +95,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -112,7 +112,7 @@
                lbGuid, txt_blNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
        }
        

        /// <summary>
        /// 分页事件
        /// </summary>
@@ -138,7 +138,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -282,7 +282,7 @@
            toolBarMenu1.isSetBtn = false;
            string inGdId = txt_aboutGuid.GetId();//工单号
            string inCkId = txt_bl010.GetId();//发料仓
            string inFlOrg= txt_orgId.GetId();//发料组织
            string inFlOrg = txt_orgId.GetId();//发料组织
            if (string.IsNullOrEmpty(inFlOrg))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择发料组织！");
@@ -598,6 +598,6 @@
                }
            }
        }
 

    }
}

 DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs

@@ -53,7 +53,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -71,7 +71,7 @@
                lbGuid, txt_itemOutNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
        }
       

        /// <summary>
        /// 分页事件
        /// </summary>
@@ -97,7 +97,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs

@@ -26,7 +26,7 @@
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            },tips);
            }, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                getModel(value);
@@ -86,7 +86,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -136,7 +136,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs

@@ -106,7 +106,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs

@@ -62,7 +62,7 @@
                    var rtn = UtilityHelper.ReturnToTablePage(strReturn);
                    var dt = rtn.rtnData.list;
                    this.repositoryItemSearchLookUpEdit1.DataSource = dt;
                  //  repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
                    //  repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
                    //Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView2);
                }
                catch (Exception ex)
@@ -71,11 +71,12 @@
                }
            };

            this.gvMx1.InitNewRow += (s, e) => {
            this.gvMx1.InitNewRow += (s, e) =>
            {
                string _orgId = txt_fapporgid.GetId();
                string _orgName= txt_fapporgid.GetName();
                string _orgName = txt_fapporgid.GetName();
                if (string.IsNullOrEmpty(_orgId)) return;
            

                gvMx1.SetFocusedRowCellValue("dcOrg", _orgName);
                gvMx1.SetFocusedRowCellValue("dcOrgGuid", _orgId);
                gvMx1.SetFocusedRowCellValue("drOrg", _orgName);
@@ -111,7 +112,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -226,7 +227,7 @@
            {
                List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                gvList.Add(gvMx1);
                UtilityHelper.ChangeEnableByControl( splitMx1.Panel1.Controls, true, gvList);
                UtilityHelper.ChangeEnableByControl(splitMx1.Panel1.Controls, true, gvList);
            }
        }
        /// <summary>
@@ -811,7 +812,7 @@
            var rowhandle = gvMx1.FocusedRowHandle;
            //if (rowhandle < 0)
            //    return;
             int _drhzlx = txt_fOwnerTypeInIdHead.SelectedIndex;
            int _drhzlx = txt_fOwnerTypeInIdHead.SelectedIndex;
            //if (_drhzlx <= 0)
            //{
            //    MsgHelper.Warning("提示：请先选择调入货主类型！");

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs

@@ -1,5 +1,4 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -66,7 +65,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs

@@ -1,8 +1,3 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
@@ -10,6 +5,11 @@
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm
{
@@ -23,8 +23,8 @@
            toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, this, "docStusTxt", "", (value) =>
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "docStusTxt", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            }, tips);
@@ -34,18 +34,18 @@
            }, (value) =>
            {
                getPageList(this.pageBar1.CurrentPage);
            },lbGuid);
            }, lbGuid);
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            txt_supplier.getSuppler("");
        }
        private   void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
           Task.Delay(100);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
       

        /// <summary>
        ///     分页事件
        /// </summary>
@@ -66,7 +66,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -109,7 +109,7 @@
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private   void getPageList(int curPage)
        private void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs

@@ -75,7 +75,7 @@
                    this.txt_fStockId.Focus();
                    return;
                }
                var frm = new SelectShuoTuiSq(this.txt_fCustId.GetId(), txt_fStockOrgId.GetId(), txt_fStockId.GetId(),  txt_fIsLink.SelectedIndex.ToString());
                var frm = new SelectShuoTuiSq(this.txt_fCustId.GetId(), txt_fStockOrgId.GetId(), txt_fStockId.GetId(), txt_fIsLink.SelectedIndex.ToString());
                //赋值给明细表
                frm.UpdateParent += (ss, ee) =>
                {
@@ -150,7 +150,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -315,7 +315,7 @@
            var _ckId = txt_fStockId.GetId();
            var _khId = txt_fCustId.GetId();
            string _orgId = txt_fStockOrgId.GetId();
            int _fIsLink= txt_fIsLink.SelectedIndex==0?1:0;
            int _fIsLink = txt_fIsLink.SelectedIndex == 0 ? 1 : 0;
            if (string.IsNullOrEmpty(_orgId))
            {
                MsgHelper.Warning("请选择组织！");
@@ -353,8 +353,8 @@
            }; gvMx1.PostEditor();
            gvMx1.CloseEditor();
            gvMx1.UpdateCurrentRow();
            
          


            if (gvMx1.DataRowCount <= 0)
            {
                MsgHelper.ShowError("明细不能为空，请选择你的收料明细！");
@@ -372,7 +372,7 @@
                        MsgHelper.ShowError("申请数量不能为空！");
                        return;
                    }
                    if (string.IsNullOrEmpty(row["fStockStatusId"].ToString()) || row["fStockStatusId"].ToString()=="请选择")
                    if (string.IsNullOrEmpty(row["fStockStatusId"].ToString()) || row["fStockStatusId"].ToString() == "请选择")
                    {
                        MsgHelper.ShowError("请选择库存状态！");
                        return;

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs

@@ -69,7 +69,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -83,7 +83,7 @@
            _filterList = e.FilterList;
            getPageList(1);
        }
        

        /// <summary>
        /// 日志
        /// </summary>
@@ -265,7 +265,7 @@
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
            }
        }
 

        /// <summary>
        /// 工具条事件
        /// </summary>

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs

@@ -122,7 +122,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -159,7 +159,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -304,7 +304,7 @@
            string kcZz = txt_fStockOrgId.GetId();//库存组织
            string inRkyy = txt_remark.Text.Trim();//原因
            string kcCk = txt_fStockId.GetId();//仓库
            string kh=txt_fCustId.GetId();//客户
            string kh = txt_fCustId.GetId();//客户
            if (string.IsNullOrEmpty(kcZz))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择库存组织！");
@@ -329,7 +329,7 @@
                kcZz = kcZz,//库存组织
                kcCk = kcCk,//库存仓库
                inRkyy = inRkyy,//入库原因
                kh= kh,
                kh = kh,
                list = new List<dynamic>(),
            };
            gvMx1.CloseEditor();
@@ -647,7 +647,8 @@
                txtYdy.Text = row["ydy"].ToString();//已打印总量
                txt_kQty.Text = row["kdy"].ToString();//可打印总量
            }
            else {
            else
            {
                lbMxGuid.Text = "";
                ucBtnPrint1.guidKey = "";
                txtWlid.Text = "";

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs

@@ -79,7 +79,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

 DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs

@@ -1,109 +1,108 @@

using System;
using System.Collections.Generic;
namespace MES.Service.Modes
{
    /// <summary>
    /// </summary>
 

    public class MesDepotSections
    {
        /// <summary>
        ///     默认值: (newid())
        /// </summary>
       

        public Guid? Guid { get; set; }

        /// <summary>
        /// </summary>
     

        public Guid? DepotGuid { get; set; }

        /// <summary>
        ///     ID(SEQ_INV_ID)（ERPID）
        /// </summary>
   

        public int DepotSectionId { get; set; }

        /// <summary>
        ///     货位编码
        /// </summary>
      

        public string DepotSectionCode { get; set; }

        /// <summary>
        ///     货位名称
        /// </summary>
      

        public string DepotSectionName { get; set; }

        /// <summary>
        ///     参与齐套校验(0:否,1:是)
        /// </summary>
     

        public bool? CompletenessFlag { get; set; }

        /// <summary>
        ///     备注
        /// </summary>
      

        public string Description { get; set; }

        /// <summary>
        ///     创建人
        /// </summary>
      

        public string CreateBy { get; set; }

        /// <summary>
        ///     创建时间
        /// </summary>
     

        public DateTime? CreateDate { get; set; }

        /// <summary>
        ///     最后更新人
        /// </summary>
      

        public string LastupdateBy { get; set; }

        /// <summary>
        ///     最后更新时间
        /// </summary>
      

        public DateTime? LastupdateDate { get; set; }

        /// <summary>
        /// </summary>
       

        public string Company { get; set; }

        /// <summary>
        /// </summary>
      

        public string Factory { get; set; }

        /// <summary>
        ///     卡板数
        /// </summary>
       

        public int? KbQty { get; set; }

        /// <summary>
        ///     仓位组ID
        /// </summary>
      

        public int? Zuid { get; set; }

        /// <summary>
        ///     仓位全名
        /// </summary>
     

        public string DepotSectionNamet { get; set; }

        /// <summary>
        /// </summary>
     

        public int? Erpid { get; set; }
    }
}

 DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs

@@ -6,208 +6,208 @@
    /// <summary>
    /// 
    ///</summary>
  

    public class MesInvItemArn
    {
        /// <summary>
        /// 主键 
        /// 默认值: (newid())
        ///</summary>
      
         public Guid Guid { get; set; }

        public Guid Guid { get; set; }
        /// <summary>
        /// 到货单号 
        ///</summary>
     
         public string BillNo { get; set; }

        public string BillNo { get; set; }
        /// <summary>
        /// 状态|0-未审核1-审核入库\结案 
        /// 默认值: ((0))
        ///</summary>
        
         public int? Status { get; set; }

        public int? Status { get; set; }
        /// <summary>
        /// 原因 
        ///</summary>
      
         public string Reason { get; set; }

        public string Reason { get; set; }
        /// <summary>
        /// 创建人 
        ///</summary>
      
         public string CreateBy { get; set; }

        public string CreateBy { get; set; }
        /// <summary>
        /// 创建时间 
        ///</summary>
    
         public DateTime? CreateDate { get; set; }

        public DateTime? CreateDate { get; set; }
        /// <summary>
        /// 最后更新人 
        ///</summary>
      
         public string LastupdateBy { get; set; }

        public string LastupdateBy { get; set; }
        /// <summary>
        /// 最后更新时间 
        ///</summary>
     
         public DateTime? LastupdateDate { get; set; }

        public DateTime? LastupdateDate { get; set; }
        /// <summary>
        /// 单据类型ID 
        ///</summary>
      
         public int? BillTypeId { get; set; }

        public int? BillTypeId { get; set; }
        /// <summary>
        /// 事务类型ID 
        ///</summary>
      
         public int? TransactionId { get; set; }

        public int? TransactionId { get; set; }
        /// <summary>
        /// 备注 
        ///</summary>
    
         public string Remark { get; set; }

        public string Remark { get; set; }
        /// <summary>
        /// 送货单号 
        ///</summary>
     
         public string PaperBillNo { get; set; }

        public string PaperBillNo { get; set; }
        /// <summary>
        /// 退料人工号 
        ///</summary>
     
         public string UserNoBack { get; set; }

        public string UserNoBack { get; set; }
        /// <summary>
        /// 提交人 
        ///</summary>
    
         public string CheckUser { get; set; }

        public string CheckUser { get; set; }
        /// <summary>
        /// 提交日期 
        ///</summary>
    
         public DateTime? CheckDate { get; set; }

        public DateTime? CheckDate { get; set; }
        /// <summary>
        /// 入库日期 
        ///</summary>
  
         public DateTime? InsDate { get; set; }

        public DateTime? InsDate { get; set; }
        /// <summary>
        /// 检验结果 
        ///</summary>
     
         public string CheckRes { get; set; }

        public string CheckRes { get; set; }
        /// <summary>
        /// 已捡数量 
        ///</summary>
    
         public int? CheckQty { get; set; }

        public int? CheckQty { get; set; }
        /// <summary>
        /// 仓库id 
        ///</summary>
    
         public string DepotsId { get; set; }

        public string DepotsId { get; set; }
        /// <summary>
        /// 事务类型编码 
        ///</summary>
        
         public string TransctionNo { get; set; }

        public string TransctionNo { get; set; }
        /// <summary>
        /// 供应商id 
        ///</summary>
 
         public string SuppId { get; set; }

        public string SuppId { get; set; }
        /// <summary>
        /// 提交状态 
        /// 默认值: ((0))
        ///</summary>

         public bool? Fstatus { get; set; }
        public bool? Fstatus { get; set; }
        /// <summary>
        /// 工厂编码 
        ///</summary>
     
         public string Factory { get; set; }

        public string Factory { get; set; }
        /// <summary>
        /// 是否已回写SAP 
        /// 默认值: ((0))
        ///</summary>
 
         public int? Sapstatus { get; set; }

        public int? Sapstatus { get; set; }
        /// <summary>
        /// 是否检验 
        ///</summary>
    
         public bool? Ischeck { get; set; }

        public bool? Ischeck { get; set; }
        /// <summary>
        /// 审核入库人 
        ///</summary>
    
         public string Insby { get; set; }

        public string Insby { get; set; }
        /// <summary>
        /// 公司代码 
        ///</summary>
         
         public string Company { get; set; }

        public string Company { get; set; }
        /// <summary>
        /// 急料标识 
        /// 默认值: ((0))
        ///</summary>
      
         public bool? UrgentFlag { get; set; }

        public bool? UrgentFlag { get; set; }
        /// <summary>
        /// 冲销事务类型编码 
        ///</summary>
       
         public int? MttransctionNo { get; set; }

        public int? MttransctionNo { get; set; }
        /// <summary>
        /// IQC检验单号 
        ///</summary>
    
         public string IqcReleaseNo { get; set; }

        public string IqcReleaseNo { get; set; }
        /// <summary>
        /// 是否显示 
        /// 默认值: ((0))
        ///</summary>
   
         public int? IsVisual { get; set; }

        public int? IsVisual { get; set; }
        /// <summary>
        /// 0=采购，1=委外 
        /// 默认值: ((1))
        ///</summary>
      
         public bool? FType { get; set; }

        public bool? FType { get; set; }
        /// <summary>
        /// ERP到货单ID 
        ///</summary>
 
         public string EbelnK3id { get; set; }

        public string EbelnK3id { get; set; }
        /// <summary>
        /// 条码条印进度 
        ///</summary>
     
         public int? BarcodeRatio { get; set; }

        public int? BarcodeRatio { get; set; }
        /// <summary>
        /// ERP单号 
        ///</summary>
 
         public string Erpno { get; set; }

        public string Erpno { get; set; }
        /// <summary>
        /// 是否已退货0-未退货，1-退货 
        ///</summary>
 
         public int? Thstatus { get; set; }

        public int? Thstatus { get; set; }
        /// <summary>
        /// ERP退货单号 
        ///</summary>
 
         public string Erpthno { get; set; }

        public string Erpthno { get; set; }
        /// <summary>
        /// 组织编码 
        ///</summary>
     
         public string OrganizeCode { get; set; }

     
        public string OrganizeCode { get; set; }


        public List<MesInvItemArnDetail> list { get; set; }
    }
}

 DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArnDetail.cs

@@ -1,221 +1,221 @@
using System;
 

namespace MES.Service.Modes
{
    /// <summary>
    /// 
    ///</summary>
 

    public class MesInvItemArnDetail
    {
        /// <summary>
        ///  
        /// 默认值: (newid())
        ///</summary>
 
         public Guid? Guid { get; set; }

        public Guid? Guid { get; set; }
        /// <summary>
        ///  
        ///</summary>
     
         public Guid? ParentGuid { get; set; }

        public Guid? ParentGuid { get; set; }
        /// <summary>
        /// MES_ROH_IN_DATA的guid 
        ///</summary>
    
         public Guid? AboutGuid { get; set; }

        public Guid? AboutGuid { get; set; }
        /// <summary>
        /// 采购单号 
        ///</summary>
       
         public string Ebeln { get; set; }

        public string Ebeln { get; set; }
        /// <summary>
        /// 采购订单行号 
        ///</summary>
 
         public int? EbelnLine { get; set; }

        public int? EbelnLine { get; set; }
        /// <summary>
        /// 采购订单数量 
        ///</summary>
 
         public decimal? EbelnQty { get; set; }

        public decimal? EbelnQty { get; set; }
        /// <summary>
        /// 物料编码 
        ///</summary>
   
         public string ItemNo { get; set; }

        public string ItemNo { get; set; }
        /// <summary>
        /// 收货数量 
        ///</summary>
 
         public decimal? Quantity { get; set; }

        public decimal? Quantity { get; set; }
        /// <summary>
        /// 创建人 
        ///</summary>
     
         public string CreateBy { get; set; }

        public string CreateBy { get; set; }
        /// <summary>
        /// 创建时间 
        ///</summary>
  
         public DateTime? CreateDate { get; set; }

        public DateTime? CreateDate { get; set; }
        /// <summary>
        /// 最后更新人 
        ///</summary>
    
         public string LastupdateBy { get; set; }

        public string LastupdateBy { get; set; }
        /// <summary>
        /// 最后更新时间 
        ///</summary>
     
         public DateTime? LastupdateDate { get; set; }

        public DateTime? LastupdateDate { get; set; }
        /// <summary>
        /// 分厂编码 
        ///</summary>
 
         public string Factory { get; set; }

        public string Factory { get; set; }
        /// <summary>
        /// 公司代码 
        ///</summary>
     
         public string Company { get; set; }

        public string Company { get; set; }
        /// <summary>
        /// 采购单ID 
        ///</summary>
 
         public int? EbelnK3id { get; set; }

        public int? EbelnK3id { get; set; }
        /// <summary>
        /// 采购单行ID 
        ///</summary>
 
         public int? LineK3id { get; set; }

        public int? LineK3id { get; set; }
        /// <summary>
        /// 本次应收数量 
        ///</summary>
      
         public decimal? SubQty { get; set; }

        public decimal? SubQty { get; set; }
        /// <summary>
        /// 余量 
        ///</summary>
 
         public int? MarginQty { get; set; }

        public int? MarginQty { get; set; }
        /// <summary>
        /// 任务单号 
        ///</summary>
  
         public string WorkNo { get; set; }

        public string WorkNo { get; set; }
        /// <summary>
        /// 急料标识 
        /// 默认值: ((0))
        ///</summary>
     
         public bool? UrgentFlag { get; set; }

        public bool? UrgentFlag { get; set; }
        /// <summary>
        /// 备注 
        ///</summary>
  
         public string Memo { get; set; }

        public string Memo { get; set; }
        /// <summary>
        /// 检验结果 
        ///</summary>
   
         public string CheckRes { get; set; }

        public string CheckRes { get; set; }
        /// <summary>
        /// 检验状态  （待检、分选、特采、已检） 
        /// 默认值: ('待检')
        ///</summary>
         
         public string CheckStates { get; set; }

        public string CheckStates { get; set; }
        /// <summary>
        /// 收货余量 
        ///</summary>
      
         public int? QuantityM { get; set; }

        public int? QuantityM { get; set; }
        /// <summary>
        /// 本次应收余量 
        ///</summary>
  
         public int? SubMqty { get; set; }

        public int? SubMqty { get; set; }
        /// <summary>
        /// 检验日期 
        ///</summary>
 
         public DateTime? CheckDate { get; set; }

        public DateTime? CheckDate { get; set; }
        /// <summary>
        /// 是否检验 
        /// 默认值: ((0))
        ///</summary>
    
         public int? Ischeck { get; set; }

        public int? Ischeck { get; set; }
        /// <summary>
        /// 已收数量 
        ///</summary>
   
         public int? OkQty { get; set; }

        public int? OkQty { get; set; }
        /// <summary>
        /// 已收余量 
        ///</summary>
 
         public int? OkMqty { get; set; }

        public int? OkMqty { get; set; }
        /// <summary>
        /// 产品型号 
        ///</summary>
 
         public string BoardStyle { get; set; }

        public string BoardStyle { get; set; }
        /// <summary>
        /// 任务单行号 
        ///</summary>
   
         public int? WorkLine { get; set; }

        public int? WorkLine { get; set; }
        /// <summary>
        /// 0、采购单，1、委外单 
        /// 默认值: ((0))
        ///</summary>
   
         public int? FType { get; set; }

        public int? FType { get; set; }
        /// <summary>
        /// 是否入库 
        /// 默认值: ((0))
        ///</summary>
    
         public bool? IsdepsIn { get; set; }

        public bool? IsdepsIn { get; set; }
        /// <summary>
        /// 到货单号 
        ///</summary>
  
         public string Dha001 { get; set; }

        public string Dha001 { get; set; }
        /// <summary>
        /// 已入库数量 
        ///</summary>
 
         public int? OkRkqty { get; set; }

        public int? OkRkqty { get; set; }
        /// <summary>
        /// 到货单号 
        ///</summary>
 
         public string CbillNo { get; set; }

        public string CbillNo { get; set; }
        /// <summary>
        /// 采购入库数量 
        ///</summary>
   
         public int? CgRkqty { get; set; }

        public int? CgRkqty { get; set; }
        /// <summary>
        /// 物料ID 
        ///</summary>
 
         public int? ItemId { get; set; }

        public int? ItemId { get; set; }
        /// <summary>
        /// 退货标识 
        /// 默认值: ((0))
        ///</summary>
   
         public int? ReturnFlag { get; set; }

        public int? ReturnFlag { get; set; }
        /// <summary>
        /// 推送状态 
        ///</summary>
    
         public string States { get; set; }

       
        public string States { get; set; }


    }
}

 DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutItems.cs

@@ -10,155 +10,155 @@
        /// <summary>
        /// 物料编号 
        ///</summary>
         public string ItemNo { get; set; }
        public string ItemNo { get; set; }
        /// <summary>
        /// 申请数量 
        ///</summary>
         public decimal? Quantity { get; set; }
        public decimal? Quantity { get; set; }
        /// <summary>
        ///  
        ///</summary>
         public string CreateBy { get; set; }
        public string CreateBy { get; set; }
        /// <summary>
        ///  
        ///</summary>
         public DateTime? CreateDate { get; set; }
        public DateTime? CreateDate { get; set; }
        /// <summary>
        ///  
        ///</summary>
         public string LastupdateBy { get; set; }
        public string LastupdateBy { get; set; }
        /// <summary>
        ///  
        ///</summary>
         public DateTime? LastupdateDate { get; set; }
        public DateTime? LastupdateDate { get; set; }
        /// <summary>
        /// 备注信息 
        ///</summary>
         public string Remark { get; set; }
        public string Remark { get; set; }
        /// <summary>
        ///  
        ///</summary>
         public string Factory { get; set; }
        public string Factory { get; set; }
        /// <summary>
        ///  
        ///</summary>
         public string Company { get; set; }
        public string Company { get; set; }
        /// <summary>
        /// 推介仓库 
        ///</summary>
         public string DepotCode { get; set; }
        public string DepotCode { get; set; }
        /// <summary>
        /// 推介库位 
        ///</summary>
         public string DepotSectionCode { get; set; }
        public string DepotSectionCode { get; set; }
        /// <summary>
        ///  
        ///</summary>
         public string TaskNo { get; set; }
        public string TaskNo { get; set; }
        /// <summary>
        /// 到货单号 
        ///</summary>
         public string WorkNo { get; set; }
        public string WorkNo { get; set; }
        /// <summary>
        /// 到货单行号 
        ///</summary>
         public int? WorkLine { get; set; }
        public int? WorkLine { get; set; }
        /// <summary>
        /// ERP 主表ID 
        ///</summary>
         public int? ErpId { get; set; }
        public int? ErpId { get; set; }
        /// <summary>
        /// ERP 从表ID 
        ///</summary>
         public int? ErpAutoid { get; set; }
        public int? ErpAutoid { get; set; }
        /// <summary>
        /// ERP_料号 
        ///</summary>
         public string ErpItemNo { get; set; }
        public string ErpItemNo { get; set; }
        /// <summary>
        /// 颜色 
        ///</summary>
         public string ColorName { get; set; }
        public string ColorName { get; set; }
        /// <summary>
        /// 最新下载更新标识 
        /// 默认值: ((1))
        ///</summary>
         public int? UpdateFlg { get; set; }
        public int? UpdateFlg { get; set; }
        /// <summary>
        /// 采购单ID 
        ///</summary>
         public int? EbelnK3id { get; set; }
        public int? EbelnK3id { get; set; }
        /// <summary>
        /// 采购单行ID 
        ///</summary>
         public int? LineK3id { get; set; }
        public int? LineK3id { get; set; }
        /// <summary>
        /// 采购单号 
        /// 默认值: ('0')
        ///</summary>
         public string Ebeln { get; set; }
        public string Ebeln { get; set; }
        /// <summary>
        /// 采购订单行号 
        ///</summary>
         public int? EbelnLine { get; set; }
        public int? EbelnLine { get; set; }
        /// <summary>
        /// 采购订单数量 
        ///</summary>
         public decimal? EbelnQty { get; set; }
        public decimal? EbelnQty { get; set; }
        /// <summary>
        /// 产品编号 
        ///</summary>
         public string BoardItem { get; set; }
        public string BoardItem { get; set; }
        /// <summary>
        ///  
        ///</summary>
         public int? FType { get; set; }
        public int? FType { get; set; }
        /// <summary>
        ///  
        /// 默认值: ((0))
        ///</summary>
         public int? Status { get; set; }
        public int? Status { get; set; }
        /// <summary>
        /// 子子表ID 
        ///</summary>
         public int? Allocateid { get; set; }
        public int? Allocateid { get; set; }
        /// <summary>
        /// 领料编号/生产工单 
        ///</summary>
         public string PbillNo { get; set; }
        public string PbillNo { get; set; }
        /// <summary>
        /// erp接口返回 
        ///</summary>
         public string ErpMark { get; set; }
        public string ErpMark { get; set; }
        /// <summary>
        /// 入库单号 
        ///</summary>
         public string RkNo { get; set; }
        public string RkNo { get; set; }
        /// <summary>
        /// 已入库数 
        ///</summary>
         public int? RkQty { get; set; }
        public int? RkQty { get; set; }
        /// <summary>
        /// 已扫数量 
        ///</summary>
         public int? TlQty { get; set; }
        public int? TlQty { get; set; }
        /// <summary>
        /// 物料ID 
        ///</summary>
         public long? ItemId { get; set; }
        public long? ItemId { get; set; }
        /// <summary>
        /// 物料投料单ID(发料扫码使用) 
        ///</summary>
         public int? ItemDabid { get; set; }
        public int? ItemDabid { get; set; }
        /// <summary>
        ///  
        /// 默认值: (newid())
        ///</summary>
         public Guid Guid { get; set; }
        public Guid Guid { get; set; }
        /// <summary>
        /// 出库ID 
        ///</summary>
         public Guid? ItemOutId { get; set; }
        public Guid? ItemOutId { get; set; }

        public string ItemName { get; set; }
        public string ItemModel { get; set; }
@@ -169,7 +169,7 @@
        /// RK_LINE
        /// </summary>
        public Guid AboutGuid { get; set; }
        

        public string ItemUnit { get; set; }
    }
}

 DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOuts.cs

@@ -218,7 +218,7 @@
        ///  
        ///</summary>
        public int? DepotId { get; set; }
        

        public string BillNo { get; set; }

        public string DepotName { get; set; }
@@ -232,20 +232,20 @@
        public List<MesInvItemOutItems> MesInvItemOutItemsList { get; set; }

        public List<MesInvItemOutCDetails> MesInvItemOutCDetailsList { get; set; }
        
        


        public string Departmentname { get; set; }
    
        


        public string ItemNo { get; set; }
    
        


        public string ItemName { get; set; }
    
        


        public string BillTypeName { get; set; }
    
        


        public string TransactionName { get; set; }
    }
}

 DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemStocks.cs

@@ -11,145 +11,145 @@
        ///  
        /// 默认值: (newid())
        ///</summary>
         public Guid Guid { get; set; }
        public Guid Guid { get; set; }
        /// <summary>
        /// 生产订单 
        ///</summary>
         public string TaskNo { get; set; }
        public string TaskNo { get; set; }
        /// <summary>
        /// 物料条码 
        ///</summary>
         public string ItemBarcode { get; set; }
        public string ItemBarcode { get; set; }
        /// <summary>
        /// 客户物料编码（无条码手工录入，有条码为冗余字段） 
        ///</summary>
         public string CItemCode { get; set; }
        public string CItemCode { get; set; }
        /// <summary>
        /// 本司物料编码（无条码手工录入，有条码为冗余字段） 
        ///</summary>
         public string ItemNo { get; set; }
        public string ItemNo { get; set; }
        /// <summary>
        /// 子库id 
        ///</summary>
         public long? DepotsId { get; set; }
        public long? DepotsId { get; set; }
        /// <summary>
        /// 货位id 
        ///</summary>
         public long? DepotSectionsId { get; set; }
        public long? DepotSectionsId { get; set; }
        /// <summary>
        /// 厂家批次 
        ///</summary>
         public string LotNo { get; set; }
        public string LotNo { get; set; }
        /// <summary>
        /// 数量 
        /// 默认值: ((0))
        ///</summary>
         public decimal? Quantity { get; set; }
        public decimal? Quantity { get; set; }
        /// <summary>
        /// 环保标志（无条码手工录入，有条码为冗余字段）(0-否，1-是) 
        ///</summary>
         public byte? EpFlag { get; set; }
        public byte? EpFlag { get; set; }
        /// <summary>
        /// 客户编码 
        ///</summary>
         public string CustomerNo { get; set; }
        public string CustomerNo { get; set; }
        /// <summary>
        /// 重量 
        ///</summary>
         public decimal? ItemWt { get; set; }
        public decimal? ItemWt { get; set; }
        /// <summary>
        /// 子库CODE 
        ///</summary>
         public string DepotsCode { get; set; }
        public string DepotsCode { get; set; }
        /// <summary>
        /// 货位CODE 
        ///</summary>
         public string DepotSectionsCode { get; set; }
        public string DepotSectionsCode { get; set; }
        /// <summary>
        /// 检验日期 
        ///</summary>
         public DateTime? CheckDate { get; set; }
        public DateTime? CheckDate { get; set; }
        /// <summary>
        /// 0 物料 1 半成品 2 成品 
        /// 默认值: ((0))
        ///</summary>
         public byte? ItemType { get; set; }
        public byte? ItemType { get; set; }
        /// <summary>
        /// 入库日期 
        /// 默认值: (getdate())
        ///</summary>
         public DateTime? IndepDate { get; set; }
        public DateTime? IndepDate { get; set; }
        /// <summary>
        /// 工厂编号 
        ///</summary>
         public string Factory { get; set; }
        public string Factory { get; set; }
        /// <summary>
        /// 公司编号 
        ///</summary>
         public string Company { get; set; }
        public string Company { get; set; }
        /// <summary>
        /// 质量状态 
        ///</summary>
         public string IqcStatus { get; set; }
        public string IqcStatus { get; set; }
        /// <summary>
        /// F卡 
        ///</summary>
         public string Fcar { get; set; }
        public string Fcar { get; set; }
        /// <summary>
        /// 可见提交标志（0-否，1-是） 
        /// 默认值: ((0))
        ///</summary>
         public byte? VisableSubmit { get; set; }
        public byte? VisableSubmit { get; set; }
        /// <summary>
        /// 可见提交人 
        ///</summary>
         public string VisableSubmitBy { get; set; }
        public string VisableSubmitBy { get; set; }
        /// <summary>
        /// 可见提交时间 
        ///</summary>
         public DateTime? VisableSubmitDate { get; set; }
        public DateTime? VisableSubmitDate { get; set; }
        /// <summary>
        /// 板型 
        ///</summary>
         public string BoardStyle { get; set; }
        public string BoardStyle { get; set; }
        /// <summary>
        /// 工单号 
        ///</summary>
         public string WorkNo { get; set; }
        public string WorkNo { get; set; }
        /// <summary>
        /// 工单行号 
        ///</summary>
         public int? WorkLine { get; set; }
        public int? WorkLine { get; set; }
        /// <summary>
        /// 供应商编码 
        ///</summary>
         public string SuppNo { get; set; }
        public string SuppNo { get; set; }
        /// <summary>
        /// 行号 
        ///</summary>
         public string LineNo { get; set; }
        public string LineNo { get; set; }
        /// <summary>
        /// 单据编号 
        ///</summary>
         public string BillNo { get; set; }
        public string BillNo { get; set; }
        /// <summary>
        /// K3ID 
        ///</summary>
         public long? EbelnK3id { get; set; }
        public long? EbelnK3id { get; set; }
        /// <summary>
        /// 行K3ID 
        ///</summary>
         public long? LineK3id { get; set; }
        public long? LineK3id { get; set; }
        /// <summary>
        /// 物料ID 
        ///</summary>
         public long? ItemId { get; set; }
        
         public string SuppId { get; set; }
        public long? ItemId { get; set; }

         /// <summary>
         ///     仓库ID
         /// </summary>
         public int? DepotId { get; set; }
        public string SuppId { get; set; }

        /// <summary>
        ///     仓库ID
        /// </summary>
        public int? DepotId { get; set; }
    }
}

 DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesItems.cs

@@ -10,210 +10,210 @@
        /// <summary>
        ///  
        ///</summary>
         public Guid Guid { get; set; }
        public Guid Guid { get; set; }
        /// <summary>
        /// 物料ID 
        ///</summary>
         public long Id { get; set; }
        public long Id { get; set; }
        /// <summary>
        /// 工厂 
        ///</summary>
         public string Factory { get; set; }
        public string Factory { get; set; }
        /// <summary>
        /// 公司编号 
        ///</summary>
         public string Company { get; set; }
        public string Company { get; set; }
        /// <summary>
        /// 物料编码 = ERP物料编号||颜色编号 
        ///</summary>
         public string ItemNo { get; set; }
        public string ItemNo { get; set; }
        /// <summary>
        /// 物料名称 
        ///</summary>
         public string ItemName { get; set; }
        public string ItemName { get; set; }
        /// <summary>
        /// 物料简称 
        ///</summary>
         public string ItemSname { get; set; }
        public string ItemSname { get; set; }
        /// <summary>
        /// 规格型号 
        ///</summary>
         public string ItemModel { get; set; }
        public string ItemModel { get; set; }
        /// <summary>
        /// 物料描述 
        ///</summary>
         public string ItemDescription { get; set; }
        public string ItemDescription { get; set; }
        /// <summary>
        /// 物料单位 
        ///</summary>
         public string ItemUnit { get; set; }
        public string ItemUnit { get; set; }
        /// <summary>
        /// 物料类型 
        ///</summary>
         public string ItemType { get; set; }
        public string ItemType { get; set; }
        /// <summary>
        /// 产品版本 
        ///</summary>
         public string ItemVersion { get; set; }
        public string ItemVersion { get; set; }
        /// <summary>
        /// 客户编号 
        ///</summary>
         public string CustNo { get; set; }
        public string CustNo { get; set; }
        /// <summary>
        /// 创建人 
        ///</summary>
         public string CreateBy { get; set; }
        public string CreateBy { get; set; }
        /// <summary>
        /// 创建时间 
        ///</summary>
         public DateTime? CreateDate { get; set; }
        public DateTime? CreateDate { get; set; }
        /// <summary>
        /// 最后更新人 
        ///</summary>
         public string LastupdateBy { get; set; }
        public string LastupdateBy { get; set; }
        /// <summary>
        /// 最后更新时间 
        ///</summary>
         public DateTime? LastupdateDate { get; set; }
        public DateTime? LastupdateDate { get; set; }
        /// <summary>
        /// 最低库存 
        ///</summary>
         public decimal? Lowlimit { get; set; }
        public decimal? Lowlimit { get; set; }
        /// <summary>
        /// 最大库存 
        ///</summary>
         public decimal? Highlimit { get; set; }
        public decimal? Highlimit { get; set; }
        /// <summary>
        /// 最小包装数 
        ///</summary>
         public decimal? PrdPack { get; set; }
        public decimal? PrdPack { get; set; }
        /// <summary>
        /// 订单单位 
        ///</summary>
         public string Orderunit { get; set; }
        public string Orderunit { get; set; }
        /// <summary>
        /// 销售单位 
        ///</summary>
         public string Saleunit { get; set; }
        public string Saleunit { get; set; }
        /// <summary>
        /// 库房单位 
        ///</summary>
         public string Storeunit { get; set; }
        public string Storeunit { get; set; }
        /// <summary>
        /// 物料ID 
        ///</summary>
         public long? EItemId { get; set; }
        public long? EItemId { get; set; }
        /// <summary>
        /// ERP料号 
        ///</summary>
         public string ErpItemNo { get; set; }
        public string ErpItemNo { get; set; }
        /// <summary>
        /// 默认仓库 
        ///</summary>
         public string DepotCode { get; set; }
        public string DepotCode { get; set; }
        /// <summary>
        /// 物料分类编号 
        ///</summary>
         public string Ppbom00019124 { get; set; }
        public string Ppbom00019124 { get; set; }
        /// <summary>
        /// 物料分组 
        ///</summary>
         public string Remarks { get; set; }
        public string Remarks { get; set; }
        /// <summary>
        /// 采购员 
        ///</summary>
         public string Fpurchaserid { get; set; }
        public string Fpurchaserid { get; set; }
        /// <summary>
        /// 禁用状态 
        ///</summary>
         public string Fforbidstatus { get; set; }
        public string Fforbidstatus { get; set; }
        /// <summary>
        /// 物料分组 
        ///</summary>
         public string Fmaterialgroup { get; set; }
        public string Fmaterialgroup { get; set; }
        /// <summary>
        /// 完工超收比例 
        ///</summary>
         public int? Ffinishreceiptoverrate { get; set; }
        public int? Ffinishreceiptoverrate { get; set; }
        /// <summary>
        /// 发料方式 
        ///</summary>
         public string Fissuetype { get; set; }
        public string Fissuetype { get; set; }
        /// <summary>
        /// 启用批号管理 
        ///</summary>
         public int? Fisbatchmanage { get; set; }
        public int? Fisbatchmanage { get; set; }
        /// <summary>
        /// 采购单位 
        ///</summary>
         public string Fpurchaseunitid { get; set; }
        public string Fpurchaseunitid { get; set; }
        /// <summary>
        /// 损耗率 
        ///</summary>
         public string LossPercent { get; set; }
        public string LossPercent { get; set; }
        /// <summary>
        /// 助记码 
        ///</summary>
         public string MnemonicCode { get; set; }
        public string MnemonicCode { get; set; }
        /// <summary>
        /// 保质期 
        ///</summary>
         public string ExpPeriod { get; set; }
        public string ExpPeriod { get; set; }
        /// <summary>
        /// 生产车间 
        ///</summary>
         public string ProductionWorkshop { get; set; }
        public string ProductionWorkshop { get; set; }
        /// <summary>
        /// 物料属性 
        ///</summary>
         public string MaterialProperti { get; set; }
        public string MaterialProperti { get; set; }
        /// <summary>
        /// 生产单位 
        ///</summary>
         public string ProduceUnit { get; set; }
        public string ProduceUnit { get; set; }
        /// <summary>
        /// 委外单位 
        ///</summary>
         public string SubconUnit { get; set; }
        public string SubconUnit { get; set; }
        /// <summary>
        /// 图片1 
        ///</summary>
         public string Bz06 { get; set; }
        public string Bz06 { get; set; }
        /// <summary>
        /// 图片2 
        ///</summary>
         public string Bz07 { get; set; }
        public string Bz07 { get; set; }
        /// <summary>
        /// 图片3 
        ///</summary>
         public string Bz08 { get; set; }
        public string Bz08 { get; set; }
        /// <summary>
        /// 图片4 
        ///</summary>
         public string Bz09 { get; set; }
        public string Bz09 { get; set; }
        /// <summary>
        /// 图片5 
        ///</summary>
         public string Bz10 { get; set; }
        public string Bz10 { get; set; }
        /// <summary>
        /// QC分组ID 
        ///</summary>
         public string QcTeamid { get; set; }
        public string QcTeamid { get; set; }
        /// <summary>
        /// 物料ID 
        ///</summary>
         public int? ItemId { get; set; }
        public int? ItemId { get; set; }
        /// <summary>
        /// 颜色 
        ///</summary>
         public string ColorName { get; set; }
        public string ColorName { get; set; }
        /// <summary>
        /// 创建组织 
        ///</summary>
         public string Fumbrella { get; set; }
        public string Fumbrella { get; set; }
        /// <summary>
        /// 使用组织 
        ///</summary>
         public string FSubsidiary { get; set; }
        public string FSubsidiary { get; set; }
    }
}

 DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem3.cs

@@ -10,42 +10,42 @@
        /// <summary>
        ///  
        ///</summary>
         public Guid? Guid { get; set; }
        public Guid? Guid { get; set; }
        /// <summary>
        ///  
        ///</summary>
         public string BILL_NO { get; set; }
        public string BILL_NO { get; set; }
        /// <summary>
        ///  
        ///</summary>
         public string ITEM_BARCODE { get; set; }
        public string ITEM_BARCODE { get; set; }
        /// <summary>
        ///  
        ///</summary>
         public string ITEM_NO { get; set; }
        public string ITEM_NO { get; set; }
        /// <summary>
        ///  
        ///</summary>
         public string LOT_DATE { get; set; }
        public string LOT_DATE { get; set; }
        /// <summary>
        ///  
        ///</summary>
         public long? OLDQTY { get; set; }
        public long? OLDQTY { get; set; }
        /// <summary>
        ///  
        ///</summary>
         public string ITEM_NAME { get; set; }
        public string ITEM_NAME { get; set; }
        /// <summary>
        ///  
        ///</summary>
         public string ITEM_MODEL { get; set; }
        public string ITEM_MODEL { get; set; }
        /// <summary>
        ///  
        ///</summary>
         public int? ICOUNT { get; set; }
        public int? ICOUNT { get; set; }
        /// <summary>
        ///  
        ///</summary>
         public bool? COME_FLG { get; set; }
        public bool? COME_FLG { get; set; }
    }
}

 DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs

@@ -8,7 +8,7 @@
{
    public partial class SelectShuoTuiSq : DevExpress.XtraEditors.XtraForm
    {
         

        private readonly string _webServiceName = "MesShouTuiManager/";
        private string cusId = "";
        private string inOrgId = "";
@@ -66,7 +66,7 @@
        /// </summary>
        public event EventHandler<UpdateParentEventArgs> UpdateParent;

      


        /// <summary>
        /// </summary>

 DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs

@@ -30,7 +30,7 @@
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                txt_barCode.Text = "";
                getModel(value, "", "","","");
                getModel(value, "", "", "", "");
            }, (value) =>
            {
                getPageList(this.pageBar1.CurrentPage);
@@ -39,14 +39,15 @@
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            txt_barCode.KeyDown += (s, e) =>
            {
                if (e.KeyCode == Keys.Enter) { getModel(lbGuid.Text.Trim(), "","","",""); };
                if (e.KeyCode == Keys.Enter) { getModel(lbGuid.Text.Trim(), "", "", "", ""); };
            };
            btnGood.Click += (s, e) =>
            {
                getModel(lbGuid.Text.Trim(), txt_remark.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, goodTag);
            };
            btnBad.Click += (s, e) => {
                getModel(lbGuid.Text.Trim(), txt_remark.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt,badTag);
            btnBad.Click += (s, e) =>
            {
                getModel(lbGuid.Text.Trim(), txt_remark.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, badTag);
            };
        }

@@ -99,7 +100,7 @@
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            if (xtraTabControl1.SelectedTabPageIndex == 1)
                getModel(lbGuid.Text.Trim(), "", "","","");
                getModel(lbGuid.Text.Trim(), "", "", "", "");
            else
            {
                //_filterList.Clear();
@@ -243,6 +244,6 @@
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
 

    }
}

 DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs

@@ -117,7 +117,7 @@
                    if (!string.IsNullOrEmpty(_msg))
                    {

                        Toast vm = new Toast( (goodTag== "√" ? 1:-1), _msg);
                        Toast vm = new Toast((goodTag == "√" ? 1 : -1), _msg);
                        vm.Show();
                    };
                }

 DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs

@@ -99,7 +99,7 @@
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_processNo, gridView1,"processNo");
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_processNo, gridView1, "processNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
@@ -160,7 +160,7 @@
        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_processNo, gridView1,"processNo");
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_processNo, gridView1, "processNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");

 DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs

@@ -1,16 +1,8 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.Work
{

 DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs

@@ -256,7 +256,8 @@
            }
            decimal num = 0;
            int num2 = 0;
            if (!int.TryParse(txt_fSumPeople.Text.Trim(), out num2)) {
            if (!int.TryParse(txt_fSumPeople.Text.Trim(), out num2))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowInformation("请输入正确的定员！");
                txt_fSumPeople.Focus(); return;
            }

 DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs

@@ -25,7 +25,7 @@
                {
                    list.Add(new
                    {
                        fSeq = ($"{(idx+1) * 10:D4}"),
                        fSeq = ($"{(idx + 1) * 10:D4}"),
                        processNo = dt.Rows[idx]["processNo"].ToString(),
                        processName = dt.Rows[idx]["processName"].ToString(),
                    });

 DevApp/Gs.DevApp/Entity/LoginInfoModel.cs

@@ -10,7 +10,7 @@
        public string LoginUserGuid { get; set; } = "";

        public string LoginTime { get; set; }
 

        //应用单件模式，保存用户登录状态
        public static LoginInfoModel CurrentUser
        {

 DevApp/Gs.DevApp/Entity/PageQueryModel.cs

@@ -5,7 +5,7 @@
    /// </summary>
    public class PageQueryModel
    {
        

        /// <summary>
        /// 
        /// </summary>
@@ -18,7 +18,7 @@
        /// <param name="_keyType">一个辅助用的关键字</param>
        public PageQueryModel(int _currentPage, int _everyPageSize,
            string _sortName = "create_date", string _sortOrder = "asc",
            string _keyWord = "", string _keyWhere = "",string _keyType="")
            string _keyWord = "", string _keyWhere = "", string _keyType = "")
        {
            currentPage = _currentPage;
            everyPageSize = _everyPageSize;

 DevApp/Gs.DevApp/Entity/XlsOutModel.cs

@@ -8,7 +8,7 @@
        /// <param name="_outWhere">条件</param>
        /// <param name="_outSortName">排序字段</param>
        /// <param name="_outSortOrder">排序</param>
        public XlsOutModel(string _outParameter= "", string _outWhere = "",
        public XlsOutModel(string _outParameter = "", string _outWhere = "",
            string _outSortName = "", string _outSortOrder = "")
        {
            outParameter = _outParameter;

 DevApp/Gs.DevApp/Program.cs

@@ -1,11 +1,10 @@
using System;
using CefSharp;
using CefSharp.WinForms;
using Gs.DevApp.DevFrm;
using System;
using System.Diagnostics;
using System.IO;
using System.Windows.Forms;
using CefSharp.WinForms;
using CefSharp;
using Gs.DevApp.DevFrm;
using DevExpress.XtraEditors;

namespace Gs.DevApp
{

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -1,4 +1,18 @@
using System;
using DevExpress.Utils;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Menu;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using DevExpress.XtraTab;
using DevExpress.XtraTreeList;
using Gs.DevApp.Entity;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
@@ -14,20 +28,6 @@
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.Utils;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Menu;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using DevExpress.XtraTab;
using DevExpress.XtraTreeList;
using Gs.DevApp.Entity;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using UserControls.Data;
using static System.Windows.Forms.Control;

@@ -1746,7 +1746,7 @@
                    column.OptionsColumn.ReadOnly = false;
                else
                    //column.OptionsColumn.ReadOnly = true;
                column.OptionsColumn.ReadOnly = isPostSearch;
                    column.OptionsColumn.ReadOnly = isPostSearch;

                if (isPostSearch == true)
                {
@@ -2065,7 +2065,8 @@
            }

        }
        public static void PrintAuto(DevExpress.XtraEditors.TextEdit txt_psnQty_1, DevExpress.XtraEditors.TextEdit txt_iCount_1, DevExpress.XtraEditors.RadioGroup radOut) {
        public static void PrintAuto(DevExpress.XtraEditors.TextEdit txt_psnQty_1, DevExpress.XtraEditors.TextEdit txt_iCount_1, DevExpress.XtraEditors.RadioGroup radOut)
        {
            txt_psnQty_1.Text = "";
            txt_iCount_1.Text = "";
            radOut.Properties.Items[0].Description = "全自动";

 DevApp/Gs.DevApp/UserControl/SelectCgMx.cs

@@ -1,16 +1,16 @@
using System;
using DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;

namespace Gs.DevApp.UserControl
{
    public partial class SelectCgMx : XtraForm
    {
        

        private readonly string _webServiceName = "MesInvItemArnManager/";
        private string suppId = "";
        private string receiveOrgId = "";
@@ -35,7 +35,7 @@
                DataTable dt = this.gcMain.DataSource as DataTable;//得到GridControl的数据源
                foreach (int idx in rows)
                {
                  string _guid= dt.Rows[idx]["guid"].ToString();
                    string _guid = dt.Rows[idx]["guid"].ToString();
                    list.Add(_guid);
                }
                UpdateParent?.Invoke(this,
@@ -65,7 +65,7 @@
                everyPageSize = 999999,
                sortName = "",
                keyWhere = "",
                inBusType = (radioGroup1.SelectedIndex+1),//1是采购，2是委外
                inBusType = (radioGroup1.SelectedIndex + 1),//1是采购，2是委外
                inSupId = this.suppId,
                inReceiveOrgId = this.receiveOrgId,
            };

 DevApp/Gs.DevApp/UserControl/SelectCk.cs

@@ -1,15 +1,9 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
@@ -52,7 +46,7 @@
        private void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            _sbSqlWhere += (" and org.fid='" + _strGuid+"'");
            _sbSqlWhere += (" and org.fid='" + _strGuid + "'");
            var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.depot_code", "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try

 DevApp/Gs.DevApp/UserControl/SelectCw.cs

@@ -1,17 +1,9 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using MES.Service.Modes;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;

namespace Gs.DevApp.UserControl
{

 DevApp/Gs.DevApp/UserControl/SelectFont.cs

@@ -1,14 +1,5 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Properties;
using Gs.DevApp.Properties;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
{

 DevApp/Gs.DevApp/UserControl/SelectHz.cs

@@ -1,15 +1,9 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl

 DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.cs

@@ -12,12 +12,12 @@
        private readonly string _webServiceName = "MesCgthSqManager/";
        private string suppId = "";
        private string receiveOrgId = "";
       /// <summary>
       /// 
       /// </summary>
       /// <param name="_suppId">供应商编号 </param>
       /// <param name="_receiveOrgId">组织编号</param>
       /// <param name="_isWw">2为委外，1为采购</param>
        /// <summary>
        /// 
        /// </summary>
        /// <param name="_suppId">供应商编号 </param>
        /// <param name="_receiveOrgId">组织编号</param>
        /// <param name="_isWw">2为委外，1为采购</param>
        public SelectMesCgthSq(string _suppId, string _receiveOrgId)
        {
            InitializeComponent();
@@ -73,7 +73,7 @@
                everyPageSize = 999999,
                sortName = "",
                keyWhere = "",
             //   inIsWw = this.isWw,
                //   inIsWw = this.isWw,
                inIsWw = (radioGroup1.SelectedIndex),//0是采购，1是委外
                inSupId = this.suppId,
                inReceiveOrgId = this.receiveOrgId,

 DevApp/Gs.DevApp/UserControl/SelectOrg.cs

@@ -1,5 +1,4 @@
using DevExpress.Utils.DirectXPaint;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;

 DevApp/Gs.DevApp/UserControl/ShowFile.cs

@@ -1,9 +1,7 @@
using CefSharp;
using CefSharp.WinForms;
using CefSharp.WinForms;
using System;
using System.Configuration;
using System.IO;
using System.Net;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl

 DevApp/Gs.DevApp/UserControl/ShowFilter.cs

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Text;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Views.Grid;
@@ -11,6 +6,11 @@
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Text;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
{

 DevApp/Gs.DevApp/UserControl/ShowLogcs.cs

@@ -3,10 +3,7 @@
using Newtonsoft.Json;
using System;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
@@ -34,7 +31,7 @@
        private void getPageList(int curPage, int pageSize)
        {
            var _sbSqlWhere = new StringBuilder();
            _sbSqlWhere.Append(" and ABT_GUID='"+this.guidKey + "'");
            _sbSqlWhere.Append(" and ABT_GUID='" + this.guidKey + "'");
            var pgq = new PageQueryModel(curPage, 999999, "OPERATION_TIME",
                "desc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);

 DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs

@@ -1,11 +1,10 @@
using System;
using System.ComponentModel;
using System.Data.SqlTypes;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors;
using DevExpress.XtraWizard;
using Gs.DevApp.DevFrm.Sys;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.ComponentModel;

namespace Gs.DevApp.UserControl
{
@@ -38,7 +37,7 @@
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    var frm = new EasyRptDesign(_rptGuid,_rptParameter);
                    var frm = new EasyRptDesign(_rptGuid, _rptParameter);
                    frm.Show();
                }
                else

 DevApp/Gs.DevApp/UserControl/ShowUp.cs

@@ -1,14 +1,5 @@
using DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using Gs.DevApp.ToolBox;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
{
@@ -37,7 +28,7 @@
        private void UcUpFile1_UpChanged(object sender, EventArgs e)
        {
            UpdateParent?.Invoke(this,
             new UpdateParentEventArgs { FilterList = null});
             new UpdateParentEventArgs { FilterList = null });
            Close();
        }
    }

 DevApp/Gs.DevApp/UserControl/Toast.cs

@@ -1,13 +1,5 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Properties;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp

 DevApp/Gs.DevApp/UserControl/UCUpFile.cs

@@ -1,16 +1,8 @@
using DevExpress.Utils.DirectXPaint;
using DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using Gs.DevApp.ToolBox;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Configuration;
using System.Data;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;


 DevApp/Gs.DevApp/UserControl/UCUpFileList.cs

@@ -3,14 +3,9 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Configuration;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl

 DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs

@@ -15,7 +15,7 @@
            btnReport.Click += BtnReport_ItemClick;
            btnDesign.Click += BtnDesign_ItemClick;

          

        }
        /// <summary>
        ///     关键字，一般是主键

 DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs

@@ -83,8 +83,8 @@
        /// </summary>
        private void getTree()
        {
            string _where = " and 1=1 and "+this.strWhere;
            var pgq = new PageQueryModel(1, 999999, "a.defect_name","asc","", _where);
            string _where = " and 1=1 and " + this.strWhere;
            var pgq = new PageQueryModel(1, 999999, "a.defect_name", "asc", "", _where);
            var json = JsonConvert.SerializeObject(pgq);
            try
            {

 DevApp/Gs.DevApp/UserControl/UcLookCk.cs

@@ -1,9 +1,9 @@
using System;
using System.Data;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Data;

namespace Gs.DevApp.UserControl
{
@@ -15,10 +15,10 @@
            lookSearchSupplier.Properties.NullText = "请选择";
            lookSearchSupplier.EditValueChanged +=
                LookSearchSupplier_EditValueChanged;
           

        }
          private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
        
        private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }

        /// <summary>
        ///     改变事件
        /// </summary>
@@ -42,7 +42,7 @@
            if (!string.IsNullOrEmpty(orgId))
                _keyWhere = " and a.FSubsidiary ='" + orgId + "'";
            var pgq = new PageQueryModel(1, 999999, "org.FNumber asc ,a.depot_code", "asc", "",
                " and is_ng='A'"+_keyWhere);
                " and is_ng='A'" + _keyWhere);
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
@@ -97,8 +97,8 @@
                lookSearchSupplier.EditValue = null;
                return;
            }
            if(!string.IsNullOrEmpty(Code))
            lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
            if (!string.IsNullOrEmpty(Code))
                lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
        }

        /// <summary>

 DevApp/Gs.DevApp/UserControl/UcLookCustomer.cs

@@ -1,16 +1,8 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
{
@@ -24,7 +16,7 @@
                LookSearchSupplier_EditValueChanged;
        }

          private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
        private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }

        /// <summary>
        ///     改变事件
@@ -37,7 +29,7 @@
            if (EditChanged != null) EditChanged(this, e);
        }

        public void getSuppler(string orgId,string _dftVale="")
        public void getSuppler(string orgId, string _dftVale = "")
        {
            lookSearchSupplier.EditValue = null;
            string _keyWhere = "";
@@ -55,7 +47,7 @@
                lookSearchSupplier.Properties.ValueMember = "id";
                lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
                if (!string.IsNullOrEmpty(_dftVale))
                SetIdOrCode(_dftVale);
                    SetIdOrCode(_dftVale);
            }
            catch (Exception ex)
            {

 DevApp/Gs.DevApp/UserControl/UcLookDaa.cs

@@ -1,16 +1,8 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
{
@@ -23,10 +15,10 @@
            lookSearchSupplier.Properties.NullText = "请选择";
            lookSearchSupplier.EditValueChanged +=
                LookSearchSupplier_EditValueChanged;
           // getSuppler();
            // getSuppler();
        }

          private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
        private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }

        /// <summary>
        ///     改变事件
@@ -42,7 +34,7 @@
        /// 读取工单
        /// </summary>
        /// <param name="orgId"></param>
        public void getSuppler(string orgId,string _dftVale = "")
        public void getSuppler(string orgId, string _dftVale = "")
        {
            lookSearchSupplier.EditValue = null;
            string _keyWhere = "";
@@ -119,7 +111,7 @@
            }
            lookSearchSupplier.EditValue = (((Code.ToString().Trim())));
        }
       

        /// <summary>
        /// 产品id
        /// </summary>
@@ -241,7 +233,8 @@
        /// <summary>
        /// 类型，多用于分类查询
        /// </summary>
        public string category{
        public string category
        {
            set;
            get;
        }

 DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs

@@ -1,10 +1,8 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Data;
using System.Windows;

namespace Gs.DevApp.UserControl
{
@@ -19,7 +17,7 @@
                LookSearchSupplier_EditValueChanged;
        }

          private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
        private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }

        /// <summary>
        ///     改变事件
@@ -94,8 +92,8 @@
                lookSearchSupplier.EditValue = null;
                return;
            }
            if(!string.IsNullOrEmpty(Code))
            lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
            if (!string.IsNullOrEmpty(Code))
                lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
        }



 DevApp/Gs.DevApp/UserControl/UcLookGx.cs

@@ -1,16 +1,8 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
{
@@ -26,7 +18,7 @@
        }


        private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
        private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }


        /// <summary>
@@ -107,6 +99,6 @@
            if (!string.IsNullOrEmpty(Code))
                lookSearchSupplier.EditValue = (((Code.ToString().Trim())));
        }
 

    }
}

 DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs

@@ -1,5 +1,4 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
@@ -23,7 +22,7 @@
            get;
            set;
        }
         public bool IsReadly { set; get; }
        public bool IsReadly { set; get; }

        public UcLookHuoZhu()
        {

 DevApp/Gs.DevApp/UserControl/UcLookItems.cs

@@ -1,16 +1,7 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
{
@@ -22,10 +13,10 @@
            lookSearchSupplier.Properties.NullText = "请选择";
            lookSearchSupplier.EditValueChanged +=
                LookSearchSupplier_EditValueChanged;
           // getSuppler("");
            // getSuppler("");

        }
          private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
        private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
        /// <summary>
        ///     改变事件
        /// </summary>
@@ -52,7 +43,7 @@
            var json = JsonConvert.SerializeObject(_obj);
            try
            {
                var strReturn =  UtilityHelper.HttpPost("",
                var strReturn = UtilityHelper.HttpPost("",
                    "MesItemsManager/GetListSelect", json);
                var rtn = UtilityHelper.ReturnToTablePage(strReturn);
                var dt = rtn.rtnData.list;
@@ -96,7 +87,8 @@
        public string GetModel()
        {
            var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
            if (row != null) {
            if (row != null)
            {
                string id = row["itemModel"].ToString();
                return id;
            }

 DevApp/Gs.DevApp/UserControl/UcLookOrg.cs

@@ -1,10 +1,7 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;


@@ -22,7 +19,7 @@
        }


          private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
        private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }

        /// <summary>
        ///     改变事件
@@ -88,7 +85,7 @@
                return;
            }
            //lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
            lookSearchSupplier.EditValue =(((Code.ToString().Trim())));
            lookSearchSupplier.EditValue = (((Code.ToString().Trim())));
        }



 DevApp/Gs.DevApp/UserControl/UcLookPrint.cs

@@ -1,16 +1,8 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
{
@@ -26,7 +18,7 @@
        }


          private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
        private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }

        /// <summary>
        ///     改变事件

 DevApp/Gs.DevApp/UserControl/UcLookSales.cs

@@ -1,16 +1,8 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
{
@@ -22,10 +14,10 @@
            lookSearchSupplier.Properties.NullText = "请选择";
            lookSearchSupplier.EditValueChanged +=
                LookSearchSupplier_EditValueChanged;
          //  getSuppler();
            //  getSuppler();
        }

          private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
        private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }

        /// <summary>
        ///     改变事件

 DevApp/Gs.DevApp/UserControl/UcLookStaff.cs

@@ -1,17 +1,8 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
{
@@ -26,7 +17,7 @@
            getSuppler();
        }

          private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
        private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }

        /// <summary>
        ///     改变事件

 DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs

@@ -1,13 +1,8 @@
using System;
using System.Data;
using System.Windows.Forms;
using System.Windows.Media.Animation;
using DevExpress.Emf;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using static DevExpress.XtraPrinting.Native.PageSizeInfo;
using System;
using System.Data;

namespace Gs.DevApp.UserControl
{
@@ -20,7 +15,7 @@
            lookSearchSupplier.EditValueChanged +=
                LookSearchSupplier_EditValueChanged;
        }
          private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
        private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }

        /// <summary>
        ///     改变事件

 DevApp/Gs.DevApp/UserControl/UcLookUnit.cs

@@ -1,16 +1,8 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
{
@@ -25,7 +17,7 @@
            getSuppler();
        }

          private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
        private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }

        /// <summary>
        ///     改变事件
@@ -85,7 +77,7 @@

        public void SetIdOrCode(string Code)
        {
            if (Code == "-1" || string.IsNullOrEmpty(Code) || Code.ToUpper()=="null".ToUpper())
            if (Code == "-1" || string.IsNullOrEmpty(Code) || Code.ToUpper() == "null".ToUpper())
            {
                lookSearchSupplier.EditValue = null;
                return;

 DevApp/Gs.DevApp/UserControl/UcLookUser.cs

@@ -1,5 +1,4 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
@@ -19,7 +18,7 @@
        }


          private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
        private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }

        /// <summary>
        ///     改变事件

 DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs

@@ -1,18 +1,8 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Data.SqlTypes;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
{
@@ -24,8 +14,8 @@
            lookSearchSupplier.Properties.NullText = "请选择";
            lookSearchSupplier.EditValueChanged += LookSearchSupplier_EditValueChanged;
        }
    
         private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }

        private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }

        /// <summary>
        ///     改变事件
@@ -46,7 +36,7 @@
            lookSearchSupplier.EditValue = null;
            string _sbSqlWhere = "";
            if (!string.IsNullOrEmpty(shopGuid))
               _sbSqlWhere = " and a.dpt_id="+ shopGuid;
                _sbSqlWhere = " and a.dpt_id=" + shopGuid;
            var pgq = new PageQueryModel(1, 999999, "org.FNumber asc ,c.departmentcode asc,a.line_no",
            "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);

 DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs

@@ -1,16 +1,8 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
{
@@ -22,11 +14,11 @@
            lookSearchSupplier.Properties.NullText = "请选择";
            lookSearchSupplier.EditValueChanged +=
                LookSearchSupplier_EditValueChanged;
          //  getSuppler();
            //  getSuppler();
        }

          private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
       
        private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }

        /// <summary>
        ///     改变事件
        /// </summary>
@@ -42,7 +34,7 @@
        /// 读取车间
        /// </summary>
        /// <param name="orgId"></param>
        public void getSuppler(string orgId="", string _dftVale = "")
        public void getSuppler(string orgId = "", string _dftVale = "")
        {
            lookSearchSupplier.EditValue = null;
            var pgq = new PageQueryModel(1, 999999, "a.departmentid", "asc", "", " and 1=1 and a.FSubsidiary=" + orgId);

 DevApp/Gs.DevApp/UserControl/UcLookWwgd.cs

@@ -1,16 +1,8 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
{
@@ -25,7 +17,7 @@
            getSuppler();
        }

          private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
        private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }

        /// <summary>
        ///     改变事件

 DevApp/Gs.DevApp/UserControl/UcPageBar.cs

@@ -1,5 +1,4 @@
using DevExpress.XtraLayout.Utils;
using Gs.DevApp.ToolBox;
using System;
using System.Windows.Forms;


 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs

@@ -1,13 +1,4 @@
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.IO;
using System.Linq;
using System.Net;
using System.Text;
using System.Windows.Forms;
using DevExpress.XtraBars;
using DevExpress.XtraBars;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Views.Grid;
@@ -18,6 +9,15 @@
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.IO;
using System.Linq;
using System.Net;
using System.Text;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
{
@@ -65,7 +65,7 @@
            actions = lst;
        }

     



        /// <summary>
@@ -1228,7 +1228,7 @@
                            {
                                spt.RestoreLayoutFromStream(stream);
                            }
                           // spt.Horizontal = false;
                            // spt.Horizontal = false;
                            spt.Panel1.AutoScroll = false;
                            spt.Panel2.AutoScroll = false;
                            //spt.Panel1.MaximumSize = new System.Drawing.Size(spt.Panel1.Width, 100);

 DevApp/Gs.DevApp/UserControl/showLayOut.cs

@@ -1,10 +1,6 @@
using DevExpress.Utils.DirectXPaint;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.TextEditController;
using DevExpress.XtraGrid.Columns;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraLayout;
using Gs.DevApp.DevFrm.QC.Models;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
@@ -65,7 +61,7 @@
                    }
                }
                xmlList.Add(
                       new { idType = "gridview", idName = gridView1.Name, idXml = sb.ToString(), splitterPosition="" }
                       new { idType = "gridview", idName = gridView1.Name, idXml = sb.ToString(), splitterPosition = "" }
                 );
            }
            foreach (LayoutControl lay1 in layList)
@@ -84,7 +80,7 @@
                    }
                }
                xmlList.Add(
                       new { idType = "layoutcontrol ", idName = lay1.Name, idXml = sb.ToString(), splitterPosition="" }
                       new { idType = "layoutcontrol ", idName = lay1.Name, idXml = sb.ToString(), splitterPosition = "" }
                 );
            }
            foreach (SplitContainerControl splt in spcList)
@@ -103,7 +99,7 @@
                    }
                }
                xmlList.Add(
                       new { idType = "splitcontainercontrol ", idName = splt.Name, idXml = sb.ToString(), splitterPosition= splt.SplitterPosition }
                       new { idType = "splitcontainercontrol ", idName = splt.Name, idXml = sb.ToString(), splitterPosition = splt.SplitterPosition }
                 );
            }
            var _obj = new

 DevApp/Gs.DevApp/UserControl/showZhongTai.cs

@@ -1,14 +1,5 @@
using DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using Gs.DevApp.ToolBox;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
{
@@ -19,7 +10,7 @@
            InitializeComponent();
            btnSave.Click += (s, e) =>
            {
                if (comZt.SelectedIndex<= 0)
                if (comZt.SelectedIndex <= 0)
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择状态！");
                    return;

 DevApp/Gs.DevApp/XtraForm1.cs

@@ -1,20 +1,5 @@
using DevExpress.Internal.WinApi;
using DevExpress.Utils;
using DevExpress.XtraBars.ToastNotifications;
using DevExpress.XtraEditors;
using DevExpress.XtraTreeList;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using DevExpress.Utils;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp
{
@@ -23,7 +8,7 @@
        public XtraForm1()
        {
            InitializeComponent();
        

        }

        private void simpleButton1_Click(object sender, EventArgs e)
@@ -42,7 +27,7 @@
            aa.ToolTipType = ToolTipType.Standard;//标准样式，可显示鸟嘴。 
            aa.IconType = ToolTipIconType.Information; //消息图标 
            aa.IconSize = ToolTipIconSize.Small; //大图标 
            

        }
    }
}