From eeacec72bf5b31ad13a7025e33f74c53a9aee120 Mon Sep 17 00:00:00 2001
From: jason <backo@163.com>
Date: Mon, 12 May 2025 13:08:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9D=A1=E7=A0=81=E5=BC=BA?=
 =?UTF-8?q?=E8=BF=87=E5=90=8E=EF=BC=8C=E6=A3=80=E9=AA=8C=E8=BF=99=E4=B8=AA?=
 =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=98=AF=E4=B8=8D=E6=98=AF=E6=89=AB=E8=BF=87?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiservice/serviceimpl/busi/MesNingDeShippingCheckService.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNingDeShippingCheckService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNingDeShippingCheckService.java
index f765ceb..3c31b0a 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNingDeShippingCheckService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNingDeShippingCheckService.java
@@ -468,6 +468,11 @@ public class MesNingDeShippingCheckService implements IMesNingDeShippingCheckSer
         if(!shippingOrderManagementDetailOptional.isPresent()){
             throw new ImppBusiException(String.format("【%s】明细已全部扫描完成，请检查数据！", orderManagement.getShippingCode()));
         }
+        for (MesShippingOrderManagementDetail detail : model.getDetailList()) {
+            if (Objects.equals(detail.getSecondScanFlg(), MesCommonConstant.TRUE_INTEGER) && Objects.equals(detail.getBarcode(), model.getSn())) {
+                throw new ImppBusiException(String.format("【%s】条码已进行二次发运扫描，请检查数据！", model.getSn()));
+            }
+        }
         MesProduceSn produceSn = checkSecondSn(model);
         //更新明细
         MesShippingOrderManagementDetail detail = shippingOrderManagementDetailOptional.get();