~tjx/GsMesClient.git

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

			@@ -21,6 +20,9 @@
			InitializeComponent();
			this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
			this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gridView1);
			Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
			@@ -35,7 +37,6 @@
			getPageList(this.pageBar1.CurrentPage);
			});
			getPageList(1);

			pageBar1.PagerEvent += PageBar1_PagerEvent;
			this.ucBtnPrint1.btnDesignClick += (s, e) =>
			{
			@@ -71,6 +72,8 @@
			+ "," + txt_iCount_1.Text.Trim()
			+ "," + txt_psnQty_1.Text.Trim()
			+ "}";
			txt_iCount_1.Text = "";
			txt_psnQty_1.Text = "";
			};
			gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
			}
			@@ -233,6 +236,7 @@
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = dt1;
			gcMx1.ForceInitialize();
			gvMx1.BestFitColumns();
			}
			else
			{
			@@ -249,6 +253,7 @@
			gcMx2.BindingContext = new BindingContext();
			gcMx2.DataSource = dt2;
			gcMx2.ForceInitialize();
			gvMx2.BestFitColumns();
			}
			else
			{