diff --git a/src/main/java/com/glxp/api/controller/inv/InvProductController.java b/src/main/java/com/glxp/api/controller/inv/InvProductController.java index c0f707b5a..d0f615e6e 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java @@ -142,4 +142,38 @@ public class InvProductController { } } + /** + * 库存统计 + * + * @param filterInvProductRequest + * @return + */ + @GetMapping("/spms/inv/product/stockStatistics") + public BaseResponse stockStatistics(FilterInvProductRequest filterInvProductRequest) { + boolean showSup = true; + if (StrUtil.isBlank(filterInvProductRequest.getInvCode())) { + List invCodes = warehouseUserService.selectCodeByUser(customerService.getUserIdStr()); + filterInvProductRequest.setInvCodes(invCodes); + } + + List invProductResponses; + if (StrUtil.isBlank(filterInvProductRequest.getCpmctymc()) && StrUtil.isBlank(filterInvProductRequest.getNameCode()) + && StrUtil.isBlank(filterInvProductRequest.getGgxh()) && StrUtil.isBlank(filterInvProductRequest.getZczbhhzbapzbh()) + && StrUtil.isBlank(filterInvProductRequest.getYlqxzcrbarmc()) && StrUtil.isBlank(filterInvProductRequest.getSupId()) + && StrUtil.isBlank(filterInvProductRequest.getInvCode()) && StrUtil.isBlank(filterInvProductRequest.getBatchNo()) + ) { + //查询参数为空,走库存查询逻辑 + invProductResponses = invProductService.filterList(filterInvProductRequest); + } else { + //查询参数不为空,走库存统计逻辑 + invProductResponses = invProductService.stockStatistics(filterInvProductRequest); + } + PageInfo pageInfo = new PageInfo<>(invProductResponses); + InvProductPageResponse pageResponse = new InvProductPageResponse<>(); + pageResponse.setTotal(pageInfo.getTotal()); + pageResponse.setList(pageInfo.getList()); + pageResponse.setShowSup(showSup); + return ResultVOUtils.success(pageResponse); + } + } diff --git a/src/main/java/com/glxp/api/dao/inv/InvProductDao.java b/src/main/java/com/glxp/api/dao/inv/InvProductDao.java index 22789e4d9..bb513dd41 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvProductDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvProductDao.java @@ -18,4 +18,12 @@ public interface InvProductDao extends BaseMapperPlus filterList(FilterInvProductRequest filterInvProductRequest); + + /** + * 库存统计查询 + * + * @param filterInvProductRequest + * @return + */ + List stockStatistics(FilterInvProductRequest filterInvProductRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/InvProductService.java b/src/main/java/com/glxp/api/service/inv/InvProductService.java index 8f06e058d..afa048502 100644 --- a/src/main/java/com/glxp/api/service/inv/InvProductService.java +++ b/src/main/java/com/glxp/api/service/inv/InvProductService.java @@ -40,4 +40,12 @@ public interface InvProductService { * @return */ boolean deleteById(String id); + + /** + * 库存统计 + * + * @param filterInvProductRequest + * @return + */ + List stockStatistics(FilterInvProductRequest filterInvProductRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java index 9658dc350..fcbdd8692 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java @@ -63,4 +63,15 @@ public class InvProductServiceImpl implements InvProductService { return invProductDao.deleteById(id) == 1 ? true : false; } + @Override + public List stockStatistics(FilterInvProductRequest filterInvProductRequest) { + if (null == filterInvProductRequest) { + return Collections.emptyList(); + } + if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) { + PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit()); + } + return invProductDao.stockStatistics(filterInvProductRequest); + } + } \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml index 72500b80b..435235af5 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml @@ -80,4 +80,62 @@ + +