申购仓库修改

src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java

@@ -83,15 +83,14 @@ public class InvWarehouseController extends BaseController {
     @GetMapping("spms/sub/inv/warehouse/filterOptimize")
     public BaseResponse filterOptimize(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
         List<InvSubWarehouseResponse> responses = invWarehouseService.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest);
-        List<DictDto> reList = responses.stream().map(s-> {
-            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+        List<DictDto> reList = responses.stream().map(s -> {
+            DictDto dictDto = new DictDto(s.getCode(), s.getName());
             return dictDto;
         }).collect(Collectors.toList());
         return ResultVOUtils.success(reList);
     }
 
 
-
     /**
      * 获取部门底下仓库列表-关联用户
      *
@@ -135,8 +134,8 @@ public class InvWarehouseController extends BaseController {
     public BaseResponse findByUserOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
         filterInvWarehouseRequest.setUserId(getUserId());
         List<InvWarehouseEntity> invSubWarehouseEntities = invWarehouseService.filterGroupInvSub(filterInvWarehouseRequest);
-        List<DictDto> reList = invSubWarehouseEntities.stream().map(s-> {
-            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+        List<DictDto> reList = invSubWarehouseEntities.stream().map(s -> {
+            DictDto dictDto = new DictDto(s.getCode(), s.getName());
             return dictDto;
         }).collect(Collectors.toList());
         return ResultVOUtils.success(reList);
@@ -160,8 +159,8 @@ public class InvWarehouseController extends BaseController {
     @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());
+        List<DictDto> reList = invSubWarehouseEntities.stream().map(s -> {
+            DictDto dictDto = new DictDto(s.getCode(), s.getName());
             return dictDto;
         }).collect(Collectors.toList());
         return ResultVOUtils.success(reList);
@@ -197,8 +196,8 @@ public class InvWarehouseController extends BaseController {
         }
         filterInvWarehouseRequest.setUserId(userId);
         List<InvWarehouseEntity> list = invWarehouseService.findInvListByUser(filterInvWarehouseRequest);
-        List<DictDto> reList = list.stream().map(s-> {
-            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+        List<DictDto> reList = list.stream().map(s -> {
+            DictDto dictDto = new DictDto(s.getCode(), s.getName());
             return dictDto;
         }).collect(Collectors.toList());
         return ResultVOUtils.success(reList);
@@ -231,8 +230,8 @@ public class InvWarehouseController extends BaseController {
             ).collect(Collectors.toList());
             list.addAll(preInList);
         }
-        List<DictDto> reList = list.stream().map(s-> {
-            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+        List<DictDto> reList = list.stream().map(s -> {
+            DictDto dictDto = new DictDto(s.getCode(), s.getName());
             return dictDto;
         }).collect(Collectors.toList());
         return ResultVOUtils.success(reList);
@@ -322,8 +321,8 @@ public class InvWarehouseController extends BaseController {
         }
         List<InvWarehouseEntity> list = results.stream().distinct().collect(Collectors.toList());
 
-        List<DictDto> reList = list.stream().map(s-> {
-            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+        List<DictDto> reList = list.stream().map(s -> {
+            DictDto dictDto = new DictDto(s.getCode(), s.getName());
             return dictDto;
         }).collect(Collectors.toList());
         return ResultVOUtils.success(reList);
@@ -367,6 +366,21 @@ public class InvWarehouseController extends BaseController {
     }
 
 
+    /**
+     * 获取申购仓库
+     *
+     * @param filterInvWarehouseRequest
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/inv/warehouse/findSgInv")
+    public BaseResponse findSgInv(FilterInvSubWarehouseRequest filterInvWarehouseRequest) {
+        filterInvWarehouseRequest.setSgInvType(true);
+        List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvSubWarehouse(filterInvWarehouseRequest);
+        return ResultVOUtils.success(invWarehouseEntities);
+    }
+
+
     @AuthRuleAnnotation("")
     @GetMapping("spms/sub/inv/warehouse/filterSub")
     public BaseResponse filterSub(FilterInvWarehouseRequest filterInvWarehouseRequest) {

src/main/java/com/glxp/api/entity/auth/InvWarehouseEntity.java

@@ -99,6 +99,13 @@ public class InvWarehouseEntity {
      */
     @TableField(value = "lyInvType")
     private Boolean lyInvType;
+    /**
+     * 是否申购仓库
+     */
+    @TableField(value = "sgInvType")
+    private Boolean sgInvType;
+
+
 
 
     @TableField(exist = false)

src/main/java/com/glxp/api/req/auth/FilterInvSubWarehouseRequest.java

@@ -22,4 +22,5 @@ public class FilterInvSubWarehouseRequest extends ListPageRequest {
     private String key;
     private Integer filterAdvanceType;
     private Boolean lyInvType;
+    private Boolean sgInvType;
 }

src/main/java/com/glxp/api/res/auth/InvSubWarehouseResponse.java

@@ -25,4 +25,5 @@ public class InvSubWarehouseResponse {
     private Boolean spUse;
 
     private Boolean lyInvType;
+    private Boolean sgInvType;
 }

src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml

@@ -16,6 +16,9 @@
             <if test="lyInvType != null">
                 AND a.lyInvType = #{lyInvType}
             </if>
+            <if test="sgInvType != null">
+                AND a.sgInvType = #{sgInvType}
+            </if>
 
             <if test="name != '' and name != null">
                 AND a.name like concat('%', #{name}, '%')
@@ -276,7 +279,7 @@
                a.parentCode,
                c.name    parentInvName,
                a.spUse,
-               a.lyInvType
+               a.lyInvType,a.sgInvType
         FROM auth_warehouse a
                      left join auth_dept b on a.parentId = b.code
                      left join auth_warehouse c on a.parentCode = c.code

src/main/resources/schemas/schema_v2.3.sql

@@ -1006,6 +1006,7 @@ CALL Pro_Temp_ColumnWork('io_stat_year', 'invCode', 'varchar(255)', 1);
 
 
 CALL Pro_Temp_ColumnWork('auth_warehouse', 'lyInvType', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('auth_warehouse', 'sgInvType', 'tinyint', 1);
 
 CALL Pro_Temp_ColumnWork('pur_receive_detail', 'price', 'decimal(10, 2)', 1);
 CALL Pro_Temp_ColumnWork('basic_corp', 'adSickNum', 'varchar(255)', 1);