From 7e7304ec8dfc489cc6f2c0474b27edefae312ae3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 16 Oct 2024 19:28:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F=20=E8=A3=85=E9=85=8D?= =?UTF-8?q?=E4=BB=B6=20=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/apiservice/serviceimpl/busi/MesAssemblyExtService.java | 4 ++-- ...NextStepService.java => MesManyCellIsVerificationStepService.java} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/{MesManyCellNoticeNextStepService.java => MesManyCellIsVerificationStepService.java} (97%) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesAssemblyExtService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesAssemblyExtService.java index 36318e4..3712525 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesAssemblyExtService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesAssemblyExtService.java @@ -94,7 +94,7 @@ public class MesAssemblyExtService implements IMesAssemblyExtService { if (CollectionUtils.isEmpty(workOrderAssemblyList)) return null; //获取装配件绑定记录 - Map> productionAssemblyMap = groupProductionAssembly(getProductionAssemblyList(prodRuleContext.getOrganizeCode(), prodRuleContext.getProductSn())); + Map> productionAssemblyMap = groupProductionAssembly(getProductionAssemblySortList(prodRuleContext.getOrganizeCode(), prodRuleContext.getProductSn())); List productionAssemblySortContextList = new ArrayList<>(); @@ -280,7 +280,7 @@ public class MesAssemblyExtService implements IMesAssemblyExtService { //根据装配件清单ID获取装配件绑定记录 private MesProductionAssembly getProductionAssembly(Map> productionAssemblyMap, Long id) { - return CollectionUtils.isEmpty(productionAssemblyMap) ? null : productionAssemblyMap.get(id).get(0); + return (CollectionUtils.isEmpty(productionAssemblyMap) || !productionAssemblyMap.containsKey(id)) ? null : productionAssemblyMap.get(id).get(0); } //获取工位 diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesManyCellNoticeNextStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesManyCellIsVerificationStepService.java similarity index 97% rename from modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesManyCellNoticeNextStepService.java rename to modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesManyCellIsVerificationStepService.java index bcf91c8..55260ac 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesManyCellNoticeNextStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesManyCellIsVerificationStepService.java @@ -24,7 +24,7 @@ import java.util.List; **/ @Slf4j @Service("mesManyCellIsVerificationStepService") -public class MesManyCellNoticeNextStepService extends BaseStepService { +public class MesManyCellIsVerificationStepService extends BaseStepService { @Autowired private IMesProdOrgExtService prodOrgExtService;