From 36a026f075be8e6ed4650a17263e7dbdd405b373 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 18 Apr 2024 09:52:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=B4=AD=E4=BB=93=E5=BA=93=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/InvWarehouseController.java | 40 +++++++++++++------ .../api/entity/auth/InvWarehouseEntity.java | 7 ++++ .../auth/FilterInvSubWarehouseRequest.java | 1 + .../api/res/auth/InvSubWarehouseResponse.java | 1 + .../mybatis/mapper/auth/InvWarehouseDao.xml | 5 ++- src/main/resources/schemas/schema_v2.3.sql | 1 + 6 files changed, 41 insertions(+), 14 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 6b8d30473..5301d74e7 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/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 responses = invWarehouseService.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest); - List reList = responses.stream().map(s-> { - DictDto dictDto = new DictDto(s.getCode(),s.getName()); + List 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 invSubWarehouseEntities = invWarehouseService.filterGroupInvSub(filterInvWarehouseRequest); - List reList = invSubWarehouseEntities.stream().map(s-> { - DictDto dictDto = new DictDto(s.getCode(),s.getName()); + List 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 invSubWarehouseEntities = invWarehouseService.filterGroupBySpuse(filterInvWarehouseRequest); - List reList = invSubWarehouseEntities.stream().map(s-> { - DictDto dictDto = new DictDto(s.getCode(),s.getName()); + List 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 list = invWarehouseService.findInvListByUser(filterInvWarehouseRequest); - List reList = list.stream().map(s-> { - DictDto dictDto = new DictDto(s.getCode(),s.getName()); + List 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 reList = list.stream().map(s-> { - DictDto dictDto = new DictDto(s.getCode(),s.getName()); + List 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 list = results.stream().distinct().collect(Collectors.toList()); - List reList = list.stream().map(s-> { - DictDto dictDto = new DictDto(s.getCode(),s.getName()); + List 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 invWarehouseEntities = invWarehouseService.filterInvSubWarehouse(filterInvWarehouseRequest); + return ResultVOUtils.success(invWarehouseEntities); + } + + @AuthRuleAnnotation("") @GetMapping("spms/sub/inv/warehouse/filterSub") public BaseResponse filterSub(FilterInvWarehouseRequest filterInvWarehouseRequest) { diff --git a/src/main/java/com/glxp/api/entity/auth/InvWarehouseEntity.java b/src/main/java/com/glxp/api/entity/auth/InvWarehouseEntity.java index e9ab933e8..da0e864af 100644 --- a/src/main/java/com/glxp/api/entity/auth/InvWarehouseEntity.java +++ b/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) diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvSubWarehouseRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvSubWarehouseRequest.java index 2fb9458d9..2eaab8667 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvSubWarehouseRequest.java +++ b/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; } diff --git a/src/main/java/com/glxp/api/res/auth/InvSubWarehouseResponse.java b/src/main/java/com/glxp/api/res/auth/InvSubWarehouseResponse.java index 46413bd3f..d1e4f314f 100644 --- a/src/main/java/com/glxp/api/res/auth/InvSubWarehouseResponse.java +++ b/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; } diff --git a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml index 2a03cbf20..3437e128f 100644 --- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml @@ -16,6 +16,9 @@ AND a.lyInvType = #{lyInvType} + + AND a.sgInvType = #{sgInvType} + 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 diff --git a/src/main/resources/schemas/schema_v2.3.sql b/src/main/resources/schemas/schema_v2.3.sql index 853bfef8d..7dbdee952 100644 --- a/src/main/resources/schemas/schema_v2.3.sql +++ b/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);