From 6e18732ea456efb83b8c909b08412ba46fca2231 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 29 Jul 2022 15:08:18 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BB=93=E5=BA=93=E5=85=B3=E8=81=94=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=92=8C=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/WareHouseController.java | 45 ++++++++++++------- .../inventory/FilterInvLinkDataRequest.java | 19 ++++++++ .../inout/WarehouseBussinessTypeService.java | 10 +++++ .../service/inout/WarehouseUserService.java | 10 +++++ .../WarehouseBussinessTypeServiceImpl.java | 13 ++++++ .../inout/impl/WarehouseUserServiceImpl.java | 13 ++++++ 6 files changed, 95 insertions(+), 15 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvLinkDataRequest.java diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index 7eb6bf86..121aa6b4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -27,6 +27,7 @@ import com.glxp.api.admin.exception.JsonException; import com.glxp.api.admin.httpclient.SpsDirectClient; import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.admin.req.inout.*; +import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.BussinessTypResponse; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; @@ -1172,27 +1173,41 @@ public class WareHouseController { * @return */ @AuthRuleAnnotation("") - @GetMapping("/warehouse/inout/warehouseUserList") - public BaseResponse getWarehouseUserList(String code) { - if (StringUtils.isBlank(code)) + @PostMapping("/warehouse/inout/warehouseUserList") + public BaseResponse getWarehouseUserList(@RequestBody @Valid FilterInvLinkDataRequest filterInvLinkDataRequest) { + if (null == filterInvLinkDataRequest || StrUtil.isBlank(filterInvLinkDataRequest.getCode())) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - List warehouseUserEntities = warehouseUserService.getListByCode(code); + } + List warehouseUserEntities = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest); + PageInfo pageInfo = new PageInfo<>(warehouseUserEntities); + List result = new ArrayList<>(); - warehouseUserEntities.forEach(warehouseUserEntity -> { - WarehouseUserResponse warehouseUserResponse = new WarehouseUserResponse(); - BeanUtils.copyProperties(warehouseUserEntity, warehouseUserResponse); - warehouseUserResponse.setUserid(warehouseUserEntity.getUserid() + ""); - result.add(warehouseUserResponse); - }); - return ResultVOUtils.success(result); + if (CollUtil.isNotEmpty(pageInfo.getList())) { + pageInfo.getList().forEach(warehouseUserEntity -> { + WarehouseUserResponse warehouseUserResponse = new WarehouseUserResponse(); + BeanUtils.copyProperties(warehouseUserEntity, warehouseUserResponse); + warehouseUserResponse.setUserid(warehouseUserEntity.getUserid() + ""); + result.add(warehouseUserResponse); + }); + } + PageSimpleResponse response = new PageSimpleResponse<>(); + response.setList(result); + response.setTotal(pageInfo.getTotal()); + return ResultVOUtils.success(response); } @AuthRuleAnnotation("") - @GetMapping("/warehouse/inout/warehouseBussniessTypeList") - public BaseResponse getWarehouseBussniessTypeList(String code) { - if (StrUtil.isBlank(code)) + @PostMapping("/warehouse/inout/warehouseBussniessTypeList") + public BaseResponse getWarehouseBussniessTypeList(@RequestBody @Valid FilterInvLinkDataRequest filterInvLinkDataRequest) { + if (null == filterInvLinkDataRequest || StrUtil.isBlank(filterInvLinkDataRequest.getCode())) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - return ResultVOUtils.success(warehouseBussinessTypeService.getListByCode(code)); + } + List warehouseBussniessTypeList = warehouseBussinessTypeService.getWarehouseBussniessTypeList(filterInvLinkDataRequest); + PageInfo pageInfo = new PageInfo<>(warehouseBussniessTypeList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setList(pageInfo.getList()); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + return ResultVOUtils.success(pageSimpleResponse); } @AuthRuleAnnotation("") diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvLinkDataRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvLinkDataRequest.java new file mode 100644 index 00000000..c5e9f8f7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvLinkDataRequest.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.req.inventory; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; + +/** + * 查询仓库关联的数据请求参数 + */ +@Data +public class FilterInvLinkDataRequest extends ListPageRequest { + + //分仓码 + @NotEmpty(message = "请选择分仓！") + private String code; + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseBussinessTypeService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseBussinessTypeService.java index a4ec5808..fe7d5695 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseBussinessTypeService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseBussinessTypeService.java @@ -3,6 +3,7 @@ package com.glxp.api.admin.service.inout; import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.api.admin.req.basic.FilterInvBusTypeRequest; +import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest; import com.glxp.api.admin.res.basic.BussinessTypResponse; import java.util.List; @@ -34,4 +35,13 @@ public interface WarehouseBussinessTypeService { * @param id */ void deleteWarehouseByssuinessType(Integer id); + + /** + * 查询仓库关联的单据类型数据 + * + * @param filterInvLinkDataRequest + * @return + */ + List getWarehouseBussniessTypeList(FilterInvLinkDataRequest filterInvLinkDataRequest); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java index 6485e65b..3c1d6035 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java @@ -3,6 +3,7 @@ package com.glxp.api.admin.service.inout; import com.glxp.api.admin.entity.auth.AuthAdmin; import com.glxp.api.admin.entity.inout.WarehouseUserEntity; +import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest; import com.glxp.api.admin.req.inventory.FilterInvUserRequest; import java.util.List; @@ -47,4 +48,13 @@ public interface WarehouseUserService { * @param id */ void deleteWarehouseUser(Integer id); + + /** + * 查询分仓关联的用户列表 + * + * @param filterInvLinkDataRequest + * @return + */ + List getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java index 40dc3b61..70882185 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.admin.dao.inout.WarehouseBussinessTypeDao; import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.api.admin.req.basic.FilterInvBusTypeRequest; +import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest; import com.glxp.api.admin.res.basic.BussinessTypResponse; import com.glxp.api.admin.service.inout.WarehouseBussinessTypeService; import lombok.extern.slf4j.Slf4j; @@ -73,4 +74,16 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType warehouseBussinessTypeDao.deleteByPrimaryKey(id); } } + + @Override + public List getWarehouseBussniessTypeList(FilterInvLinkDataRequest filterInvLinkDataRequest) { + if (filterInvLinkDataRequest == null) { + return Collections.emptyList(); + } + if (filterInvLinkDataRequest.getPage() != null) { + int offset = (filterInvLinkDataRequest.getPage() - 1) * filterInvLinkDataRequest.getLimit(); + PageHelper.offsetPage(offset, filterInvLinkDataRequest.getLimit()); + } + return warehouseBussinessTypeDao.selectListByCode(filterInvLinkDataRequest.getCode()); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java index 38e2f90c..3b89d00c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.admin.dao.inout.WarehouseUserDao; import com.glxp.api.admin.entity.auth.AuthAdmin; import com.glxp.api.admin.entity.inout.WarehouseUserEntity; +import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest; import com.glxp.api.admin.req.inventory.FilterInvUserRequest; import com.glxp.api.admin.service.inout.WarehouseUserService; import lombok.extern.slf4j.Slf4j; @@ -103,4 +104,16 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { warehouseUserDao.deleteByPrimaryKey(id); } } + + @Override + public List getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest) { + if (filterInvLinkDataRequest == null) { + return Collections.emptyList(); + } + if (filterInvLinkDataRequest.getPage() != null) { + int offset = (filterInvLinkDataRequest.getPage() - 1) * filterInvLinkDataRequest.getLimit(); + PageHelper.offsetPage(offset, filterInvLinkDataRequest.getLimit()); + } + return warehouseUserDao.selectListByCode(filterInvLinkDataRequest.getCode()); + } }