~tjx/GsMesClient.git

			@@ -726,7 +726,6 @@
			continue;
			}
			}

			//2025-7-20加上产线确认记录
			JArray array6 = new JArray();
			foreach (var a in _job["rtnData"]["list6"])
			@@ -783,6 +782,8 @@
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx8, gvMx8);
			}
			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);

			@@ -87,6 +87,9 @@
			};
			frm.ShowDialog();
			};

			this.ActiveControl = this.txt_barCode;
			txt_barCode.Focus();
			}

			/// <summary>
			@@ -280,6 +283,7 @@
			Toast vm = new Toast(-1, ex.Message);
			vm.Show();
			}
			txt_barCode.Text = "";
			}

			/// <summary>

			@@ -10,7 +10,6 @@
			using System.Threading.Tasks;
			using System.Windows.Forms;


			namespace Gs.DevApp.DevFrm.Work
			{
			public partial class Frm_WorkTechnique : DevExpress.XtraEditors.XtraForm
			@@ -42,7 +41,6 @@
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
			{

			});
			getPageList(1);
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			@@ -374,7 +372,6 @@
			return;
			}
			getModel(rowGuid);

			}

			/// <summary>
			@@ -465,7 +462,7 @@
			MsgHelper.ShowError("请先选择你要操作的行！");
			return;
			}
			if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？"))
			if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，该操作将会影响到【D:待开工】且【未通知备料】的工单，确定" + strMsg + "吗？"))
			return;
			var _obj = new
			{

	DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史