~tjx/GsMesClient.git

			@@ -1,4 +1,5 @@
			using DevExpress.Pdf.Native.BouncyCastle.Utilities.Collections;
			using DevExpress.XtraLayout.Customization;
			using DevExpress.XtraRichEdit.API.Native;
			using Gs.DevApp.DevFrm.QC;
			using Gs.DevApp.Entity;
			@@ -25,10 +26,20 @@
			/// <summary>
			/// 定时刷新
			/// </summary>
			System.Timers.Timer timer = new System.Timers.Timer(1000);
			System.Timers.Timer timer;

			public Frm_MesQaItemsDetect01()
			{
			InitializeComponent();

			#region 设置时间
			int int32 = 3000;
			string _vanishingSeconds = ConfigurationManager.AppSettings["IqcGetWeight"];
			if (!string.IsNullOrEmpty(_vanishingSeconds))
			int32 = int.Parse(_vanishingSeconds);
			timer = new System.Timers.Timer(int32);
			#endregion

			this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
			this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
			this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
			@@ -61,6 +72,7 @@
			gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
			btnIpt.Click += BtnIpt_Click;
			btnYcReport.Click += BtnYcReport_Click;
			#region 五次重量
			//关闭时释放timer
			this.Disposed += (s, e) =>
			{
			@@ -91,7 +103,7 @@
			}
			catch (Exception ex)
			{

			Gs.DevApp.ToolBox.LogHelper.Debug(this.ToString(), "WorkWeight/GetIqcWeight:" + ex.Message);
			}
			};
			timer.AutoReset = true; // 设置为true表示重复执行，false表示执行一次后停止
			@@ -143,9 +155,13 @@
			//清空
			this.btnClean.Click += (s, e) =>
			{
			_setWeigth(1, "");
			this.txtW1.Text = this.txtW2.Text = this.txtW3.Text = this.txtW4.Text = this.txtW5.Text = "";
			if (!MsgHelper.AskQuestion("你选择了【" + txt_releaseNo.Text.Trim() + "】，确定清除所有称重数据吗？"))
			return;
			_setWeigth(99, "");

			};
			#endregion

			}
			/// <summary>
			/// 提交称重
			@@ -162,7 +178,7 @@
			};
			try
			{
			var strReturn = UtilityHelper.HttpPost("", "WorkWeight/EditIqc", JsonConvert.SerializeObject(_obj), false);
			var strReturn = UtilityHelper.HttpPost("", "WorkWeight/EditIqcWeight", JsonConvert.SerializeObject(_obj), false);
			var dd = UtilityHelper.ReturnToDynamic(strReturn);
			if (dd.rtnCode <= 0)
			{
			@@ -193,6 +209,11 @@
			if (_weightType == 5)
			{
			txtW5.Text = _weight;
			return;
			}
			if (_weightType == 99)
			{
			this.txtW1.Text = this.txtW2.Text = this.txtW3.Text = this.txtW4.Text = this.txtW5.Text = "";
			return;
			}
			}
			@@ -250,7 +271,7 @@
			string strGuid = lbGuid.Text.Trim();
			if (string.IsNullOrEmpty(strGuid))
			{
			ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
			ToolBox.MsgHelper.ShowError("请先选择你要操作的行！");
			return;
			}
			var _obj = new
			@@ -272,7 +293,7 @@
			}
			catch (Exception ex)
			{
			ToolBox.MsgHelper.Warning("提示：" + ex.Message);
			ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
			}
			}
			/// <summary>
			@@ -285,7 +306,7 @@
			int intHandle = this.gvMx1.FocusedRowHandle;
			if (intHandle < 0)
			{
			ToolBox.MsgHelper.Warning("提示：请选择检验项目！");
			ToolBox.MsgHelper.ShowError("提示：请选择检验项目！");
			return;
			}
			if (e.KeyCode == Keys.Enter)
			@@ -334,7 +355,7 @@
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			MsgHelper.ShowError("提示：" + ex.Message);
			}
			}
			}
			@@ -497,7 +518,7 @@
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
			if (string.IsNullOrEmpty(rowGuid))
			{
			ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
			ToolBox.MsgHelper.ShowError("请先选择你要操作的行！");
			return;
			}
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
			@@ -525,7 +546,7 @@
			toolBarMenu1.isSetBtn = false;
			if (txt_fcheckResu.Text.Trim() == _strTag && string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("当检验结果不合格时，请填写备注说明！");
			Gs.DevApp.ToolBox.MsgHelper.ShowError("当检验结果不合格时，请填写备注说明！");
			txt_fngDesc.Focus();
			return;
			}
			@@ -597,7 +618,7 @@
			}
			catch (Exception ex)
			{
			ToolBox.MsgHelper.Warning("提示：" + ex.Message);
			ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
			}

			}
			@@ -613,7 +634,7 @@
			if (toolBarMenu1.currentAction == "edit") isEdit = true;
			if (string.IsNullOrEmpty(strGuid))
			{
			ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
			ToolBox.MsgHelper.ShowError("请先选择你要操作的行！");
			return;
			}
			var _obj = new
			@@ -665,11 +686,11 @@
			}
			}
			else
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
			}
			catch (Exception ex)
			{
			ToolBox.MsgHelper.Warning("提示：" + ex.Message);
			ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
			}

			}
			@@ -725,7 +746,7 @@
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			MsgHelper.ShowError("提示：" + ex.Message);
			}
			}
			/// <summary>