~tjx/GsMesClient.git

			@@ -22,11 +22,7 @@
			{
			InitializeComponent();
			this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
			this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
			this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
			this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
			this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
			this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
			this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			@@ -45,63 +41,6 @@
			});
			getPageList(1);
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			//选存组织（变明细中的物料和车间）
			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();
			_getListJybz(workGuid);
			};
			//选择需要的明细
			btnSelect.Click += (s, e) =>
			{
			if (string.IsNullOrEmpty(this.txt_pba013.GetId()))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择车间，才能选择任务单！");
			return;
			}
			var frm = new SelectWompba(this.txt_pba013.GetId());
			//赋值给明细表
			frm.UpdateParent += (ss, ee) =>
			{
			try
			{
			var lst = new List<string>();
			lst = ee.StringList;
			var _obj = lst;
			var strReturn = UtilityHelper.HttpPost("",
			"WompbaManager/SelectPbaToView",
			JsonConvert.SerializeObject(_obj));
			var dt = UtilityHelper.ReturnToList(strReturn);
			DataTable _newTable = dt.rtnData;
			DataTable _oldTable = (DataTable)gcMx1.DataSource;
			DataRow[] sourceRows = _newTable.Select();
			for (int i = 0; i < sourceRows.Length; i++)
			{
			_oldTable.ImportRow(sourceRows[i]);
			}
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = _oldTable;
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			gcMx1.ForceInitialize();
			gvMx1.BestFitColumns();
			}
			catch (Exception ex)
			{
			MessageBox.Show(ex.Message);
			}
			};
			frm.ShowDialog();
			};
			}
			private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			{
			@@ -144,60 +83,7 @@
			_filterList = e.FilterList;
			getPageList(1);
			}

			/// <summary>
			/// 取消事件
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
			{
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
			}

			/// <summary>
			/// 删除事件
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
			{
			string rowGuid = "", rowName = "";
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
			lbGuid, txt_hNo, gridView1, "hNo");
			if (string.IsNullOrEmpty(rowGuid))
			{
			MsgHelper.Warning("请先选择你要操作的行！");
			return;
			}
			if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
			return;
			var _obj = new
			{
			guid = rowGuid,
			mxGuid = Guid.Empty.ToString(),
			};
			try
			{
			var strJson = UtilityHelper.HttpPost("",
			_webServiceName + "DeleteModelOrMx",
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			if (_rtn.rtnCode > 0)
			{
			if (xtraTabControl1.SelectedTabPageIndex == 0)
			{ }
			else
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
			getPageList(this.pageBar1.CurrentPage);
			}
			MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			}

			/// <summary>
			/// 刷新事件
			/// </summary>
			@@ -241,34 +127,6 @@
			_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);
			if (string.IsNullOrEmpty(rowGuid))
			{
			MsgHelper.Warning("请先选择你要操作的行！");
			return;
			}
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			{
			getModel(rowGuid);
			}
			else
			{
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
			}
			}
			/// <summary>
			/// 新增事件
			/// </summary>
			@@ -283,127 +141,7 @@
			UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			}
			/// <summary>
			/// 保存事件
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
			{
			toolBarMenu1.isSetBtn = false;
			string workId = txt_pba013.GetId();
			if (string.IsNullOrEmpty(workId.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择车间！");
			txt_pba013.Focus();
			return;
			}
			var _obj = new
			{
			guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
			bz = txt_pba009.Text.Trim(),
			cjId = workId,
			list = new List<dynamic>(),
			};
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			if (gvMx1.DataRowCount <= 0)
			{
			MsgHelper.ShowError("明细不能为空，请选择明细！");
			return;
			}
			for (var i = 0; i < gvMx1.DataRowCount; i++)
			{
			var row = gvMx1.GetDataRow(i);
			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))
			{
			MsgHelper.ShowError("排产数量不能为空！");
			return;
			}
			string _Yjkgsj = row["mesStartProd"].ToString();
			if (string.IsNullOrEmpty(_Yjkgsj))
			{
			MsgHelper.ShowError("预计开工时间不能为空！");
			return;
			}
			//string _prepareTime = row["prepareTime"].ToString();
			//if (string.IsNullOrEmpty(_prepareTime))
			//{
			// MsgHelper.ShowError("预计备料时间不能为空！");
			// return;
			//}
			//string _planPersonnel = row["planPersonnel"].ToString();
			//if (string.IsNullOrEmpty(_planPersonnel))
			//{
			// MsgHelper.ShowError("计划人数！");
			// return;
			//}
			//string _changeLinetime = row["changeLinetime"].ToString();
			//if (string.IsNullOrEmpty(_changeLinetime))
			//{
			// MsgHelper.ShowError("换线时间不能为空！");
			// return;
			//}
			string _mesEndProd = row["mesEndProd"].ToString();
			if (string.IsNullOrEmpty(_mesEndProd))
			{
			MsgHelper.ShowError("预计完工时间不能为空！");
			return;
			}
			//string _restTime = row["restTime"].ToString();
			//if (string.IsNullOrEmpty(_prepareTime))
			//{
			// MsgHelper.ShowError("休息时间不能为空！");
			// return;
			//}
			_obj.list.Add(new
			{
			Guid = _guid,
			AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["caaGuid"].ToString()),
			LineId = row["daa015"].ToString(),//产线id
			Yjkgsj = (row["mesStartProd"].ToString()),//预计开工时间
			Jhrs = row["planPersonnel"].ToString(),//计划人数
			Hxsj = row["changeLinetime"].ToString(),//换线时间
			Bz = row["daa009"].ToString(),//备注
			Blsj = row["prepareTime"].ToString(),//预计备料时间
			Pcsl = row["daa008"].ToString(),//排产数量
			Yjwgsj = row["mesEndProd"].ToString()//预计完工时间
			});
			}
			}
			try
			{
			string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
			ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			if (_rtn.rtnCode > 0)
			{
			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.layoutMx1.Controls, false, gvList);
			toolBarMenu1.currentAction = "";
			}
			}
			catch (Exception ex)
			{
			ToolBox.MsgHelper.Warning("提示：" + ex.Message);
			}
			}


			/// <summary>
			///
			/// </summary>
			@@ -541,52 +279,7 @@
			}
			}
			}

			/// <summary>
			/// 根据车间读产线
			/// </summary>
			/// <param name="workGuid"></param>
			private void _getListJybz(string workGuid)
			{
			rptJYBZ.Items.Clear();
			if (string.IsNullOrEmpty(workGuid))
			return;
			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
			{
			var strReturn = UtilityHelper.HttpPost("", "MesWorkshopLineManager/GetListPage", json);
			var dd = UtilityHelper.ReturnToTablePage(strReturn);
			DataTable dt = dd.rtnData.list;
			foreach (DataRow dr in dt.Rows)
			{
			rptJYBZ.Items.Add((new CboItemEntity(dr["id"].ToString(), dr["name"].ToString())));
			}
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			}
			private void rptJYBZ_SelectedIndexChanged(object sender, EventArgs e)
			{
			ComboBoxEdit comboBox = sender as ComboBoxEdit;
			if (comboBox != null)
			{
			GridView myView = (gcMx1.MainView as GridView);
			int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
			CboItemEntity _itm = comboBox.EditValue as CboItemEntity;
			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);
			}
			}


			/// <summary>
			/// 工具条事件
			/// </summary>