TigerClouds-Tech/Server/TigerApi6_2024.git

			@@ -212,7 +212,8 @@
			var wipSN = new MES_WIP_DATA()
			{
			SN = input.SN,
			STATUS = MES_WIP_DATA.STATUSs.Init.GetValue(),
			FLOW_SN = input.SN,
			STATUS = MES_WIP_DATA.STATUSs.Init.GetValue(),
			ITEM_CODE = CurBatch.WO.ITEM_CODE,
			WORK_ORDER = CurBatch.Batch.ORDER_NO,
			BATCH_NO = CurBatch.Batch.BATCH_NO,
			@@ -242,6 +243,7 @@
			CurBatch.WoSNs.Add(new()
			{
			WORK_ORDER = CurBatch.Batch.ORDER_NO,
			WIP_ID = wipSN.ID,
			SN = wipSN.SN,
			TRAY_SN = wipSN.TRAY_SN,
			STATUS = BIZ_MES_WO_SN.STATUSs.NotInput.GetValue(),
			@@ -304,6 +306,43 @@
			wipSN.DFT_FLAG = "Y";
			wipSN.DFT_COUNT++;
			wipSN.DFT_CODE = input.DFT_CODE;
			var dft = CurBatch.Defects.FirstOrDefault(q => q.DFT_CODE == wipSN.DFT_CODE);
			var defect = new MES_WIP_DFT()
			{
			AUTH_ORG = wipSN.AUTH_ORG,
			AUTH_PROD = wipSN.LINE_CODE,
			WIP_ID = wipSN.ID,
			SN = wipSN.SN,
			STATUS = MES_WIP_DFT.STATUSs.WaitHandle.GetValue(),
			ITEM_CODE = wipSN.ITEM_CODE,
			WORK_ORDER = wipSN.WORK_ORDER,
			BATCH_NO = wipSN.BATCH_NO,
			ROT_CODE = wipSN.ROT_CODE,
			NODE_ID = wipSN.NODE_ID,
			NODE_NAME = wipSN.NODE_NAME,
			FTY_CODE = wipSN.FTY_CODE,
			WS_CODE = wipSN.WS_CODE,
			LINE_CODE = wipSN.LINE_CODE,
			POST_CODE = wipSN.POST_CODE,
			OPER_CODE = wipSN.OPER_CODE,
			SEGMENT = wipSN.SEGMENT,
			DFT_CODE = dft.DFT_CODE,
			DFT_NAME = dft.DFT_NAME,
			DFT_LEVEL = dft.DFT_LEVEL,
			FLOW_SN = wipSN.FLOW_SN,
			TRAY_SN = wipSN.TRAY_SN,
			INNER_SN = wipSN.INNER_SN,
			CARTON_SN = wipSN.CARTON_SN,
			PALLET_SN = wipSN.PALLET_SN,
			INV_FLAG = wipSN.INV_FLAG,
			OPERATION_TIME = DateTime.Now,
			SFTS_CODE = wipSN.SFTS_CODE,
			SFT_CODE = wipSN.SFT_CODE,
			PRD_CODE = wipSN.PRD_CODE,
			OBA_BATCH = wipSN.OBA_BATCH,
			LOCK_BATCH = wipSN.LOCK_BATCH,
			};
			CurDefects.Add(defect);
			}
			}

			@@ -318,6 +357,14 @@
			CurWipSNHiss.Add(new MES_WIP_HIS(wipSN, $"工单[{wipSN.WORK_ORDER}]条码[{wipSN.SN}]在岗位[{wipSN.POST_CODE}]过站工序[{wipSN.NODE_NAME}]成功"));
			}

			//创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
			var _woSns = woSNs.Clone();
			var _wipSns = wipSNs.Clone();
			var _wipHiss = CurWipSNHiss.Clone();
			var _defect = CurDefects.Clone();
			var _curNode = curNode.Clone();
			var _Batch = CurBatch.Batch.Clone();

			//初始化工步列表
			Steps.Clear();
			var curStep = new Biz.WorkStep(IWorkStep.Types.Node, this)
			@@ -326,21 +373,28 @@
			Node = curNode,
			DBSubmitAction = () =>
			{
			var db = GetCommitDB();
			db.Storageable(woSNs, UserCode).ExecuteCommand();
			db.Storageable(wipSNs, UserCode).ExecuteCommand();
			db.Storageable(CurWipSNHiss, UserCode).ExecuteCommand();
			//如果是投入站
			if (curNode.IS_INPUT == "Y")
			//使用统一的事务DB对象
			var db = GetCommitDB();
			//数据保存逻辑
			db.Storageable(_woSns, UserCode).ExecuteCommand();
			db.Storageable(_wipSns, UserCode).ExecuteCommand();
			db.Storageable(_wipHiss, UserCode).ExecuteCommand();
			//如果有不良则保存
			if (_defect.Any())
			{
			db.Updateable<BIZ_MES_WO>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + wipSNs.Count).Where(q => q.ORDER_NO == CurBatch.WO.ORDER_NO).ExecuteCommand();
			db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + wipSNs.Count).Where(q => q.BATCH_NO == CurBatch.Batch.BATCH_NO).ExecuteCommand();
			db.Storageable(_defect, UserCode).ExecuteCommand();
			}
			//如果是投入站
			if (_curNode.IS_INPUT == "Y")
			{
			db.Updateable<BIZ_MES_WO>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + _woSns.Count).Where(q => q.ORDER_NO == _Batch.ORDER_NO).ExecuteCommand();
			db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + _woSns.Count).Where(q => q.BATCH_NO == _Batch.BATCH_NO).ExecuteCommand();
			}
			//如果是产出站
			if (curNode.IS_OUTPUT == "Y")
			if (_curNode.IS_OUTPUT == "Y")
			{
			db.Updateable<BIZ_MES_WO>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + wipSNs.Count).Where(q => q.ORDER_NO == CurBatch.WO.ORDER_NO).ExecuteCommand();
			db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + wipSNs.Count).Where(q => q.BATCH_NO == CurBatch.Batch.BATCH_NO).ExecuteCommand();
			db.Updateable<BIZ_MES_WO>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + _woSns.Count).Where(q => q.ORDER_NO == _Batch.ORDER_NO).ExecuteCommand();
			db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + _woSns.Count).Where(q => q.BATCH_NO == _Batch.BATCH_NO).ExecuteCommand();
			}
			}
			};
			@@ -376,7 +430,6 @@
			//未完成所有工步
			if (!IsFinishAllSteps)
			{
			var result = new ApiAction<SubmitOutput>(new SubmitOutput());
			//未完成所有工序节点工步
			if (!IsFinishNodeSteps)
			{
			@@ -385,14 +438,14 @@
			NextSteps.Clear();
			NextSteps.Add(next);
			//根据后续工步返回ApiAction
			result.Data.SetValue(CurBatch, CurStep, next.ID, IsFinishAllSteps);
			action.Data.SetValue(CurBatch, CurStep, next.ID, IsFinishAllSteps);

			//根据工序节点工步的序号返回相应的操作提示
			switch (next.Sequence)
			{
			case 2:
			//action.LocaleMsg = new($"请执行第二步");
			result.LocaleMsg = new("MES.Transaction.CollectNode.第二步操作提示");
			action.LocaleMsg = new("MES.Transaction.CollectNode.第二步操作提示");
			break;
			default:
			break;
			@@ -401,9 +454,8 @@
			//已完成所有工序节点工步，开始执行行为工步
			else
			{
			result = BeginNextActionStep(input);
			action = BeginNextActionStep(input);
			}
			return result;
			}
			//已完成所有工步
			if (IsFinishAllSteps)
			@@ -435,7 +487,11 @@
			//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>());
			//重置工序
			ResetNode();
			//if (!isClone)
			{
			ResetNode();
			}

			return action;
			}