From 72973abb1c6d551326187873db5a42c29dd84625 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Mon, 13 Jun 2022 21:16:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=EF=BC=8C=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E4=B8=89=E6=9C=9F=E6=A0=A1=E9=AA=8C=E5=BF=BD=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/admin/controller/inout/WareHouseController.java  | 9 ++++++++-
 .../service/inventory/InvPreInProductDetailService.java  | 1 +
 .../inventory/impl/InvPreInProductDetailServiceImpl.java | 8 ++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
index 6b2baf7c..facddda2 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
@@ -635,7 +635,14 @@ public class WareHouseController {
                 }
             }
         }
-
+        if (bussinessTypeEntity.isPreIn()) {
+            if (StrUtil.isNotEmpty(udiEntity.getSerialNo())) {
+                List<InvProductDetailEntity> invProductDetailEntities = invPreInProductDetailService.findByOriginCode(code);
+                if(CollUtil.isNotEmpty(invProductDetailEntities)){
+                    return ResultVOUtils.error(500, "条码已存在！");
+                }
+            }
+        }
 
         //预验收校验
         if (addOrderRequest.isPreCheck()) {
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductDetailService.java
index bf1820b8..921e039f 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductDetailService.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductDetailService.java
@@ -8,6 +8,7 @@ import com.glxp.api.admin.res.inventory.InvProductDetailJoinResponse;
 import java.util.List;
 
 public interface InvPreInProductDetailService {
+    List<InvProductDetailEntity> findByOriginCode(String code);
 
     List<InvProductDetailEntity> filterInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest);
 
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java
index 87c7b5b6..064ef6b6 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java
@@ -29,6 +29,14 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe
     @Resource
     InvPreInProductDao invPreInProductDao;
 
+    @Override
+    public List<InvProductDetailEntity> findByOriginCode(String code) {
+        FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
+        filterInvProductDetailRequest.setOriginCode(code);
+        List<InvProductDetailEntity> invProductDetailEntities = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
+        return invProductDetailEntities;
+    }
+
     @Override
     public List<InvProductDetailEntity> filterInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest) {
         if (filterInvProductDetailRequest == null) {