~tjx/GsMesClient.git

			@@ -20,6 +20,9 @@
			public Frm_Womdaa()
			{
			InitializeComponent();
			this.splitMx99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
			this.splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
			this.splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
			this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
			// this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
			this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
			@@ -31,6 +34,7 @@
			this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
			toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
			this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick;
			this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
			this.toolBarMenu1.getXmlConfig();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
			@@ -60,7 +64,7 @@
			};
			txt_psnQty_1.TextChanged += (s, e) =>
			{
			Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut,txt_yuliang_1);
			Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
			};
			radOut.SelectedIndexChanged += (s, e) =>
			{
			@@ -75,7 +79,7 @@
			{
			_print98();
			};
			//这是后盖码，仅仅打印，
			//这是后盖码
			this.ucBtnPrint100.btnDesignClick += (s, e) =>
			{
			ucBtnPrint100.rptParameter = "rpt_hgm{}";
			@@ -83,6 +87,72 @@
			this.ucBtnPrint100.btnReportClick += (s, e) =>
			{
			_print100();
			};
			//这是齐套标识卡，仅仅打印
			this.ucBtnPrint101.btnDesignClick += (s, e) =>
			{
			ucBtnPrint101.rptParameter = "rpt_qitao{}";
			};
			this.ucBtnPrint101.btnReportClick += (s, e) =>
			{
			_print101();
			};
			//导入模板
			this.btnIn.Click += (s, e) =>
			{
			//这是一个随机值，将会被当作父亲guid存到file表中，服务端根据这个guid读取相应的文件
			string upGuid = Guid.NewGuid().ToString();
			string strService = "XlsInDaaHgm";
			Gs.DevApp.UserControl.ShowUp frm = new Gs.DevApp.UserControl.ShowUp(upGuid);
			frm.UpdateParent += (ss, ee) =>
			{
			var _obj = new
			{
			tmpGuid = upGuid,
			strType = "",
			};
			try
			{
			string strJson = UtilityHelper.HttpPost("",
			"XlsInOut/" + strService,
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			};
			frm.ShowDialog();
			};
			//批量删除条码
			this.btnDeleteBar.Click += (s, e) =>
			{
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
			lbGuid, txt_daa001, gridView1, "daa001");
			if (string.IsNullOrEmpty(rowGuid))
			{
			MsgHelper.Warning("请先选择你要操作的数据！");
			return;
			}
			SelectDeleteBar frm = new SelectDeleteBar(rowGuid,"后盖码");
			//赋值给明细表
			frm.UpdateParent += (ss, ee) =>
			{
			try
			{
			string strMsg = ee.StringSingle;
			if(strMsg=="1")
			getModel(rowGuid);
			}
			catch (Exception ex)
			{
			MessageBox.Show(ex.Message);
			}
			};
			frm.ShowDialog();
			};
			}

			@@ -127,6 +197,49 @@
			getPageList(1);
			}

			/// <summary>
			/// 删除工单
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			/// <exception cref="NotImplementedException"></exception>
			private void ToolBarMenu1_btnDelClick(object sender, EventArgs e)
			{
			string rowGuid = "", rowName = "";
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daa001, gridView1, "daa001");
			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>
			@@ -177,7 +290,7 @@
			MsgHelper.Warning("提示：" + ex.Message);
			}
			}


			private void ToolBarMenu1_btnTzblClick(object sender, EventArgs e)
			{
			_toolCk(7);
			@@ -190,6 +303,11 @@
			{
			_toolCk(9);
			}
			/// <summary>
			/// 工单状态，根据分号把中文去了
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void ToolBarMenu1_btnZhongTaiClick(object sender, EventArgs e)
			{
			var frm = new showZhongTai();
			@@ -199,14 +317,6 @@
			_toolCk(_zt);
			};
			frm.ShowDialog();
			}
			private void ToolBarMenu1_btnJieAnClick(object sender, EventArgs e)
			{
			_toolCk(7);
			}
			private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
			{
			_toolCk(8);
			}
			/// <summary>
			/// 日志
			@@ -400,6 +510,11 @@
			txt_zQty98.Text = dy.daa008;
			txt_yQty98.Text = dy.yQty98;
			txt_kQty98.Text = dy.kQty98;
			//后盖码
			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);
			@@ -478,7 +593,33 @@
			{
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx4, gvMx4);
			}
			txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text="";
			//加上打印权限
			JArray array5 = new JArray();
			foreach (var a in _job["rtnData"]["list5"])
			{
			if (a["blackName"].ToString() == "托板码打印")
			{
			splitMx99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both;
			continue;
			}
			if (a["blackName"].ToString() == "追溯码打印")
			{
			splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both;
			continue;
			}
			if (a["blackName"].ToString() == "后盖码打印")
			{
			splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both;
			continue;
			}
			if (a["blackName"].ToString() == "齐套标识卡打印")
			{
			xtraTabPage5.PageVisible = true;
			continue;
			}
			}

			txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = "";
			}
			else
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			@@ -498,9 +639,9 @@
			string strMsg = "";
			switch (_inFieldValue)
			{
			case 1:
			strMsg = "待开工";
			break;
			//case 1:
			// strMsg = "待开工";
			// break;
			case 2:
			strMsg = "工单暂停";
			break;
			@@ -513,15 +654,15 @@
			case 5:
			strMsg = "暂停备料";
			break;
			case 6:
			strMsg = "撤回备料";
			break;
			//case 6:
			// strMsg = "撤回备料";
			// break;
			case 7:
			strMsg = "通知备料";
			break;
			case 8:
			strMsg = "开工";
			break;
			//case 8:
			// strMsg = "开工";
			// break;
			case 9:
			strMsg = "手动完工";
			break;
			@@ -589,7 +730,7 @@
			this.ucBtnPrint1.rptParameter = "return false";
			return;
			}
			if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim()))
			if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请输入正确的条码数量！");
			txt_iCount_1.Focus();
			@@ -606,7 +747,7 @@
			this.ucBtnPrint1.rptParameter = "rpt_daa{"
			+ txt_printRemark.Text.Trim()
			+ "," + ""
			+ "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal( txt_yuliang_1.Text.Trim())
			+ "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
			+ "," + txt_iCount_1.Text.Trim()
			+ "," + txt_psnQty_1.Text.Trim()
			+ "}";
			@@ -644,7 +785,7 @@
			}

			/// <summary>
			/// 这是后盖码，仅仅打印，
			/// 这是后盖码
			/// </summary>
			private void _print100()
			{
			@@ -658,16 +799,56 @@
			this.ucBtnPrint100.rptParameter = "return false";
			return;
			}
			if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_100.Text.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请输入正确的条码数量！");
			txt_iCount_100.Focus();
			this.ucBtnPrint100.rptParameter = "return false";
			return;
			}
			this.ucBtnPrint100.rptParameter = "rpt_hgm{"
			+ "100"
			+ ""
			+ "," + ""
			+ "," + ""
			+ "," + txt_iCount_100.Text.Trim()
			+ "," + 1
			+ "}";
			}

			/// <summary>
			/// 这是齐套
			/// </summary>
			private void _print101()
			{
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
			lbGuid, txt_daa001, gridView1);
			ucBtnPrint101.guidKey = rowGuid;
			if (rowGuid.Length < 36)
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择你要打印的行！");
			this.ucBtnPrint101.rptParameter = "return false";
			return;
			}
			this.ucBtnPrint101.rptParameter = "rpt_qitao{"
			+ ""
			+ "," + ""
			+ "," + ""
			+ "," + ""
			+ "," + ""
			+ "}";
			}

			/// <summary>
			/// 重打
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{

			MsgHelper.ShowInformation("功能开发中！");
			return;
			var rowhandle = gvMx2.FocusedRowHandle;
			if (rowhandle < 0)
			return;