TigerClouds-Tech/Server/TigerApi6_2024.git

			@@ -96,7 +96,7 @@
			action.Data.ShortMsg = new("请扫描产品", ShortMessage.Types.Error);
			action.Data.OperInfo = new();
			action.IsSuccessed = false;
			action.LocaleMsg = new($"条码[{0}]是载具条码，请扫描载具中的产品条码继续包装操作");
			//action.LocaleMsg = new($"条码[{0}]是载具条码，请扫描载具中的产品条码继续包装操作");
			action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.OnlyMinPackage", input.SN);
			return action;
			}
			@@ -125,7 +125,13 @@
			}
			//条码过站
			action = NodeSubmit(action, input);
			if (!IsFinishAllSteps)
			if (!action.IsSuccessed && !CurWipSNs.Any())
			{
			var info = WoContext.GetSnOperInfo(input.SN).Data;
			info.InputQty = OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty;
			action.Data.OperInfo = info;
			}
			else if (!IsFinishAllSteps)
			{
			action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO]);
			}
			@@ -414,7 +420,9 @@
			CurWipSNHiss.Clear();
			foreach (var wipSN in wipSNs)
			{
			CurWipSNHiss.Add(new MES_WIP_HIS(wipSN, $"工单[{wipSN.WORK_ORDER}]条码[{wipSN.SN}]在岗位[{wipSN.POST_CODE}]过站工序[{wipSN.NODE_NAME}]成功"));
			var his = new MES_WIP_HIS(wipSN, $"工单[{wipSN.WORK_ORDER}]条码[{wipSN.SN}]在岗位[{wipSN.POST_CODE}]过站工序[{wipSN.NODE_NAME}]成功");
			wipSN.History.Add(his);
			CurWipSNHiss.Add(his);
			}

			//创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
			@@ -427,11 +435,12 @@

			//初始化工步列表
			Steps.Clear();
			var curStep = new Biz.WorkStep(IWorkStep.Types.Node, this)
			var curStep = new Biz.WorkStep(IWorkStep.NodeTypes.Node, this)
			{
			Sequence = Steps.Count + 1,
			Node = curNode,
			DBSubmitAction = () =>
			OperSetting = CurBatch.NodeSets.FirstOrDefault(q => q.NODE_ID == curNode.ID),
			DBSubmitAction = () =>
			{
			//使用统一的事务DB对象
			var db = GetCommitDB();
			@@ -480,7 +489,7 @@
			}
			else if (!IsFinishNodeSteps)
			{
			var curStep = Steps.Where(q => q.Type == IWorkStep.Types.Node && !q.IsFinished).OrderBy(q => q.Sequence).First();
			var curStep = Steps.Where(q => q.NodeType == IWorkStep.NodeTypes.Node && !q.IsFinished).OrderBy(q => q.Sequence).First();

			//完成当前工序节点工步
			curStep.IsFinished = true;
			@@ -493,7 +502,7 @@
			//未完成所有工序节点工步
			if (!IsFinishNodeSteps)
			{
			var next = Steps.Where(q => q.Type == IWorkStep.Types.Node && !q.IsFinished).OrderBy(q => q.Sequence).First();
			var next = Steps.Where(q => q.NodeType == IWorkStep.NodeTypes.Node && !q.IsFinished).OrderBy(q => q.Sequence).First();
			//设置后续可执行的工步列表
			NextSteps.Clear();
			NextSteps.Add(next);