From 73e5cc90348283f2454d3f08df3989ae850e515e Mon Sep 17 00:00:00 2001 From: jason Date: Wed, 7 May 2025 17:04:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=81=E5=BE=B7=E4=BA=8C=E6=AC=A1=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/MesShippingScanSnStrategyServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java index afc79ed..28cf8a9 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java @@ -79,10 +79,10 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr boolean scanFlg = false; for (MesShippingOrderManagementDetail detail : model.getDetailList()) { boolean notScan; - if (Objects.equals(model.getSecondShipping(), false)) { - notScan = StringUtils.isEmpty(detail.getBarcode()) && !Objects.equals(detail.getIsScanFlg(), MesCommonConstant.TRUE_INTEGER); - } else { + if (Objects.equals(model.getSecondShipping(), true)) { notScan = Objects.equals(detail.getSecondScanFlg(), MesCommonConstant.FALSE_INTEGER) && Objects.equals(detail.getBarcode(), model.getSn()); + } else { + notScan = StringUtils.isEmpty(detail.getBarcode()) && !Objects.equals(detail.getIsScanFlg(), MesCommonConstant.TRUE_INTEGER); } if (detail.getPartNo().equals(produceSn.getPartNo()) && notScan) { //校验发运明细 @@ -94,10 +94,10 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr } } if (!scanFlg) { - if (Objects.equals(model.getSecondShipping(), false)) { - throw new ImppBusiException(String.format("【%s】此条码对应的【%s】物料号与发运单中物料号不匹配，请检查数据！", model.getSn(), produceSn.getPartNo())); + if (Objects.equals(model.getSecondShipping(), true)) { + throw new ImppBusiException(String.format("【%s】此条码不在原发运单中，若要通过请强过！", model.getSn())); } else { - throw new ImppBusiException(String.format("【%s】此条码不在原发运单中，若要通过请强过！", model.getSn(), produceSn.getPartNo())); + throw new ImppBusiException(String.format("【%s】此条码对应的【%s】物料号与发运单中物料号不匹配，请检查数据！", model.getSn(), produceSn.getPartNo())); } } model.setMsg(String.format("条码【%s】扫描完成，请扫描下一个条码", model.getSn())); @@ -277,7 +277,7 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr } } - if (Objects.equals(model.getSecondShipping(), false)) { + if (!Objects.equals(model.getSecondShipping(), true)) { orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPING.getValue()); } orderManagement.setSystemSyncStatus(CommonEnumUtil.FALSE);