~tjx/GsMesClient.git

			@@ -21,7 +21,7 @@
			public Frm_MesQaItemsDetect01()
			{
			InitializeComponent();
			this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
			//this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
			this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
			this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
			this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
			@@ -30,11 +30,10 @@
			this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
			toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
			toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fsubmitTxt", "", (value) =>
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(this.GetType().FullName, gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(this.GetType().FullName,gvMx2);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(this.GetType().FullName, gvMx3);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(this.GetType().FullName,gridView1,picCheckBox, this, "fsubmitTxt", "", (value) =>
			{
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
			});
			@@ -55,7 +54,7 @@
			}
			private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			{
			_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
			Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			Task.Delay(100);
			getPageList(1);
			}
			@@ -282,14 +281,16 @@
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			MsgHelper.Warning("提示：" + _rtn.rtnData.outMsg);
			if (_rtn.rtnCode > 0)
			if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
			{
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			{
			// getModel(lbGuid.Text.Trim());
			getModel(lbGuid.Text.Trim());
			}
			else
			getPageList(this.pageBar1.CurrentPage);
			int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
			gridView1.FocusedRowHandle = rowHandle;
			int _inFieldValue = 1;
			UtilityHelper.SetCheckIco(gridView1, "fsubmitTxt", "", "iqcDate", picCheckBox, this, _inFieldValue.ToString());
			}
			}
			catch (Exception ex)
			@@ -335,9 +336,10 @@
			if (_rtn.rtnCode > 0)
			{
			if (xtraTabControl1.SelectedTabPageIndex == 0)
			getPageList(this.pageBar1.CurrentPage);
			{ }
			else
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
			getPageList(this.pageBar1.CurrentPage);
			}
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			}
			@@ -358,14 +360,15 @@
			getModel(lbGuid.Text.Trim());
			else
			{
			_filterList.Clear();
			if (gridView1.ActiveFilter.Count > 0)
			{
			gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			gridView1.ActiveFilter.Clear();
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			}
			getPageList(1);
			//_filterList.Clear();
			//if (gridView1.ActiveFilter.Count > 0)
			//{
			// gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			// gridView1.ActiveFilter.Clear();
			// gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			//}
			//getPageList(1);
			getPageList(this.pageBar1.CurrentPage);
			}
			}
			/// <summary>
			@@ -375,6 +378,7 @@
			/// <param name="e"></param>
			private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
			{
			toolBarMenu1.currentAction = "edit";
			string rowGuid = "", rowName = "";
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
			if (string.IsNullOrEmpty(rowGuid))
			@@ -383,7 +387,17 @@
			return;
			}
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
			UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			{
			getModel(rowGuid);
			}
			else
			{
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			gvList.Add(gvMx2);
			UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
			}
			}
			/// <summary>
			/// 新增事件
			@@ -468,6 +482,7 @@
			{
			gcMain.DataSource = dt;
			gcMain.ForceInitialize();
			gridView1.BestFitColumns();
			}
			else
			UtilityHelper.SetDefaultTable(gcMain, gridView1);
			@@ -524,6 +539,7 @@
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = dt;
			gcMx1.ForceInitialize();
			gvMx1.BestFitColumns();
			gvMx1.FocusedRowHandle = _currentHandle5;
			ucUpFile1.parentGuid = lbGuid.Text.Trim();
			var row = gvMx1.GetDataRow(_currentHandle5);
			@@ -586,6 +602,7 @@
			gcMx3.BindingContext = new BindingContext();
			gcMx3.DataSource = dt;
			gcMx3.ForceInitialize();
			gvMx3.BestFitColumns();
			}
			else
			{
			@@ -616,6 +633,7 @@
			gcMx2.BindingContext = new BindingContext();
			gcMx2.DataSource = dt;
			gcMx2.ForceInitialize();
			gvMx2.BestFitColumns();
			}
			catch (Exception ex)
			{