From 824ffb83b47330220d426e80cc828d9783da624c Mon Sep 17 00:00:00 2001 From: jun Date: Mon, 18 Nov 2024 08:45:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=8F=91=E8=BF=90=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E6=89=AB=E6=8F=8F=E7=A1=AE=E8=AE=A4=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=98=AF=E5=90=A6=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/busi/MesSortShippingCheckService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java index ec8830d..e9c389c 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java @@ -138,8 +138,11 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService if (!Objects.isNull(model.getIsPass()) && Objects.equals(MesPcnExtConstWords.ONE, model.getIsPass())) { skipShippingDetails(model, model.getUserInfo(), orderManagement); //扫描条码 - } else{ - model = ((IMesShippingScanStrategyService) SpringContextsUtil.getBean(MesExtEnumUtil.SHIPPING_GROUP_CONFIRM_PART_TYPE.valueOfServiceImpl(Integer.parseInt(shippingGroup.getConfirmPartType())))).doScan(model,orderManagement,shippingGroup); + } else { + if (StringUtils.isEmpty(shippingGroup.getConfirmPartType())) { + MesPcnException.throwMesBusiException("零件发运组【%s】扫描确认方式未维护，请检查数据！"); + } + model = ((IMesShippingScanStrategyService) SpringContextsUtil.getBean(MesExtEnumUtil.SHIPPING_GROUP_CONFIRM_PART_TYPE.valueOfServiceImpl(Integer.parseInt(shippingGroup.getConfirmPartType())))).doScan(model, orderManagement, shippingGroup); } model.setDetailList(model.getDetailList()); //当前发运单全部扫描完成 并且不需要扫位置码