~tjx/GsMesClient.git

			@@ -30,11 +30,7 @@
			this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			toolBarMenu1.btnLayoutClick += ToolBarMenu1_btnLayoutClick;
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gridView1);
			gvList.Add(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
			this.toolBarMenu1.getXmlConfig();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fstatus", "", (value) =>
			{
			@@ -46,7 +42,7 @@
			}, (value) =>
			{
			getPageList(this.pageBar1.CurrentPage);
			});
			}, lbGuid);
			getPageList(1);
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			//选存组织（变明细中的物料和车间）
			@@ -93,6 +89,9 @@
			}
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = _oldTable;
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			gcMx1.ForceInitialize();
			gvMx1.BestFitColumns();
			}
			@@ -106,7 +105,7 @@
			}
			private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			{
			Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			_filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			Task.Delay(100);
			getPageList(1);
			}
			@@ -130,19 +129,11 @@
			gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			gridView1.ActiveFilter.Clear();
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			var frm = new ShowFilter(gridView1.Columns, _filterList);
			var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
			frm.UpdateParent += Frm_UpdateParent;
			frm.ShowDialog();
			}
			private void ToolBarMenu1_btnLayoutClick(object sender, EventArgs e)
			{
			string _formNamespace = this.GetType().FullName;
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gridView1);
			gvList.Add(gvMx1);
			Gs.DevApp.UserControl.showLayOut DevFrm = new showLayOut(_formNamespace, gvList);
			DevFrm.ShowDialog();
			}

			/// <summary>
			/// 查询回调
			/// </summary>
			@@ -275,7 +266,7 @@
			{
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
			}
			}
			/// <summary>
			@@ -289,7 +280,7 @@
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
			List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gridViews.Add(gvMx1);
			UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
			UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			}
			/// <summary>
			@@ -315,10 +306,11 @@
			list = new List<dynamic>(),
			};
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			if (gvMx1.DataRowCount <= 0)
			{
			MsgHelper.ShowError("明细不能为空，请选择你的收料明细！");
			MsgHelper.ShowError("明细不能为空，请选择明细！");
			return;
			}
			for (var i = 0; i < gvMx1.DataRowCount; i++)
			@@ -402,8 +394,9 @@
			toolBarMenu1.isSetBtn = true;
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
			toolBarMenu1.currentAction = "";
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
			}
			}
			catch (Exception ex)
			@@ -430,16 +423,16 @@
			if (dd.rtnCode > 0)
			{
			DataTable dt = dd.rtnData.list;
			gcMain.BindingContext = new BindingContext();
			gcMain1.BindingContext = new BindingContext();
			gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			if (dt.Rows.Count > 0)
			{
			gcMain.DataSource = dt;
			gcMain.ForceInitialize();
			gridView1.BestFitColumns();
			gcMain1.DataSource = dt;
			gcMain1.ForceInitialize();
			gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
			}
			else
			UtilityHelper.SetDefaultTable(gcMain, gridView1);
			UtilityHelper.SetDefaultTable(gcMain1, gridView1);
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			pageBar1.TotalPages = dd.rtnData.pages;//总页
			pageBar1.CurrentPage = curPage;//当前页
			@@ -481,7 +474,7 @@
			lbGuid.Text = strGuid;
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
			UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
			_cjBm = "";
			JObject _job = JObject.Parse(strJson);
			JArray array = new JArray();
			@@ -588,6 +581,7 @@
			string _val = _itm.Value.ToString();
			string _txt = _itm.Text.ToString();
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			gvMx1.SetRowCellValue(dataIndex, "daa015LineName", _txt);
			gvMx1.SetRowCellValue(dataIndex, "daa015", _val);
			@@ -627,7 +621,7 @@
			};
			try
			{
			var strJson = UtilityHelper.HttpPost("", _webServiceName + _mth,JsonConvert.SerializeObject(_obj));
			var strJson = UtilityHelper.HttpPost("", _webServiceName + _mth, JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
			if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)