From 7f1d86ebc4b42445be33b31c3c2cb934cf663de8 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Wed, 16 Apr 2025 13:56:21 +0800
Subject: [PATCH] =?UTF-8?q?45524=20PCN=EF=BC=9A=E6=AD=A6=E6=B1=89cockpit?=
 =?UTF-8?q?=E5=8F=91=E8=BF=90=EF=BC=8C=E9=9C=80=E8=A6=81=E5=8D=A1=E6=8E=A7?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9D=A1=E7=A0=81=E4=B8=8D=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=89=AB=E6=8F=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java  | 1 +
 .../shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java   | 4 ++++
 2 files changed, 5 insertions(+)

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 a744efe..5ecc2cc 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
@@ -707,6 +707,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                     produceSn.setSystemSyncDatetime(MesPcnExtConstWords.EMPTY);
                     ConvertBean.serviceModelUpdate(produceSn, userInfo);
                     produceSnList.add(produceSn);
+                    mesShippingSnUniqueList.add(mesShippingSnUniqueService.getMesShippingSnUnique(organizeCode, detail.getBarcode(), orderManagement.getShippingCode(), userInfo));
                 } else {
                     //记录唯一性校验表
                     mesShippingSnUniqueList.add(mesShippingSnUniqueService.getMesShippingSnUnique(organizeCode, detail.getBarcode(), orderManagement.getShippingCode(), userInfo));
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 dca8099..d718acd 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
@@ -158,6 +158,10 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr
         if (!StringUtils.isEmpty(produceSn)) {
             //校验状态
             checkStatus(model, produceSn);
+            //唯一性校验
+            if (mesShippingSnUniqueService.checkMesShippingSnUnique(model.getOrganizeCode(),model.getSn())) {
+                throw new ImppBusiException(String.format("【%s】条码唯一性校验数据已存在，请检查数据！", model.getSn()));
+            }
         } else {
             //外部条码解析
             MesShippingOrderManagementDetail mesShippingOrderManagementDetail = getMesShippingOrderManagementDetail(model);