~tjx/GsMesClient.git

			@@ -34,6 +34,8 @@
			toolBarMenu1.btnFPiZhunClick += ToolBarMenu1_btnFPiZhunClick;
			toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
			toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
			toolBarMenu1.btnPingZhiClick += ToolBarMenu1_btnPingZhiClick;
			toolBarMenu1.btnFPingZhiClick += ToolBarMenu1_btnFPingZhiClick;
			this.toolBarMenu1.getXmlConfig();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
			@@ -197,7 +199,7 @@
			Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
			};
			}


			private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			{
			_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			@@ -269,6 +271,24 @@
			private void ToolBarMenu1_btnFPiZhunClick(object sender, EventArgs e)
			{
			_toolCk(3);
			}
			/// <summary>
			/// 品质
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void ToolBarMenu1_btnFPingZhiClick(object sender, EventArgs e)
			{
			_toolCk(4);
			}
			/// <summary>
			/// 反品质
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void ToolBarMenu1_btnPingZhiClick(object sender, EventArgs e)
			{
			_toolCk(5);
			}
			/// <summary>
			/// 审核事件
			@@ -447,7 +467,13 @@
			}
			if ((txt_tbl005.Text.Trim()=="良品退料") && txt_chkOut.Checked)
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("良品退料不能自动生成补料单，请检查！");
			Gs.DevApp.ToolBox.MsgHelper.ShowError("良品退料不能自动生成补料单，\n只有作业不良类型才能生成补料单，\n 请检查！");
			txt_tbl005.Focus();
			return;
			}
			if ((txt_tbl005.Text.Trim() == "来料不良退料") && txt_chkOut.Checked)
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("来料不良退料不能自动生成补料单，\n只有作业不良类型才能生成补料单，\n 请检查！");
			txt_tbl005.Focus();
			return;
			}
			@@ -715,6 +741,12 @@
			case 3:
			strMsg = "反批准";
			break;
			case 4:
			strMsg = "品质审核";
			break;
			case 5:
			strMsg = "品质反审核";
			break;
			}
			;
			toolBarMenu1.guidKey = "";