~tjx/GsMesClient.git

			@@ -1,3 +1,4 @@
			using DevExpress.Utils;
			using Gs.DevApp.DevFrm.Rpt;
			using Gs.DevApp.DevFrm.Sys;
			using Gs.DevApp.DevFrm.WOM;
			@@ -9,6 +10,7 @@
			using System;
			using System.Collections.Generic;
			using System.Data;
			using System.Drawing;
			using System.Threading.Tasks;
			using System.Windows.Forms;

			@@ -21,6 +23,8 @@
			public Frm_Womdaa()
			{
			InitializeComponent();
			//先隐藏4种打印
			// txt_mesStartProd.CustomFormat = "yyyy-MM-dd HH:mm";
			this.splitMx99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
			this.splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
			this.splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
			@@ -38,6 +42,9 @@
			this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
			this.toolBarMenu1.btnGxClick += ToolBarMenu1_btnGxClick;
			this.toolBarMenu1.getXmlConfig();
			gvMx1.Columns["barbl"].DisplayFormat.FormatType = FormatType.Numeric;
			gvMx1.Columns["barbl"].DisplayFormat.FormatString = "p0";
			Gs.DevApp.ToolBox.UtilityHelper.CustomProgressBarColumn(gvMx1, "barbl", 90, Brushes.OrangeRed, Brushes.DodgerBlue);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
			@@ -45,7 +52,6 @@
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx6);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx7);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx8);
			txt_daa015.getSuppler("");
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
			{
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
			@@ -508,12 +514,38 @@
			private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
			{
			toolBarMenu1.isSetBtn = false;
			DateTime _dtKg = txt_mesStartProd.DateTime;
			DateTime _dtWg = txt_mesEndProd.DateTime;
			if (string.IsNullOrEmpty(txt_mesStartProd.Text.Trim()))
			{
			ToolBox.MsgHelper.ShowError("提示：预计开工时间不能为空！");
			txt_mesStartProd.Focus();
			return;
			}
			if (string.IsNullOrEmpty(txt_mesEndProd.Text.Trim()))
			{
			ToolBox.MsgHelper.ShowError("提示：预计完工时间不能为空！");
			txt_mesEndProd.Focus();
			return;
			}
			if (_dtWg < _dtKg)
			{
			ToolBox.MsgHelper.ShowError("提示：完工时间不能小于开工时间！");
			return;
			}
			if (string.IsNullOrEmpty(txt_daa015.GetId()))
			{
			ToolBox.MsgHelper.ShowError("提示：线体不能为空！");
			return;
			}
			var _obj = new
			{
			guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
			sjxt = txt_daa015.GetId(), //线体
			sclx = txt_daa025.Text.Trim(),//生产类型
			bz = txt_daa009.Text.Trim()//备注
			bz = txt_daa009.Text.Trim(),//备注
			dtKg = _dtKg.ToString("yyyy-MM-dd HH:mm:ss"),
			dtWg = _dtWg.ToString("yyyy-MM-dd HH:mm:ss"),
			};
			try
			{
			@@ -526,12 +558,13 @@
			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);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
			//toolBarMenu1.currentAction = "";
			//txt_printRemark.Enabled = txt_psnQty_1.Enabled = txt_iCount_1.Enabled = true;
			//txt_printRemark.ReadOnly = txt_psnQty_1.ReadOnly = txt_iCount_1.ReadOnly = false;
			//toolBarMenu1.currentAction = "";
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
			toolBarMenu1.currentAction = "";
			}
			else
			ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
			@@ -549,7 +582,11 @@
			/// <param name="pageSize">每页几条</param>
			private void getPageList(int curPage)
			{
			gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			gcMain1.DataSource = null;
			System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
			_sbSqlWhere.Append(" and a.ERP_SCZZ in");
			_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
			_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
			PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "desc", "", _sbSqlWhere.ToString());
			string json = JsonConvert.SerializeObject(pgq);
			try
			@@ -610,6 +647,8 @@
			if (_rtn.rtnCode > 0)
			{
			dynamic dy = _rtn.rtnData;
			string lineId = dy.daa013;
			txt_daa015.getSuppler(txt_daa013.Text.Trim(), lineId);
			//托板码
			txt_zQty.Text = dy.daa008;
			txt_yQty.Text = dy.yQty;
			@@ -622,7 +661,6 @@
			txt_zQty100.Text = dy.daa008;
			txt_yQty100.Text = dy.yQty100;
			txt_kQty100.Text = dy.kQty100;

			lbGuid.Text = strGuid;
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			@@ -784,6 +822,7 @@
			txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = "";
			txt_iCount_98.Text = txt_kQty98.Text;//追溯码
			txt_iCount_100.Text = txt_kQty100.Text;//后盖码

			}
			else
			ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
			@@ -1007,5 +1046,26 @@
			+ "}";
			}
			#endregion

			/// <summary>
			/// 变更内包装数量
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void rptTuoBanNbz_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			var rowhandle = gvMx2.FocusedRowHandle;
			if (rowhandle < 0)
			return;
			if (e.Button.Index == 0)
			{
			var dr = gvMx2.GetDataRow(rowhandle);
			var mxGuid = dr["guid"].ToString();
			if (!MsgHelper.AskQuestion("你选择了1条数据，确定变更内包装数量吗？"))
			return;
			var frm = new Frm_WomdaaNbz(mxGuid);
			frm.ShowDialog();
			}
			}
			}
			}