From a252d29a8b968c80c2c84e0366602efae30e7518 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 6 Feb 2023 11:45:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/thrsys/ThrInvWarehouseController.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java
index 27d23c1b8..f990108e4 100644
--- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java
+++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java
@@ -99,10 +99,12 @@ public class ThrInvWarehouseController {
         }
         //先判断该部门下存不存在此仓库
         filterThrSubInvWarehouseRequest.setCode(invSubWarehouseEntity.getCode());
-        filterThrSubInvWarehouseRequest.setName(invSubWarehouseEntity.getName());
         filterThrSubInvWarehouseRequest.setParentId(invSubWarehouseEntity.getParentId());
         List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrSubInvWarehouseRequest);
-        if(thrInvWarehouseEntities.size()==0){
+        filterThrSubInvWarehouseRequest.setName(invSubWarehouseEntity.getName());
+        filterThrSubInvWarehouseRequest.setCode(null);
+        List<ThrInvWarehouseEntity> thrInvWarehouseEntities1 = thrInvWarehouseService.filterThrInvWarehouse(filterThrSubInvWarehouseRequest);
+        if(thrInvWarehouseEntities.size()==0 && thrInvWarehouseEntities1.size()==0){
             boolean b = thrInvWarehouseService.updateThrInvWarehouse(invSubWarehouseEntity);
             if (!b) {
                 return ResultVOUtils.error(ResultEnum.NOT_NETWORK);