From a4719b519f0677770dc70b84d9e10b2ad56340b7 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Mon, 20 Feb 2023 11:15:24 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=A4=96=E5=8D=8F=E7=82=B9=E5=AE=8C?= =?UTF-8?q?=E5=B7=A5=E8=87=AA=E5=8A=A8=E8=A7=A6=E5=8F=91=E8=BD=AC=E5=BA=8F?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=BB=99=E4=B8=8B=E8=BD=A6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PodTemplateServiceImpl.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java index 249633a4..59292a01 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java @@ -754,6 +754,15 @@ public class PodTemplateServiceImpl implements PodTemplateService { queryWrapper.like(SfcDispatch.ROUTER_BO, sfcDispatchById.getRouterBo().substring(0,sfcDispatchById.getRouterBo().lastIndexOf(","))); // queryWrapper.eq(SfcDispatch.ROUTER_BO,sfcDispatchById.getRouterBo()); nextsfcDispatch = sfcDispatchService.getOne(queryWrapper); + //外协工序后的检入工序：直接触发给入库 + if (nextsfcDispatch != null && "HJ_6106JRGX".equals(nextsfcDispatch.getOperation())) { + nextsfcDispatch.setOperation(nextsfcDispatch.getOperation()); + nextsfcDispatch.setStepId(nextsfcDispatch.getStepId()); + nextsfcDispatch.setWorkCenter("BCP"); + flag=true; + break; + } + if (nextsfcDispatch != null && !stringList.contains(nextsfcDispatch.getOperation()) && !nextsfcDispatch.getWorkCenter().equals(sfcDispatchById.getWorkCenter())) { flag=true; @@ -802,6 +811,12 @@ public class PodTemplateServiceImpl implements PodTemplateService { logisticsTurnover.setTurnoutItem(item); logisticsTurnover.setTurnoutWorkcenter(sfcDispatchById.getWorkCenter()); try { + if (request.getOperation().equals("WX_6106GX")){ + logisticsTurnover.setComDateTime(LocalDateTime.now()); + logisticsTurnover.setStatus("COM"); + logisticsTurnover.setuserId("WX000001"); + logisticsTurnover.setUserName("外协虚拟"); + } logisticsTurnoverService.save(logisticsTurnover); } catch (Exception e) { throw new BaseException("周转任务生成失败");