From 4821fb1ea0122ccef219c49fe153a8fe6e6231d3 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 6 Feb 2023 22:21:27 +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

---
 .../auth/InvWarehouseController.java          | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
index e9c1db508..48669818f 100644
--- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
+++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
@@ -248,7 +248,7 @@ public class InvWarehouseController extends BaseController {
     @AuthRuleAnnotation("")
     @PostMapping("/spms/sub/inv/warehouse/edit")
     public BaseResponse edit(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity,
-                             BindingResult bindingResult) {
+                             BindingResult bindingResult,FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
 
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@@ -256,17 +256,33 @@ public class InvWarehouseController extends BaseController {
         if (invWarehouseEntity.getId() == null) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
-        boolean b = invWarehouseService.updateInvSubWarehouse(invWarehouseEntity);
+        //判断仓库是否存在
+        ArrayList<InvWarehouseEntity> list = new ArrayList<>();
+        filterInvSubWarehouseRequest.setParentId(invWarehouseEntity.getParentId());
+        List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest);
+        for (InvWarehouseEntity warehouseEntity : invWarehouseEntities) {
+            if(invWarehouseEntity.name.equals(warehouseEntity.getName()) && invWarehouseEntity.getParentCode().equals(warehouseEntity.getParentCode())){
+                list.add(warehouseEntity);
+            }
+        }
+        if(list.size()==0){
+            boolean b = invWarehouseService.updateInvSubWarehouse(invWarehouseEntity);
 
-        DeptEntity pEntity = deptService.selectByCode(invWarehouseEntity.getParentId());
-        pEntity.setUpdateTime(new Date());
-        deptService.updateInvWarehouse(pEntity);
+            DeptEntity pEntity = deptService.selectByCode(invWarehouseEntity.getParentId());
+            pEntity.setUpdateTime(new Date());
+            deptService.updateInvWarehouse(pEntity);
 
-        if (!b) {
-            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+            if (!b) {
+                return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+            }
+
+            return ResultVOUtils.success("修改成功！");
+        }else{
+            return ResultVOUtils.error(ResultEnum.DATA_REPEAT);
         }
 
-        return ResultVOUtils.success("修改成功！");
+
+
     }
 
     @AuthRuleAnnotation("")