From 37c9d2d6aa833e5dc596639bc64e6d91a0c3e242 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 2 Sep 2022 17:53:58 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E8=BF=9B=E5=8F=A3=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E4=BB=A3=E7=90=86=E5=95=86=E5=AD=97=E6=AE=B5=202.?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/InvBusUserController.java | 22 +++++++++++++++++++ .../dao/inout/WarehouseBussinessTypeDao.java | 9 +++++++- .../admin/entity/basic/UdiInfoEntity.java | 3 +++ .../CompanyProductRelevanceResponse.java | 3 +++ .../admin/res/basic/UdiRelevanceResponse.java | 3 +++ .../inout/WarehouseBussinessTypeService.java | 8 +++++++ .../WarehouseBussinessTypeServiceImpl.java | 5 +++++ .../inventory/impl/InvBusUserServiceImpl.java | 6 ++++- .../mybatis/mapper/basic/UdiInfoDao.xml | 1 + .../mybatis/mapper/basic/UdiRelevanceDao.xml | 3 +++ .../info/CompanyProductRelevanceDao.xml | 1 + .../inout/WarehouseBussinessTypeDao.xml | 6 +++++ 12 files changed, 68 insertions(+), 2 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvBusUserController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvBusUserController.java index 1515126..61b30ef 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvBusUserController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvBusUserController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.inventory; import cn.hutool.core.collection.CollUtil; +import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.sale.admin.entity.inventory.InvBusUserEntity; @@ -9,6 +10,7 @@ import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.inventory.FilterInvBusUserRequest; import com.glxp.sale.admin.req.inventory.UpdateRelBusRequset; +import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.service.inout.WarehouseBussinessTypeService; import com.glxp.sale.admin.service.inventory.InvBusUserService; import com.glxp.sale.admin.service.inventory.InvSubWarehouseService; @@ -26,6 +28,7 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; @RestController public class InvBusUserController { @@ -57,6 +60,25 @@ public class InvBusUserController { return ResultVOUtils.success(warehouseBussinessTypeEntities); } + /** + * 查询用户关联的单据类型 + * + * @param filterInvBusUserRequest + * @return + */ + @AuthRuleAnnotation("") + @GetMapping("spms/bus/user/filterUserBusList") + public BaseResponse filterUserBusList(FilterInvBusUserRequest filterInvBusUserRequest) { + List responses = invBusUserService.filterInvBusUser(filterInvBusUserRequest); + PageInfo pageInfo = new PageInfo<>(responses); + List actions = responses.stream().map(InvBusUserEntity::getScAction).collect(Collectors.toList()); + List warehouseBussinessTypeEntities = warehouseBussinessTypeService.selectByActions(filterInvBusUserRequest.getSubInvCode(), actions); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(warehouseBussinessTypeEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + @AuthRuleAnnotation("") @PostMapping("/spms/bus/user/warehouse/update") public BaseResponse updateRes(@RequestBody UpdateRelBusRequset relBusRequset) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/WarehouseBussinessTypeDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/WarehouseBussinessTypeDao.java index a80db37..fb200f0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/WarehouseBussinessTypeDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/WarehouseBussinessTypeDao.java @@ -2,7 +2,6 @@ package com.glxp.sale.admin.dao.inout; import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.sale.admin.req.basic.FilterInvBusTypeRequest; -import com.glxp.sale.admin.req.inventory.FilterInvUserRequest; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -39,4 +38,12 @@ public interface WarehouseBussinessTypeDao { List filterList(FilterInvBusTypeRequest filterInvUserRequest); void deleteByCode(@Param("code") String code); + + /** + * 根据单据类型编码查询单据类型列表 + * + * @param actions + * @return + */ + List selectByActions(@Param("subInvCode") String subInvCode, @Param("actions") List actions); } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java index 44b6c48..dc7c13e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java @@ -67,6 +67,9 @@ public class UdiInfoEntity { private String price; + //产品代理商 + private String cpdls; + public Integer getId() { return id; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java index 1bca665..ff8782b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java @@ -72,4 +72,7 @@ public class CompanyProductRelevanceResponse { private String price; + //产品代理商 + private String cpdls; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java index e7272fc..022786a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java @@ -74,6 +74,9 @@ public class UdiRelevanceResponse { private String price; + //产品代理商 + private String cpdls; + public int getBhzxxsbzsl() { if (bhzxxsbzsl == null || bhzxxsbzsl == 0) { return 1; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseBussinessTypeService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseBussinessTypeService.java index c320c65..cfe978b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseBussinessTypeService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseBussinessTypeService.java @@ -38,4 +38,12 @@ public interface WarehouseBussinessTypeService { List getWarehouseBussniessTypeList(FilterInvLinkDataRequest filterInvLinkDataRequest); + + /** + * 根据单据类型编码查询单据类型列表 + * + * @param actions + * @return + */ + List selectByActions(String subInvCode, List actions); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java index 2d1583b..7b296c0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java @@ -86,4 +86,9 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType } return warehouseBussinessTypeDao.selectListByCode(filterInvLinkDataRequest.getCode()); } + + @Override + public List selectByActions(String subInvCode, List actions) { + return warehouseBussinessTypeDao.selectByActions(subInvCode, actions); + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvBusUserServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvBusUserServiceImpl.java index bd72645..25ea6c9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvBusUserServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvBusUserServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.service.inventory.impl; import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.inventory.InvBusUserDao; import com.glxp.sale.admin.entity.inventory.InvBusUserEntity; import com.glxp.sale.admin.req.inventory.FilterInvBusUserRequest; @@ -19,10 +20,13 @@ public class InvBusUserServiceImpl implements InvBusUserService { @Override public List filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest) { - if (filterInvBusUserRequest == null) { return Collections.emptyList(); } + if (filterInvBusUserRequest.getPage() != null) { + int offset = (filterInvBusUserRequest.getPage() - 1) * filterInvBusUserRequest.getLimit(); + PageHelper.offsetPage(offset, filterInvBusUserRequest.getLimit()); + } return invBusUserDao.filterInvBusUser(filterInvBusUserRequest); } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml index b98f59a..799178d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml @@ -271,6 +271,7 @@ allowNoExpire=#{allowNoExpire}, allowNoProduct=#{allowNoProduct}, spmc=#{spmc}, + cpdls=#{cpdls}, WHERE nameCode = #{nameCode} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index cf46620..e3c559d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -27,6 +27,7 @@ basic_products.diType,basic_products.productType,basic_products.scbssfbhph, basic_products.scbssfbhxlh, basic_products.scbssfbhscrq, + basic_products.cpdls, basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid FROM basic_udirel inner JOIN basic_products @@ -114,6 +115,7 @@ basic_products.diType,basic_products.productType,basic_products.scbssfbhph, basic_products.scbssfbhxlh, basic_products.scbssfbhscrq, + basic_products.cpdls, basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,company_product_relevance.unitFk, customer_info.companyName,basic_products.originUuid FROM basic_udirel @@ -204,6 +206,7 @@ basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph, basic_products.scbssfbhxlh, basic_products.scbssfbhscrq, + basic_products.cpdls, basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid,basic_products.spmc FROM basic_products right JOIN basic_udirel diff --git a/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml index 72f0c34..7f75381 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml @@ -51,6 +51,7 @@ basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph, basic_products.scbssfbhxlh, basic_products.scbssfbhscrq, + basic_products.cpdls, basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid,company_product_relevance.price,basic_products.spmc FROM company_product_relevance inner JOIN basic_udirel diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml index 1f8ca59..db2d998 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml @@ -272,6 +272,12 @@ where code = #{code} + delete