From a257c8a3a7b50b49a7ad627d8fe890434ea62add Mon Sep 17 00:00:00 2001
From: yuanwei <362142050@qq.com>
Date: Sat, 2 Dec 2023 21:54:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=B4=AD=E7=AE=A1=E7=90=86=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/auth/DeptController.java   | 15 +++++++++
 .../auth/InvWarehouseController.java          | 31 +++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java
index 32bc7424a..fdbc5f9f9 100644
--- a/src/main/java/com/glxp/api/controller/auth/DeptController.java
+++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java
@@ -8,6 +8,7 @@ import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.dto.DictDto;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.auth.DeptEntity;
 import com.glxp.api.entity.auth.DeptUserEntity;
@@ -31,6 +32,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @RestController
 public class DeptController {
@@ -67,6 +69,19 @@ public class DeptController {
         return ResultVOUtils.success(invWarehouseEntities);
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/inv/warehouse/filterAllOptimize")
+    public BaseResponse filterAllInvWarehouseOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        filterInvWarehouseRequest.setPid(0L);
+        filterInvWarehouseRequest.setStatus(1);
+        List<DeptEntity> invWarehouseEntities = deptService.filterInvWarehouse(filterInvWarehouseRequest);
+        List<DictDto> reList = invWarehouseEntities.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+        return ResultVOUtils.success(reList);
+    }
+
 
     @AuthRuleAnnotation("")
     @GetMapping("spms/inv/warehouse/filterNext")
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 0c40e7d93..ef0fc48e1 100644
--- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
+++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
@@ -156,6 +156,17 @@ public class InvWarehouseController extends BaseController {
         return ResultVOUtils.success(invSubWarehouseEntities);
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/inv/warehouse/filterGroupBySpuseOptimize")
+    public BaseResponse filterGroupBySpuseOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        List<InvWarehouseEntity> invSubWarehouseEntities = invWarehouseService.filterGroupBySpuse(filterInvWarehouseRequest);
+        List<DictDto> reList = invSubWarehouseEntities.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+        return ResultVOUtils.success(reList);
+    }
+
     /**
      * 前端页面查询参数拉取用户关联所有仓库接口，只返回编码，父ID和名称
      *
@@ -173,6 +184,26 @@ public class InvWarehouseController extends BaseController {
     }
 
 
+    /**
+     * 前端页面查询参数拉取用户关联所有仓库接口，只返回编码，父ID和名称
+     *
+     * @return
+     */
+    @GetMapping("spms/inv/warehouse/findInvListByUserOptimize")
+    public BaseResponse findInvListByUserOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        Long userId = getUserId();
+        if (null == userId) {
+            return ResultVOUtils.error(ResultEnum.LOGIN_VERIFY_FALL);
+        }
+        filterInvWarehouseRequest.setUserId(userId);
+        List<InvWarehouseEntity> list = invWarehouseService.findInvListByUser(filterInvWarehouseRequest);
+        List<DictDto> reList = list.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+        return ResultVOUtils.success(reList);
+    }
+
     /**
      * 前端查询自己关联仓库包含预验收，寄售库
      *