TigerClouds-Tech/Server/TigerApi6_2024.git

			@@ -89,8 +89,9 @@
			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.SN == input.SN \|\| s.FLOW_SN == input.SN \|\| s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();

			.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())
			{
			@@ -145,7 +146,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));
			}
			@@ -252,71 +253,81 @@
			var curNode = CurBatch.GetNode(PostCode);
			try
			{
			//判断工单实时状态判断是否可以生产
			var woStatus = CurBatch.CheckCanProduce(curNode);
			if (!woStatus.IsSuccessed)
			//工序节点逻辑增加如果根基当前岗位找不到对应工序的时候要报错
			if (curNode.IsNullOrEmpty())
			{
			woStatus.Data.ShortMsg = new("工单异常", ShortMessage.Types.Error);
			return woStatus;
			action.Data.ShortMsg = new("未知工序", ShortMessage.Types.Error);
			action.IsSuccessed = false;
			//action.LocaleMsg = new($"岗位[{0}]在工单[{1}]工艺路线中找不到对应的工序，请检查工单工艺路线中工序与岗位的绑定关系是否正确");
			action.LocaleMsg = new("MES.Transaction.PackingNode.NodeSubmit.OperateNodeError", PostCode, CurBatch.WO.ORDER_NO);
			return action;
			}

			var wipSNs = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN \|\| q.FLOW_SN == input.SN \|\| q.TRAY_SN == input.SN).ToList();
			if (wipSNs.IsNullOrEmpty())
			{
			var wipSN = new MES_WIP_DATA()
			{
			SN = input.SN,
			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,
			FTY_CODE = CurFactory.FTY_CODE,
			WS_CODE = CurWorkshop.WS_CODE,
			LINE_CODE = CurLine.LINE_CODE,
			POST_CODE = CurPosition.POST_CODE,
			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,
			};
			wipSNs.Add(wipSN);
			}

			//如果条码不是当前工单或者产线的则报错
			if (wipSNs.Any(q => q.WORK_ORDER != CurBatch.WO.ORDER_NO \|\| q.LINE_CODE != CurLine.LINE_CODE))
			{
			if (wipSNs.First().LINE_CODE == CurLine.LINE_CODE)
			{
			action.Data.ShortMsg = new("工单错误", ShortMessage.Types.Error);
			action.IsSuccessed = false;
			//action.LocaleMsg = new($"产品[{CurSN}]不属于当前工单，请切换到工单[{wipSNs.First().WORK_ORDER}]后再扫描");
			action.LocaleMsg = new("MES.Transaction.PackingNode.NodeSubmit.WoError", input.SN, wipSNs.First().WORK_ORDER);
			return action;
			}
			else
			{
			action.Data.ShortMsg = new("产线错误", ShortMessage.Types.Error);
			action.IsSuccessed = false;
			//action.LocaleMsg = new($"产品[{CurSN}]已在产线[{wipSNs.First().LINE_CODE}]投产，请到产线[{wipSNs.First().LINE_CODE}]扫描");
			action.LocaleMsg = new("MES.Transaction.PackingNode.NodeSubmit.LineError", input.SN, wipSNs.First().LINE_CODE);
			return action;
			}
			}

			//非法过站防呆：进入工序时要增加判断条码是否按流程过站
			var canGotoNext = CurBatch.CanGotoNext(input, wipSNs.First(), curNode);
			if (!canGotoNext.IsSuccessed)
			{
			woStatus.Data.ShortMsg = new("进站错误", ShortMessage.Types.Error);
			return canGotoNext;
			}

			//当工步列表为空，则执行当前工序的必要逻辑当作第一个工序节点，完成后按需求创建后续的工步列表
			if (Steps.IsNullOrEmpty())
			{
			BeginAt = DateTime.Now;
			//判断工单实时状态判断是否可以生产
			var woStatus = CurBatch.CheckCanProduce(curNode);
			if (!woStatus.IsSuccessed)
			{
			woStatus.Data.ShortMsg = new("工单异常", ShortMessage.Types.Error);
			return woStatus;
			}

			var wipSNs = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN \|\| q.FLOW_SN == input.SN \|\| q.TRAY_SN == input.SN).ToList();
			if (wipSNs.IsNullOrEmpty())
			{
			var wipSN = new MES_WIP_DATA()
			{
			SN = input.SN,
			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,
			FTY_CODE = CurFactory.FTY_CODE,
			WS_CODE = CurWorkshop.WS_CODE,
			LINE_CODE = CurLine.LINE_CODE,
			POST_CODE = CurPosition.POST_CODE,
			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,
			};
			wipSNs.Add(wipSN);
			}

			//如果条码不是当前工单或者产线的则报错
			if (wipSNs.Any(q => q.WORK_ORDER != CurBatch.WO.ORDER_NO \|\| q.LINE_CODE != CurLine.LINE_CODE))
			{
			if (wipSNs.First().LINE_CODE == CurLine.LINE_CODE)
			{
			action.Data.ShortMsg = new("工单错误", ShortMessage.Types.Error);
			action.IsSuccessed = false;
			//action.LocaleMsg = new($"产品[{CurSN}]不属于当前工单，请切换到工单[{wipSNs.First().WORK_ORDER}]后再扫描");
			action.LocaleMsg = new("MES.Transaction.PackingNode.NodeSubmit.WoError", input.SN, wipSNs.First().WORK_ORDER);
			return action;
			}
			else
			{
			action.Data.ShortMsg = new("产线错误", ShortMessage.Types.Error);
			action.IsSuccessed = false;
			//action.LocaleMsg = new($"产品[{CurSN}]已在产线[{wipSNs.First().LINE_CODE}]投产，请到产线[{wipSNs.First().LINE_CODE}]扫描");
			action.LocaleMsg = new("MES.Transaction.PackingNode.NodeSubmit.LineError", input.SN, wipSNs.First().LINE_CODE);
			return action;
			}
			}

			//非法过站防呆：进入工序时要增加判断条码是否按流程过站
			var canGotoNext = CurBatch.CanGotoNext(input, wipSNs.First(), curNode);
			if (!canGotoNext.IsSuccessed)
			{
			woStatus.Data.ShortMsg = new("进站错误", ShortMessage.Types.Error);
			return canGotoNext;
			}

			//绑定条码到工单
			foreach (var wipSN in wipSNs)
			{
			@@ -452,7 +463,7 @@

			//初始化工步列表
			Steps.Clear();
			var curStep = new Biz.WorkStep(IWorkStep.NodeTypes.Node, this)
			var curStep = new WorkStep(IWorkStep.NodeTypes.Node, this)
			{
			Name = "扫描产品",
			Sequence = Steps.Count + 1,
			@@ -510,10 +521,23 @@
			{
			var curStep = Steps.Where(q => q.NodeType == IWorkStep.NodeTypes.Node && !q.IsFinished).OrderBy(q => q.Sequence).First();

			//完成当前工序节点工步
			curStep.IsFinished = true;
			curStep.Status = StepStatus.Finished;
			CurStep = curStep;
			//根据工序节点工步的序号处理相应工步的处理逻辑
			switch (curStep.Sequence)
			{
			case 2:
			{
			//第二工步的处理逻辑


			//完成当前工序节点工步
			curStep.IsFinished = true;
			curStep.Status = StepStatus.Finished;
			CurStep = curStep;
			}
			break;
			default:
			break;
			}
			}

			//未完成所有工步