TigerClouds-Tech/Server/TigerApi6_2024.git

			@@ -57,7 +57,7 @@
			info.InputQty = CurOperInfo(input.Locale).InputQty;
			action.Data.OperInfo = info;
			}
			else if (!IsFinishAllSteps)
			else if (Steps.Any() && !IsFinishAllSteps)
			{
			action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
			}
			@@ -65,27 +65,28 @@
			//当前岗位在当前工单不是首站，则查找条码已绑定的工单当作当前工单
			else
			{
			var wosns = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER))
			.ByAuth(input.AuthOption).Where((q, s) => s.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue())
			var wosns = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER && q.BATCH_NO == s.BATCH_NO))
			.ByAuth(input.AuthOption)//.Where((q, s) => s.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue())
			.Where((q, s) => s.SN == input.SN \|\| s.FLOW_SN == input.SN \|\| s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();

			//查找到条码已绑定的工单
			if (!wosns.IsNullOrEmpty())
			if (wosns.Any(q => q.SN.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue()))
			{
			if (wosns.First().Batch.ACT_LINE != CurLine.LINE_CODE)
			var curSNs = wosns.Where(q => q.SN.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue());
			if (curSNs.First().Batch.ACT_LINE != CurLine.LINE_CODE)
			{
			action.Data.ShortMsg = new("产线错误", ShortMessage.Types.Error);
			action.Data.OperInfo = new();
			action.IsSuccessed = false;
			//action.LocaleMsg = new($"条码[{0}]已在产线[{1}]投入生产，请在正确岗位扫描");
			action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotCorrectLine", input.SN, wosns.First().Batch.ACT_LINE);
			action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotCorrectLine", input.SN, curSNs.First().Batch.ACT_LINE);
			}
			else
			{
			if (CurBatch?.Batch?.ORDER_NO != wosns.First().Batch.ORDER_NO)
			if (CurBatch?.Batch?.ORDER_NO != curSNs.First().Batch.ORDER_NO)
			{
			//条码已绑定的工单不等于当前工单则重新选择工单
			var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = wosns.First().Batch.ORDER_NO });
			var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = curSNs.First().Batch.ORDER_NO }, curSNs.First().Batch.BATCH_NO);
			if (!result.IsSuccessed)
			{
			action.Data.ShortMsg = new("工单异常", ShortMessage.Types.Error);
			@@ -114,23 +115,36 @@
			//查找不到条码已绑定的工单
			else
			{
			//没有当前工单，则先选择工单后再扫描条码
			if (CurBatch.IsNullOrEmpty())
			var lastSn = wosns.OrderByDescending(q => q.SN.UPDATE_TIME).FirstOrDefault();
			if (!lastSn.IsNullOrEmpty())
			{
			action.Data.ShortMsg = new("未选择工单", ShortMessage.Types.Error);
			action.Data.ShortMsg = new($"产品{lastSn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>()}", ShortMessage.Types.Error);
			action.Data.OperInfo = new();
			action.IsSuccessed = false;
			//action.LocaleMsg = new($"未选择工单，请先选择要生产的工单");
			action.LocaleMsg = new("MES.Transaction.CollectNode.Submit.NotSelectOrderException");
			//action.LocaleMsg = new($"进站扫描错误，条码[{0}]{1}", input.SN);
			action.LocaleMsg = new("MES.Transaction.CollectNode.Submit.SnStatusError", input.SN, lastSn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>());
			}
			//有当前工单且不是投入，则提示条码未投入生产，请先去首站扫描
			else
			{
			action.Data.ShortMsg = new("未投入生产", ShortMessage.Types.Error);
			action.Data.OperInfo = new();
			action.IsSuccessed = false;
			//action.LocaleMsg = new($"条码[{input.SN}]尚未投入生产，请先去首站扫描", input.SN);
			action.LocaleMsg = new("MES.Transaction.CollectNode.Submit.NotInputException", input.SN);
			//没有当前工单，则先选择工单后再扫描条码
			if (CurBatch.IsNullOrEmpty())
			{
			action.Data.ShortMsg = new("未选择工单", ShortMessage.Types.Error);
			action.Data.OperInfo = new();
			action.IsSuccessed = false;
			//action.LocaleMsg = new($"未选择工单，请先选择要生产的工单");
			action.LocaleMsg = new("MES.Transaction.CollectNode.Submit.NotSelectOrderException");
			}
			//有当前工单且不是投入，则提示条码未投入生产，请先去首站扫描
			else
			{

			action.Data.ShortMsg = new("未投入生产", ShortMessage.Types.Error);
			action.Data.OperInfo = new();
			action.IsSuccessed = false;
			//action.LocaleMsg = new($"条码[{input.SN}]尚未投入生产，请先去首站扫描", input.SN);
			action.LocaleMsg = new("MES.Transaction.CollectNode.Submit.NotInputException", input.SN);
			}
			}
			}
			}
			@@ -410,7 +424,7 @@
			CurWipSNHiss.Clear();
			foreach (var wipSN in wipSNs)
			{
			var his = 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}]成功（TransId：{TransID}）");
			wipSN.History.Add(his);
			CurWipSNHiss.Add(his);
			}
			@@ -556,16 +570,70 @@
			/// <returns></returns>
			public ApiAction<SubmitOutput> DoIfFinishAllSteps(ApiAction<SubmitOutput> action, string locale)
			{
			var operInfo = SetOperNodeInfo(CurOperInfo(locale));
			Action endAction = null;

			//如果当前条码已经走到流程终点则记录条码完工
			if (operInfo.IsReachedEndNode)
			{
			//更新工单条码明细信息
			var woSNs = CurBatch.WoSNs.Where(q => CurWipSNs.Any(w => q.WIP_ID == w.ID)).ToList();
			foreach (var woSN in woSNs)
			{
			woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Finished.GetValue();
			}
			var curNode = CurBatch.Nodes.First(q => q.OPER_CODE == "EndNode");
			//条码完工
			foreach (var wipSN in CurWipSNs)
			{
			wipSN.STATUS = MES_WIP_DATA.STATUSs.Finished.GetValue();
			wipSN.NODE_ID = curNode.ID;
			wipSN.NODE_NAME = curNode.NODE_NAME;
			wipSN.OPER_CODE = curNode.OPER_CODE;
			wipSN.SEGMENT = curNode.SEGMENT;
			}

			var wipHiss = new List<MES_WIP_HIS>();
			foreach (var wipSN in CurWipSNs)
			{
			var his = new MES_WIP_HIS(wipSN, $"工单[{wipSN.WORK_ORDER}]条码[{wipSN.SN}]在岗位[{wipSN.POST_CODE}]过站工序[{wipSN.NODE_NAME}]成功（TransId：{TransID}）");
			wipSN.History.Add(his);
			wipHiss.Add(his);
			}

			//创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
			var _woSns = woSNs.Clone();
			var _wipSns = CurWipSNs.Clone();
			var _wipHiss = wipHiss.Clone();
			//保存数据
			endAction = () =>
			{
			//使用统一的事务DB对象
			var db = GetCommitDB();
			//数据保存逻辑
			db.Storageable(_woSns, UserCode).ExecuteCommand();
			db.Storageable(_wipSns, UserCode).ExecuteCommand();
			db.Storageable(_wipHiss, UserCode).ExecuteCommand();
			};
			}

			//保存数据库
			SaveStepsCommitActionToDB();
			SaveStepsCommitActionToDB(endAction);

			//保存成功，返回过站消息
			CurOperInfo(locale).InputQty += CurWipSNs.Count;
			action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(locale));
			action.Data.OperInfo = operInfo;
			action.Data.ShortMsg = new(CurWipSNs.Any(q => q.DFT_FLAG == "Y") ? "不良过站" : "良品过站", ShortMessage.Types.Success);
			//action.LocaleMsg = new($"工单[{CurWipSN.WORK_ORDER}]的条码[{CurWipSN.SN}]在岗位[{CurWipSN.POST_CODE}]工序[{CurWipSN.NODE_NAME}]过站成功，状态[{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]");
			action.LocaleMsg = new("MES.Transaction.CollectNode.ScanSn.PassSuccess", CurWipSNs.First().WORK_ORDER, CurSN, CurWipSNs.First().POST_CODE, CurWipSNs.First().NODE_NAME,CurWipSNs.First().STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());



			//如果当前条码已经完工，检查当前工单批次和工单是否完工
			if (action.Data.OperInfo.IsReachedEndNode)
			{
			CurBatch.CheckIsComplete(UserCode);
			}

			//重置工序
			ResetNode();
			return action;