~tjx/GsMesClient.git

			@@ -26,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;
			@@ -62,6 +72,7 @@
			gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
			btnIpt.Click += BtnIpt_Click;
			btnYcReport.Click += BtnYcReport_Click;
			#region 五次重量
			//关闭时释放timer
			this.Disposed += (s, e) =>
			{
			@@ -92,7 +103,7 @@
			}
			catch (Exception ex)
			{

			Gs.DevApp.ToolBox.LogHelper.Debug(this.ToString(), "WorkWeight/GetIqcWeight:" + ex.Message);
			}
			};
			timer.AutoReset = true; // 设置为true表示重复执行，false表示执行一次后停止
			@@ -113,27 +124,27 @@
			ToolBox.MsgHelper.ShowError("请检查称重设置！");
			return;
			}
			if (txtW1.Text.Trim().Length <= 0)
			if (txt_weight1.Text.Trim().Length <= 0)
			{
			_setWeigth(1, _strCurrent);
			return;
			}
			if (txtW2.Text.Trim().Length <= 0)
			if (txt_weight2.Text.Trim().Length <= 0)
			{
			_setWeigth(2, _strCurrent);
			return;
			}
			if (txtW3.Text.Trim().Length <= 0)
			if (txt_weight3.Text.Trim().Length <= 0)
			{
			_setWeigth(3, _strCurrent);
			return;
			}
			if (txtW4.Text.Trim().Length <= 0)
			if (txt_weight4.Text.Trim().Length <= 0)
			{
			_setWeigth(4, _strCurrent);
			return;
			}
			if (txtW5.Text.Trim().Length <= 0)
			if (txt_weight5.Text.Trim().Length <= 0)
			{
			_setWeigth(5, _strCurrent);
			return;
			@@ -149,6 +160,8 @@
			_setWeigth(99, "");

			};
			#endregion

			}
			/// <summary>
			/// 提交称重
			@@ -165,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)
			{
			@@ -175,32 +188,32 @@
			{
			if (_weightType == 1)
			{
			txtW1.Text = _weight;
			txt_weight1.Text = _weight;
			return;
			}
			if (_weightType == 2)
			{
			txtW2.Text = _weight;
			txt_weight2.Text = _weight;
			return;
			}
			if (_weightType == 3)
			{
			txtW3.Text = _weight;
			txt_weight3.Text = _weight;
			return;
			}
			if (_weightType == 4)
			{
			txtW4.Text = _weight;
			txt_weight4.Text = _weight;
			return;
			}
			if (_weightType == 5)
			{
			txtW5.Text = _weight;
			txt_weight5.Text = _weight;
			return;
			}
			if (_weightType == 99)
			{
			this.txtW1.Text = this.txtW2.Text = this.txtW3.Text = this.txtW4.Text = this.txtW5.Text = "";
			this.txt_weight1.Text = this.txt_weight2.Text = this.txt_weight3.Text = this.txt_weight4.Text = this.txt_weight5.Text = "";
			return;
			}
			}
			@@ -258,7 +271,7 @@
			string strGuid = lbGuid.Text.Trim();
			if (string.IsNullOrEmpty(strGuid))
			{
			ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
			ToolBox.MsgHelper.ShowError("请先选择你要操作的行！");
			return;
			}
			var _obj = new
			@@ -280,7 +293,7 @@
			}
			catch (Exception ex)
			{
			ToolBox.MsgHelper.Warning("提示：" + ex.Message);
			ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
			}
			}
			/// <summary>
			@@ -293,7 +306,7 @@
			int intHandle = this.gvMx1.FocusedRowHandle;
			if (intHandle < 0)
			{
			ToolBox.MsgHelper.Warning("提示：请选择检验项目！");
			ToolBox.MsgHelper.ShowError("提示：请选择检验项目！");
			return;
			}
			if (e.KeyCode == Keys.Enter)
			@@ -342,7 +355,7 @@
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			MsgHelper.ShowError("提示：" + ex.Message);
			}
			}
			}
			@@ -505,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);
			@@ -533,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;
			}
			@@ -541,12 +554,12 @@
			{
			guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
			fngDesc = txt_fngDesc.TextTxt.Trim(),
			iqcRemark= txt_iqcRemark.Text.Trim(),
			};
			try
			{
			string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
			ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);

			if (_rtn.rtnCode > 0)
			{
			ToolBox.MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
			@@ -573,7 +586,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.ReceiveOrgId in");
			_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
			_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
			PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
			string json = JsonConvert.SerializeObject(pgq);
			try
			@@ -605,7 +622,7 @@
			}
			catch (Exception ex)
			{
			ToolBox.MsgHelper.Warning("提示：" + ex.Message);
			ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
			}

			}
			@@ -621,7 +638,7 @@
			if (toolBarMenu1.currentAction == "edit") isEdit = true;
			if (string.IsNullOrEmpty(strGuid))
			{
			ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
			ToolBox.MsgHelper.ShowError("请先选择你要操作的行！");
			return;
			}
			var _obj = new
			@@ -673,11 +690,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);
			}

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