From 4ed43cda03c12d54cea9f36b8218a08273eb7aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 9 May 2023 17:27:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=B4=A7=E6=9E=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inv/InvPreProductController.java | 9 ++- .../inv/InvPreinProductController.java | 14 ++-- .../glxp/api/dao/inv/InvPreProductDao.java | 4 + .../glxp/api/dao/inv/InvPreinProductDao.java | 6 ++ .../req/inv/FilterInvPreProductRequest.java | 6 ++ .../req/inv/FilterInvPreinProductRequest.java | 2 + .../api/service/inv/InvPreProductService.java | 5 ++ .../service/inv/InvPreinProductService.java | 5 ++ .../inv/impl/InvPreProductServiceImpl.java | 11 +++ .../inv/impl/InvPreinProductServiceImpl.java | 11 +++ .../mybatis/mapper/inv/InvPreProductDao.xml | 81 +++++++++++++++++++ .../mybatis/mapper/inv/InvPreinProductDao.xml | 81 +++++++++++++++++++ .../mapper/inv/invProductDetailDao.xml | 8 +- 13 files changed, 233 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java b/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java index 539ee80f3..ab66a8ddc 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java @@ -71,7 +71,14 @@ public class InvPreProductController extends BaseController { filterInvPreProductRequest.setInvCodes(invCodes); } } - List list = invPreProductService.filterList(filterInvPreProductRequest); + List list = new ArrayList<>(); + + if (StrUtil.isNotEmpty(filterInvPreProductRequest.getInvSpaceCode())) { + list = invPreProductService.findGroupBySpace(filterInvPreProductRequest); + } else { + list = invPreProductService.filterList(filterInvPreProductRequest); + } + PageInfo pageInfo = new PageInfo<>(list); InvPreProductPageResponse pageResponse = new InvPreProductPageResponse<>(); pageResponse.setList(pageInfo.getList()); diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java b/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java index d3ad067fe..235a53390 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java @@ -13,10 +13,7 @@ import com.glxp.api.req.inv.FilterInvPreProductDetailRequest; import com.glxp.api.req.inv.FilterInvPreinDetailRequest; import com.glxp.api.req.inv.FilterInvPreinProductRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.inv.InvPreProductDetailResponse; -import com.glxp.api.res.inv.InvPreProductPageResponse; -import com.glxp.api.res.inv.InvPreinDetailResponse; -import com.glxp.api.res.inv.InvPreinProductResponse; +import com.glxp.api.res.inv.*; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.WarehouseUserService; import com.glxp.api.service.inv.InvPreinDetailService; @@ -65,7 +62,14 @@ public class InvPreinProductController extends BaseController { filterInvPreinProductRequest.setInvCodes(invCodes); } } - List list = invPreinProductService.filterList(filterInvPreinProductRequest); + + List list = new ArrayList<>(); + if (StrUtil.isNotEmpty(filterInvPreinProductRequest.getInvSpaceCode())) { + list = invPreinProductService.findGroupBySpace(filterInvPreinProductRequest); + } else { + list = invPreinProductService.filterList(filterInvPreinProductRequest); + } + PageInfo pageInfo = new PageInfo<>(list); InvPreProductPageResponse pageResponse = new InvPreProductPageResponse<>(); pageResponse.setList(pageInfo.getList()); diff --git a/src/main/java/com/glxp/api/dao/inv/InvPreProductDao.java b/src/main/java/com/glxp/api/dao/inv/InvPreProductDao.java index d97268869..363c17af3 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPreProductDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPreProductDao.java @@ -33,5 +33,9 @@ public interface InvPreProductDao extends BaseMapperPlus filterPreProductList(FilterInvPreProductRequest invPreProductRequest); + List findGroupBySpace(FilterInvPreProductRequest invPreProductRequest); + + + } diff --git a/src/main/java/com/glxp/api/dao/inv/InvPreinProductDao.java b/src/main/java/com/glxp/api/dao/inv/InvPreinProductDao.java index 785a06c56..90ae59f22 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPreinProductDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPreinProductDao.java @@ -2,7 +2,9 @@ package com.glxp.api.dao.inv; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inv.InvPreinProductEntity; +import com.glxp.api.req.inv.FilterInvPreProductRequest; import com.glxp.api.req.inv.FilterInvPreinProductRequest; +import com.glxp.api.res.inv.InvPreProductResponse; import com.glxp.api.res.inv.InvPreinProductResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -33,4 +35,8 @@ public interface InvPreinProductDao extends BaseMapperPlus filterPreProductList(FilterInvPreinProductRequest invPreProductRequest); + List findGroupBySpace(FilterInvPreinProductRequest invPreProductRequest); + + + } diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvPreProductRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvPreProductRequest.java index 4aeb982cd..3074d58c9 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterInvPreProductRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterInvPreProductRequest.java @@ -98,6 +98,12 @@ public class FilterInvPreProductRequest extends ListPageRequest { */ private String cplb; + /** + * 货位号 + */ + private String invSpaceCode; + + /** * 是否过滤0库存 */ diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvPreinProductRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvPreinProductRequest.java index 6def0ab36..9c2583dae 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterInvPreinProductRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterInvPreinProductRequest.java @@ -103,6 +103,8 @@ public class FilterInvPreinProductRequest extends ListPageRequest { */ private String cplb; + private String invSpaceCode; + /** * 是否过滤0库存 */ diff --git a/src/main/java/com/glxp/api/service/inv/InvPreProductService.java b/src/main/java/com/glxp/api/service/inv/InvPreProductService.java index 8db3bcdc9..f276d679e 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreProductService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreProductService.java @@ -4,7 +4,9 @@ import com.glxp.api.entity.inv.InvPreProductEntity; import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.req.inv.FilterInvPreProductRequest; +import com.glxp.api.req.inv.FilterInvProductRequest; import com.glxp.api.res.inv.InvPreProductResponse; +import com.glxp.api.res.inv.InvProductResponse; import java.util.List; @@ -30,6 +32,9 @@ public interface InvPreProductService { */ List filterList(FilterInvPreProductRequest invPreProductRequest); + + List findGroupBySpace(FilterInvPreProductRequest invPreProductRequest); + /** * 查询寄售库存列表 * diff --git a/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java b/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java index d1369a83b..fdf98ea66 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java @@ -1,7 +1,9 @@ package com.glxp.api.service.inv; import com.glxp.api.entity.inv.InvPreinProductEntity; +import com.glxp.api.req.inv.FilterInvPreProductRequest; import com.glxp.api.req.inv.FilterInvPreinProductRequest; +import com.glxp.api.res.inv.InvPreProductResponse; import com.glxp.api.res.inv.InvPreinProductResponse; import java.util.List; @@ -36,6 +38,9 @@ public interface InvPreinProductService { */ List filterPreinProductList(FilterInvPreinProductRequest invPreProductRequest); + List findGroupBySpace(FilterInvPreinProductRequest filterInvPreinDetailRequest); + + /** * 根据ID查询寄售库存信息 * diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java index b4f6a5d98..126f48011 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java @@ -58,6 +58,17 @@ public class InvPreProductServiceImpl implements InvPreProductService { return invPreProductDao.filterList(invPreProductRequest); } + @Override + public List findGroupBySpace(FilterInvPreProductRequest invPreProductRequest) { + if (null == invPreProductRequest) { + return Collections.emptyList(); + } + if (null != invPreProductRequest.getPage() && null != invPreProductRequest.getLimit()) { + PageHelper.offsetPage((invPreProductRequest.getPage() - 1) * invPreProductRequest.getLimit(), invPreProductRequest.getLimit()); + } + return invPreProductDao.findGroupBySpace(invPreProductRequest); + } + @Override public List filterPreProductList(FilterInvPreProductRequest invPreProductRequest) { if (null == invPreProductRequest) { diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java index fa195182c..eb5f45a85 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java @@ -68,6 +68,17 @@ public class InvPreinProductServiceImpl implements InvPreinProductService { return invPreinProductDao.filterPreProductList(invPreProductRequest); } + @Override + public List findGroupBySpace(FilterInvPreinProductRequest invPreProductRequest) { + if (null == invPreProductRequest) { + return Collections.emptyList(); + } + if (null != invPreProductRequest.getPage()) { + PageHelper.offsetPage((invPreProductRequest.getPage() - 1) * invPreProductRequest.getLimit(), invPreProductRequest.getLimit()); + } + return invPreinProductDao.findGroupBySpace(invPreProductRequest); + } + @Override public InvPreinProductEntity findById(String id) { return invPreinProductDao.selectById(id); diff --git a/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml index 6dcb9fe21..dd1c00110 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml @@ -136,4 +136,85 @@ + + diff --git a/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml index 45109277a..a91705992 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml @@ -135,4 +135,85 @@ + + diff --git a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml index f2c474299..82731773f 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml @@ -14,9 +14,9 @@ ipp.expireDate, bp.ylqxzcrbarmc, bp.zczbhhzbapzbh, - ipp.inCount, - ipp.outCount, - ipp.reCount, + sum(ipp.inCount) as inCount, + sum(ipp.outCount) as outCount, + sum(ipp.reCount) as reCount, basic_corp.name supName, ipp.supId, auth_dept.name deptName, @@ -30,7 +30,7 @@ left join basic_corp on ipp.supId = basic_corp.erpId left join auth_dept on auth_dept.code = ipp.deptCode left join auth_warehouse on auth_warehouse.code = ipp.invCode - left join auth_space `as` on ipp.code = `as`.code + left join auth_space `as` on ipp.invSpaceCode = `as`.code AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')