~tjx/GsMesClient.git

			@@ -17,6 +17,7 @@
			{
			string _webServiceName = "WompbaManager/";
			List<FilterEntity> _filterList = new List<FilterEntity>();
			string _cjBm = "";//车间
			public Frm_Wompba()
			{
			InitializeComponent();
			@@ -29,24 +30,30 @@
			this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
			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, "fstatus", "", (value) =>
			{
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
			});
			}, tips);
			Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
			{
			getModel(value);
			}, (value) =>
			{
			getPageList(this.pageBar1.CurrentPage);
			});
			}, lbGuid);
			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,8 +89,12 @@
			}
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = _oldTable;
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			gcMx1.ForceInitialize();
			gvMx1.BestFitColumns();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
			}
			catch (Exception ex)
			{
			@@ -95,7 +106,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);
			}
			@@ -116,10 +127,14 @@
			/// <param name="e"></param>
			private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
			{
			Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
			gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			gridView1.ActiveFilter.Clear();
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
			frm.UpdateParent += Frm_UpdateParent;
			frm.ShowDialog();
			}

			/// <summary>
			/// 查询回调
			/// </summary>
			@@ -127,32 +142,8 @@
			/// <param name="e"></param>
			private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
			{
			gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			gridView1.ActiveFilter.Clear();
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			var frm = new ShowFilter(gridView1.Columns, _filterList);
			frm.UpdateParent += Frm_UpdateParent;
			frm.ShowDialog();
			}
			/// <summary>
			/// 审核事件
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
			{
			_toolCk(1, "EditModelSubmit");
			}

			/// <summary>
			/// 反审核
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			/// <exception cref="NotImplementedException"></exception>
			private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
			{
			_toolCk(0, "EditModelSubmitFSH");
			_filterList = e.FilterList;
			getPageList(1);
			}

			/// <summary>
			@@ -208,7 +199,6 @@
			MsgHelper.Warning("提示：" + ex.Message);
			}
			}

			/// <summary>
			/// 刷新事件
			/// </summary>
			@@ -232,17 +222,40 @@
			}
			}
			/// <summary>
			/// 审核事件
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
			{
			_toolCk(1, "EditModelSubmit");
			}

			/// <summary>
			/// 反审核
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			/// <exception cref="NotImplementedException"></exception>
			private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
			{
			_toolCk(0, "EditModelSubmitFSH");
			}


			/// <summary>
			/// 修改事件
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
			{
			string rowGuid = "", rowName = "";
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_hNo, gridView1);
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
			lbGuid, txt_hNo, gridView1);
			if (string.IsNullOrEmpty(rowGuid))
			{
			ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
			MsgHelper.Warning("请先选择你要操作的行！");
			return;
			}
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
			@@ -254,7 +267,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>
			@@ -268,9 +281,8 @@
			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>
			/// 保存事件
			@@ -295,10 +307,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++)
			@@ -307,16 +320,15 @@
			if (row != null)
			{
			Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
			//string _LineId = row["daa015"].ToString();
			//if (string.IsNullOrEmpty(_LineId))
			//{
			// MsgHelper.ShowError("产线编码不能为空！");
			// return;
			//}
			string _Pcsl = row["daa008"].ToString();
			if (string.IsNullOrEmpty(_Pcsl))
			string _LineId = row["daa015"].ToString();
			if (string.IsNullOrEmpty(_LineId))
			{
			MsgHelper.ShowError("排产数量不能为空！");
			MsgHelper.ShowError("线别不能为空！");
			return;
			}
			if (Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(row["daa008"].ToString()) <= 0)
			{
			MsgHelper.ShowError("请输入正确的排产数量！");
			return;
			}
			string _Yjkgsj = row["mesStartProd"].ToString();
			@@ -377,11 +389,14 @@
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			if (_rtn.rtnCode > 0)
			{
			lbGuid.Text = _rtn.rtnData;
			lbGuid.Text = _rtn.rtnData.outGuid;
			txt_hNo.Text = _rtn.rtnData.outNo;
			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)
			@@ -408,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;//当前页
			@@ -437,15 +452,11 @@
			private void getModel(string strGuid)
			{
			bool isEdit = false;
			if (toolBarMenu1.currentAction == "add")
			{
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			return;
			};
			if (toolBarMenu1.currentAction == "add") return;
			if (toolBarMenu1.currentAction == "edit") isEdit = true;
			if (string.IsNullOrEmpty(strGuid))
			{
			ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
			MsgHelper.Warning("请先选择你要操作的行！");
			return;
			}
			var _obj = new
			@@ -459,10 +470,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"])
			@@ -476,6 +489,7 @@
			gcMx1.DataSource = dt;
			gcMx1.ForceInitialize();
			gvMx1.BestFitColumns();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
			}
			else
			{
			@@ -539,7 +553,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
			@@ -568,6 +582,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);
			@@ -607,24 +622,24 @@
			};
			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)
			if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
			{
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			{
			getModel(lbGuid.Text.Trim());
			else
			getPageList(this.pageBar1.CurrentPage);
			}
			int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
			gridView1.FocusedRowHandle = rowHandle;
			UtilityHelper.SetCheckIco(gridView1, "fstatus", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
			}
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}

			}
			}
			}