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 3595e4427..c628eb50c 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java @@ -234,4 +234,17 @@ public class InvProductController { return ResultVOUtils.success(count); } + /** + * 查询库存产品名称列表 + * + * @param filterInvProductRequest + * @return + */ + @GetMapping("spms/inv/product/filterProductNames") + public BaseResponse filterProductNames(FilterInvProductRequest filterInvProductRequest) { + List list = invProductService.filterProductNames(filterInvProductRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + } 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 09609b79a..6fe55787f 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvProductDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvProductDao.java @@ -65,4 +65,12 @@ public interface InvProductDao extends BaseMapperPlus selectInvProductInfo(@Param("invCode") String invCode, @Param("invSpaceCode") String invSpaceCode, @Param("relId") String relId); + + /** + * 查询库存产品名称列表 + * + * @param filterProductNames + * @return + */ + List filterProductNames(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 4fc3e6a95..3c650de25 100644 --- a/src/main/java/com/glxp/api/service/inv/InvProductService.java +++ b/src/main/java/com/glxp/api/service/inv/InvProductService.java @@ -65,4 +65,12 @@ public interface InvProductService { */ List getCountInvProduct(FilterInvProductRequest filterInvProductRequest); + /** + * 查询库存产品名称列表 + * + * @param filterInvProductRequest + * @return + */ + List filterProductNames(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 3f304e95c..e37a75986 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 @@ -98,4 +98,15 @@ public class InvProductServiceImpl implements InvProductService { return invProductDao.getCountInvProduct(filterInvProductRequest); } + @Override + public List filterProductNames(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.filterProductNames(filterInvProductRequest); + } + } diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml index 5e14f5c5a..da5230b58 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml @@ -15,9 +15,9 @@ ip.expireDate, bp.ylqxzcrbarmc, bp.zczbhhzbapzbh, - sum(ip.inCount) as inCount, + sum(ip.inCount) as inCount, sum(ip.outCount) as outCount, - sum(ip.reCount)as reCount, + sum(ip.reCount) as reCount, ip.customerId, basic_corp.name supName, ip.supId, @@ -264,4 +264,24 @@ group by ip.relIdFk, ip.batchNo, ip.invCode, ipd.invSpaceCode + +