From fbe645ebd68094efef43668aa359e6c40eb69096 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Tue, 10 Aug 2021 16:15:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/production/service/impl/SplitSfcServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java index 5a4ccfb1..4850dd6b 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java @@ -247,7 +247,7 @@ public class SplitSfcServiceImpl extends ServiceImpl i splitSfc.setCreatedDateTime(LocalDateTime.now()); save(splitSfc); String workCenterBo = shopOrderService.getById(HandleEnum.SHOP_ORDER.getHandle(site, sfcData.getShopOrder())).getPlannedWorkCenterBo(); - sfcDispatchCommonService.saveSfcDispatch(site,CommonMethods.getUser(),StringUtil.trimHandle(workCenterBo),newSfc, sfcData.getShopOrder(),routerBo); + sfcDispatchCommonService.saveSfcDispatch(site,CommonMethods.getUser(),StringUtil.trimHandle(workCenterBo),newSfc, sfcData.getShopOrder(),maxRevisionRouter.getHandle()); return splitSfc; } catch (Exception e) { ExceptionUtil.throwException(e); From 6cf48654c7fb983c5ccfadb16fd44d1d0563b32f Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Tue, 10 Aug 2021 16:24:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=95=B4=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E9=97=B4=E5=8F=96=E5=80=BC=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/common/constant/Constants.java | 4 ++-- .../impl/ShopOrderReleaseServiceImpl.java | 24 +++++++++++++------ .../service/impl/InterfaceServiceImpl.java | 2 +- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java b/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java index 8fb9ff3c..d74e4366 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java @@ -8,6 +8,8 @@ package com.foreverwin.mesnac.common.constant; */ public interface Constants { + String OP_6106GX = "6106GX"; + String STATUS_NEW = "NEW"; String STATE_CONFIRM ="CONF"; String STATE_REJECT="REJ"; @@ -175,6 +177,4 @@ public interface Constants { */ String UNTREATED = "UN"; //未处理 String PROCESSED = "PR"; //已处理 - - } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java index 1da336de..d1f0bec7 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java @@ -94,13 +94,6 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService { } for (ShopOrderRelease shopOrderReleaseModel : shopOrderList) { - String workCenter = shopOrderReleaseModel.getWorkCenter(); - String workCenterBo = HandleEnum.WORK_CENTER.getHandle(site, workCenter); - WorkCenter workCenterModel = workCenterService.getById(workCenterBo); - if (workCenterModel == null) { - throw new BaseException("工作中心[" + workCenter + "]不存在"); - } - //查询工单信息 String shopOrder = shopOrderReleaseModel.getShopOrder(); String shopOrderBo = shopOrderReleaseModel.getShopOrderBo(); @@ -133,6 +126,23 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService { throw new BaseException("工艺路线[" +StringUtils.trimHandle(routerBo)+ "]主数据不完整，请确认"); } + //获取车间 + String workCenter = null; + String workCenterBo = null; + for (RouterDTO routerDTO: routerList) { + String operation = routerDTO.getOperation(); + if (!Constants.OP_6106GX.equals(operation) && operation.contains("_")) { + workCenter = operation.split("_")[0]; + + workCenterBo = HandleEnum.WORK_CENTER.getHandle(site, workCenter); + WorkCenter workCenterModel = workCenterService.getById(workCenterBo); + if (workCenterModel == null) { + throw BusinessException.build("生产车间【" +workCenter+ "】不存在"); + } + break; + } + } + //工单下达 ReleaseShopOrderResponse response = null; try { diff --git a/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java b/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java index 628379cb..d0dbe19b 100644 --- a/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java +++ b/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java @@ -546,7 +546,7 @@ public class InterfaceServiceImpl implements InterfaceService { String operation = null; String operationBo = null; if (StringUtil.isBlank(erpWorkCenter)) { - operation = "6106GX"; + operation = Constants.OP_6106GX; Operation operationModel = operationService.getCurrentRevisionRef(site, operation); if (operationModel == null) { throw BusinessException.build("工序编号【" +operation+ "】不存在"); From 5fb42f229f7f6552ab3d80c0d3f09458bbfadc36 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Tue, 10 Aug 2021 16:48:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/common/service/impl/ProdReadyTaskServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java index d8091ca0..048a8df8 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java @@ -370,7 +370,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl