~tjx/GsMesClient.git

			@@ -17,6 +17,7 @@
			{
			string _webServiceName = "WompbaManager/";
			List<FilterEntity> _filterList = new List<FilterEntity>();
			string _cjBm = "";//车间
			public Frm_Wompba()
			{
			InitializeComponent();
			@@ -29,8 +30,9 @@
			this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(this.GetType().FullName, gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(this.GetType().FullName, gridView1, picCheckBox, this, "fstatus", "", (value) =>
			this.toolBarMenu1.getXmlConfig();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fstatus", "", (value) =>
			{
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
			});
			@@ -43,10 +45,15 @@
			});
			getPageList(1);
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			this.txt_pba013.getSuppler("");
			txt_erpSczz.EditChanged += (s, e) => {
			txt_pba013.getSuppler(txt_erpSczz.GetId());
			//选存组织（变明细中的物料和车间）
			txt_erpSczz.EditChanged += (s, e) =>
			{
			string _orgId = txt_erpSczz.GetId();
			if (string.IsNullOrEmpty(_orgId))
			return;
			txt_pba013.getSuppler(_orgId, _cjBm);
			};
			// 选择车间（变明细中产线）
			txt_pba013.EditChanged += (s, e) =>
			{
			string workGuid = this.txt_pba013.GetId();
			@@ -82,6 +89,9 @@
			}
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = _oldTable;
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			gcMx1.ForceInitialize();
			gvMx1.BestFitColumns();
			}
			@@ -119,11 +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();

			}

			/// <summary>
			/// 查询回调
			/// </summary>
			@@ -231,7 +241,7 @@
			_toolCk(0, "EditModelSubmitFSH");
			}



			/// <summary>
			/// 修改事件
			/// </summary>
			@@ -256,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>
			@@ -270,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>
			@@ -296,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++)
			@@ -383,7 +394,8 @@
			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 = "";
			}
			}
			catch (Exception ex)
			@@ -410,16 +422,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;//当前页
			@@ -457,10 +469,12 @@
			if (_rtn.rtnCode > 0)
			{
			dynamic dy = _rtn.rtnData;
			_cjBm = dy.pba013;
			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();
			foreach (var a in _job["rtnData"]["list"])
			@@ -537,7 +551,7 @@
			rptJYBZ.Items.Clear();
			if (string.IsNullOrEmpty(workGuid))
			return;
			var _sbSqlWhere = " and 1=1 and dpt_id="+ workGuid;
			var _sbSqlWhere = " and 1=1 and dpt_id=" + workGuid;
			var pgq = new PageQueryModel(1, 999999, "a.line_no", "asc", "", _sbSqlWhere.ToString());
			var json = JsonConvert.SerializeObject(pgq);
			try
			@@ -566,6 +580,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);
			@@ -605,8 +620,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)