TigerClouds-Tech/Server/TigerApi6_2024.git

			@@ -37,7 +37,7 @@
			/// <returns></returns>
			public async Task<ApiAction<SubmitOutput>> Submit(SubmitInput input)
			{
			var action = new ApiAction<SubmitOutput>();
			var action = new ApiAction<SubmitOutput>(new SubmitOutput());
			try
			{
			//工步列表为空或者工序节点工步有未完成时，优先完成工序节点工步
			@@ -52,9 +52,10 @@
			//当前岗位在当前工单不是首站，则查找条码已绑定的工单当作当前工单
			else
			{
			var wosn = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((b, s) => new JoinQueryInfos(JoinType.Inner, b.ORDER_NO == s.WORK_ORDER)).ByAuth(input.AuthOption)
			.Where((b, s) => s.SN == input.SN && b.ACT_LINE == CurLine.LINE_CODE && (b.STATUS == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue() \|\| b.STATUS == BIZ_MES_WO_BATCH.STATUSs.Working.GetValue()))
			.Select((b, s) => new { Batch = b, SN = s }).First();
			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();
			//查找到条码已绑定的工单
			if (!wosn.IsNullOrEmpty())
			{
			@@ -125,9 +126,9 @@
			result.Data.IsFinished = IsFinishAllSteps;
			result.Data.CurWO = CurBatch.WO.ORDER_NO;
			result.Data.CurBatch = CurBatch.Batch.BATCH_NO;
			result.Data.CurNode = CurStep.NodeAct.ACT_NAME;
			result.Data.StepActCode = CurStep.NodeAct.ACT_CODE;
			result.Data.NextStepID = CurStep.ID;
			result.Data.CurNode = CurStep?.NodeAct.ACT_NAME;
			result.Data.StepActCode = CurStep?.NodeAct.ACT_CODE;
			result.Data.NextStepID = CurStep?.ID;
			}
			}
			//如果所有工步都完成
			@@ -161,6 +162,34 @@
			{
			try
			{
			var curNode = CurBatch.GetNode(PostCode);
			//判断工单实时状态判断
			var woStatus = CurBatch.CheckStatus();
			if (!woStatus.IsSuccessed)
			{
			return woStatus;
			}
			//非法过站防呆：进入工序时要增加判断条码是否按流程过站
			var wipSN = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().First(q => q.SN == input.SN && q.WORK_ORDER == CurBatch.WO.ORDER_NO) ?? new MES_WIP_DATA()
			{
			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,
			HOLD_FLAG = "N",
			REWORK_FLAG = CurBatch.WO.ORDER_TYPE == BIZ_MES_WO.ORDER_TYPEs.Rework.GetValue() ? "Y" : "N",
			FINISHED_FLAG = "N",
			INV_FLAG = "N",
			DFT_FLAG = "N",
			DFT_COUNT = 0,
			};
			var canGotoNext = CurBatch.CanGotoNext(input, wipSN, curNode);
			if (!canGotoNext.IsSuccessed)
			{
			return canGotoNext;
			}

			//当工步列表为空，则执行当前工序的必要逻辑当作第一个工序节点，完成后按需求创建后续的工步列表
			if (Steps.IsNullOrEmpty())
			{
			@@ -172,27 +201,15 @@
			WORK_ORDER = CurBatch.Batch.ORDER_NO,
			SN = input.SN,
			STATUS = BIZ_MES_WO_SN.STATUSs.NotInput.GetValue(),
			BATCH_NO = CurBatch.Batch.BATCH_NO,
			});
			}
			var woSN = CurBatch.WoSNs.FirstOrDefault(q => q.SN == input.SN);
			var curNode = CurBatch.GetNode(PostCode);
			var woSN = CurBatch.WoSNs.First(q => q.SN == input.SN);
			woSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
			woSN.AUTH_PROD = CurLine.LINE_CODE;
			woSN.BATCH_NO = CurBatch.Batch.BATCH_NO;

			//条码过站
			var wipSN = Biz.Db.Queryable<MES_WIP_DATA>().First(q => q.SN == input.SN && q.BATCH_NO == CurBatch.Batch.BATCH_NO) ?? new MES_WIP_DATA()
			{
			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,
			HOLD_FLAG = "N",
			REWORK_FLAG = CurBatch.WO.ORDER_TYPE == BIZ_MES_WO.ORDER_TYPEs.Rework.GetValue() ? "Y" : "N",
			FINISHED_FLAG = "N",
			INV_FLAG = "N",
			DFT_FLAG = "N",
			DFT_COUNT = 0,
			};
			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;
			@@ -205,9 +222,13 @@
			wipSN.OPER_CODE = curNode.OPER_CODE;
			wipSN.SEGMENT = curNode.SEGMENT;
			wipSN.OPERATION_TIME = DateTime.Now;
			wipSN.SFTS_CODE = CurLine.SFTS_CODE;
			//wipSN.SFT_CODE = CurBatch.WO.ROUTE_CODE;
			//wipSN.PRD_CODE = CurBatch.WO.ROUTE_CODE;
			var curShiftPeriod = GetShiftPeriodForNow();
			if (!curShiftPeriod.IsNullOrEmpty())
			{
			wipSN.SFTS_CODE = curShiftPeriod.ShiftSys.SFTS_CODE;
			wipSN.SFT_CODE = curShiftPeriod.Shift.SFT_CODE;
			wipSN.PRD_CODE = curShiftPeriod.Period.PRD_CODE;
			}
			CurBatch.StartWorking(UserCode);

			//如果是投入站
			@@ -252,7 +273,7 @@
			};
			Steps.Add(curStep);

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

			//最后添加当前工序的行为工步
			GenerateSteps(curStep);
			@@ -273,7 +294,7 @@
			//未完成所有工步
			if (!IsFinishAllSteps)
			{
			var result = new ApiAction<SubmitOutput>();
			var result = new ApiAction<SubmitOutput>(new SubmitOutput());
			//未完成所有工序节点工步
			if (!IsFinishNodeSteps)
			{
			@@ -285,7 +306,7 @@
			result.Data.IsFinished = IsFinishAllSteps;
			result.Data.CurWO = CurBatch.WO.ORDER_NO;
			result.Data.CurBatch = CurBatch.Batch.BATCH_NO;
			result.Data.CurNode = CurStep.Node.NODE_NAME;
			result.Data.CurNode = CurStep?.Node.NODE_NAME;
			result.Data.NextStepID = next.ID;

			//根据工序节点工步的序号返回相应的操作提示
			@@ -312,7 +333,7 @@
			action.Data.IsFinished = IsFinishAllSteps;
			action.Data.CurWO = CurBatch.WO.ORDER_NO;
			action.Data.CurBatch = CurBatch.Batch.BATCH_NO;
			action.Data.CurNode = CurStep.Node.NODE_NAME;
			action.Data.CurNode = CurStep?.Node.NODE_NAME;
			action.Data.NextStepID = "";
			action = DoIfFinishAllSteps(action);
			}