From 2322cc606c3d62f54f86643976e7944a2cf173ba Mon Sep 17 00:00:00 2001
From: jun <junsheng.li@estsh.com>
Date: Thu, 19 Sep 2024 10:54:34 +0800
Subject: [PATCH] =?UTF-8?q?43063=20PDA=E7=82=B9=E6=A3=80=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=BA=86=E5=90=8C=E4=B8=80=E4=B8=AA=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=B8=8C=E6=9C=9B=E6=8F=90=E7=A4=BA=E6=B8=85?=
 =?UTF-8?q?=E6=99=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java
index 1e88a4e..0bb540d 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi;
 import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesEquipmentExtService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesEquipmentLogExtService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.spot.IMesSpotCheckOrderService;
+import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesEquipmentSpotCheckModel;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesSpotCheckOrderModel;
@@ -147,6 +148,10 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
             checkEquipment(model, org);
             return model;
         } else {
+            //校验是否重复扫描
+            if(model.getOrderPartList().stream().anyMatch(t -> !StringUtils.isEmpty(t.getSn()) && Objects.equals(model.getProduceSn(), t.getSn()))){
+                MesPcnException.throwMesBusiException("条码【%s】已扫描，请勿重复扫描", model.getProduceSn());
+            }
             //检查条码
             MesProduceSn produceSn = checkProduceSn(model.getProduceSn(), org);
 
@@ -161,7 +166,7 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
             }
 
             if (!flg) {
-                throw new ImppBusiException(String.format("扫描的条码【%s】对应的物料号【%s】在点检单中不存在", produceSn.getProductSn(), produceSn.getPartNo()));
+                throw new ImppBusiException(String.format("扫描的条码【%s】对应的物料号【%s】在点检单中未匹配到待匹配的数据", produceSn.getProductSn(), produceSn.getPartNo()));
             }
 
             return model;