From 7937c7c84379fa3938ddbf4b6a76b4dd084433e4 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Mon, 13 Jun 2022 21:03:00 +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

---
 .../controller/inout/WareHouseController.java      | 14 +++++++++++---
 .../inventory/InvProductsController.java           |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

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 ca3217f6..6b2baf7c 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
@@ -587,13 +587,22 @@ public class WareHouseController {
         if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
             return ResultVOUtils.error(500, "批次号不能为空！");
         }
-
+        String orderId = addOrderRequest.getOrderId();
 //        String isCheck = systemParamConfigService.selectValueByParamKey("code_fill_check");
         //三期校验
         if (addOrderRequest.isCodeFillCheck()) {
             BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity);
             if (checkOriginCodeRes != null)
-                return checkOriginCodeRes;
+                if (StrUtil.isNotEmpty(orderId)) {
+                    WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
+                    warehouseQueryRequest.setOrderId(orderId);
+                    List<WarehouseEntity> warehouseEntitys = codesTempService.findByOrderIdAndCode(warehouseQueryRequest);
+                    WarehouseEntity warehouseEntity = isExitLocal(code, warehouseEntitys);
+                    if (warehouseEntity == null) {
+                        return checkOriginCodeRes;
+                    }
+                } else
+                    return checkOriginCodeRes;
         }
 
         //过期提醒：
@@ -627,7 +636,6 @@ public class WareHouseController {
             }
         }
 
-        String orderId = addOrderRequest.getOrderId();
 
         //预验收校验
         if (addOrderRequest.isPreCheck()) {
diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java
index 9cef2a22..8d35b3cd 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java
@@ -81,7 +81,7 @@ public class InvProductsController {
     @AuthRuleAnnotation("")
     @GetMapping("spms/inv/products/filter")
     public BaseResponse filterInvProduct(FilterInvProductRequest filterInvProductRequest) {
-        boolean showSup = false;
+        boolean showSup = true;
         if (StrUtil.isNotEmpty(filterInvProductRequest.getUdiCode())) {
             filterInvProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvProductRequest.getUdiCode()));
         }