TigerClouds-Tech/Server/TigerApi6_2024.git

			@@ -76,26 +76,35 @@
			else
			{
			var wosn = 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.SN == input.SN && q.ACT_LINE == CurLine.LINE_CODE && (q.STATUS == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue() \|\| q.STATUS == BIZ_MES_WO_BATCH.STATUSs.Working.GetValue()))
			.Select((q, s) => new { Batch = q, SN = s }).First();
			.ByAuth(input.AuthOption).Where((q, s) => s.SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).First();

			//查找到条码已绑定的工单
			if (!wosn.IsNullOrEmpty())
			{
			if (CurBatch?.Batch?.ORDER_NO != wosn.Batch.ORDER_NO)
			if (wosn.Batch.ACT_LINE != CurLine.LINE_CODE)
			{
			//条码已绑定的工单不等于当前工单则重新选择工单
			var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = wosn.Batch.ORDER_NO });
			if (!result.IsSuccessed)
			{
			action.IsSuccessed = result.IsSuccessed;
			action.LocaleMsg = result.LocaleMsg;
			return action;
			}
			action.IsSuccessed = false;
			//action.LocaleMsg = new($"条码[{0}]已在产线[{1}]投入生产，请在正确岗位扫描");
			action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotCorrectLine", input.SN, wosn.Batch.ACT_LINE);
			return action;
			}
			else
			{
			if (CurBatch?.Batch?.ORDER_NO != wosn.Batch.ORDER_NO)
			{
			//条码已绑定的工单不等于当前工单则重新选择工单
			var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = wosn.Batch.ORDER_NO });
			if (!result.IsSuccessed)
			{
			action.IsSuccessed = result.IsSuccessed;
			action.LocaleMsg = result.LocaleMsg;
			return action;
			}
			}
			//条码过站
			action = NodeSubmit(action, input);
			return action;
			}
			//条码过站
			action = NodeSubmit(action, input);
			return action;
			}
			//查找不到条码已绑定的工单
			else
			@@ -166,7 +175,8 @@
			}
			catch (Exception ex)
			{
			action.CatchExceptionWithLog(ex, $"包装工序：提交操作数据异常");
			//action.CatchExceptionWithLog(ex, $"包装工序：提交操作数据异常");
			action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.SubmitException"));
			}
			return action;
			}
			@@ -179,11 +189,11 @@
			/// <returns></returns>
			public ApiAction<SubmitOutput> NodeSubmit(ApiAction<SubmitOutput> action, SubmitInput input)
			{
			var curNode = CurBatch.GetNode(PostCode);
			try
			{
			var curNode = CurBatch.GetNode(PostCode);
			//判断工单实时状态判断
			var woStatus = CurBatch.CheckStatus();
			//判断工单实时状态判断是否可以生产
			var woStatus = CurBatch.CheckCanProduce(curNode);
			if (!woStatus.IsSuccessed)
			{
			return woStatus;
			@@ -230,8 +240,8 @@
			//条码过站
			wipSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
			wipSN.AUTH_PROD = CurLine.LINE_CODE;
			wipSN.STATUS = wipSN.STATUS > 0 ? MES_WIP_DATA.STATUSs.OK.GetValue() : wipSN.STATUS;
			wipSN.ROT_CODE = CurBatch.WO.ROUTE_CODE;
			wipSN.STATUS = MES_WIP_DATA.STATUSs.OK.GetValue();//wipSN.STATUS > 0 ? MES_WIP_DATA.STATUSs.OK.GetValue() : wipSN.STATUS;
			wipSN.ROT_CODE = CurBatch.WO.ROUTE_CODE;
			wipSN.NODE_ID = curNode.ID;
			wipSN.NODE_NAME = curNode.NODE_NAME;
			wipSN.FTY_CODE = CurFactory.FTY_CODE;
			@@ -287,17 +297,38 @@
			db.Storageable(woSN, UserCode).ExecuteCommand();
			db.Storageable(wipSN, UserCode).ExecuteCommand();
			db.Storageable(CurWipSNHis, UserCode).ExecuteCommand();
			}
			//如果是投入站
			if (curNode.IS_INPUT == "Y")
			{
			db.Updateable<BIZ_MES_WO>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + 1).Where(q => q.ORDER_NO == CurBatch.WO.ORDER_NO).ExecuteCommand();
			db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + 1).Where(q => q.BATCH_NO == CurBatch.Batch.BATCH_NO).ExecuteCommand();
			}
			//如果是产出站
			if (curNode.IS_OUTPUT == "Y")
			{
			db.Updateable<BIZ_MES_WO>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + 1).Where(q => q.ORDER_NO == CurBatch.WO.ORDER_NO).ExecuteCommand();
			db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + 1).Where(q => q.BATCH_NO == CurBatch.Batch.BATCH_NO).ExecuteCommand();
			}
			}
			};
			Steps.Add(curStep);

			//有需要用户提交信息则添加工序节点的其他工步

			//最后添加当前工序的行为工步
			GenerateSteps(curStep);

			//完成第一个工序节点工步
			curStep.IsFinished = true;

			//有需要用户提交信息则添加工序节点的其他工步

			//最后添加当前工序的行为工步
			try
			{
			GenerateSteps(curStep);
			}
			catch (System.Exception ex)
			{
			ResetNode();
			//action.CatchExceptionWithLog(ex, $"{curNode.NODE_NAME}：工序行为工步生成异常，请检查工序行为设置");
			action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.NodeSubmit.GenerateStepsException", curNode.NODE_NAME));
			}

			//完成第一个工序节点工步
			curStep.IsFinished = true;
			CurStep = curStep;
			}
			else if (!IsFinishNodeSteps)
			@@ -351,7 +382,8 @@
			catch (Exception ex)
			{
			ResetNode();
			action.CatchExceptionWithLog(ex, $"包装工序：工序节点工步提交数据异常");
			//action.CatchExceptionWithLog(ex, $"{curNode.NODE_NAME}：工序节点工步提交数据异常，请检查工序节点设置");
			action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.NodeSubmitException", curNode.NODE_NAME));
			}
			return action;
			}
			@@ -364,18 +396,8 @@
			public ApiAction<SubmitOutput> DoIfFinishAllSteps(ApiAction<SubmitOutput> action)
			{
			//保存数据库
			var dbTran = GetCommitDB().UseTran(() =>
			{
			//在同一个事务中保存所有工步的数据
			foreach (var step in Steps.OrderBy(q => q.Sequence))
			{
			step.DBSubmitAction.Invoke();
			}
			});
			if (!dbTran.IsSuccess)
			{
			throw dbTran.ErrorException;
			}
			SaveStepsCommitActionToDB();

			//保存成功，返回过站消息
			//action.LocaleMsg = new($"工单[{CurWipSN.WORK_ORDER}]的条码[{CurWipSN.SN}]在岗位[{CurWipSN.POST_CODE}]工序[{CurWipSN.NODE_NAME}]过站成功，状态[{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME, CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
			action.LocaleMsg = new("MES.Transaction.PackingNode.ScanSn.PassSuccess", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME, CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());