diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvBusUserController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvBusUserController.java index 39e11fce..a5d51045 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvBusUserController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvBusUserController.java @@ -1,6 +1,7 @@ package com.glxp.api.admin.controller.inventory; import cn.hutool.core.collection.CollUtil; +import com.github.pagehelper.PageInfo; import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.api.admin.entity.inventory.InvBusUserEntity; @@ -9,6 +10,7 @@ import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest; import com.glxp.api.admin.req.inventory.UpdateRelBusRequset; +import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.service.inout.WarehouseBussinessTypeService; import com.glxp.api.admin.service.inventory.InvBusUserService; import com.glxp.api.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 { @@ -60,6 +63,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/api/admin/dao/inout/WarehouseBussinessTypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseBussinessTypeDao.java index 043bfc13..7a1f8c58 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseBussinessTypeDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseBussinessTypeDao.java @@ -36,4 +36,12 @@ public interface WarehouseBussinessTypeDao { List filterList(FilterInvBusTypeRequest filterInvBusTypeRequest); 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/api/admin/entity/basic/UdiInfoEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java index 6bc5dc2c..6c75aaac 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java @@ -66,6 +66,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/api/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java index 55ae37b1..05c20b36 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java @@ -72,6 +72,9 @@ public class UdiRelevanceResponse { private String price; private String spmc; + //产品代理商 + private String cpdls; + public int getBhzxxsbzsl() { if (bhzxxsbzsl == null || bhzxxsbzsl == 0) { return 1; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java index d024f160..6a5756a2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java @@ -70,4 +70,8 @@ public class CompanyProductRelevanceResponse { private String price; private String spmc; + + //产品代理商 + private String cpdls; + } 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 fe7d5695..d129d077 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 @@ -44,4 +44,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/api/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java index 70882185..f0f91fd0 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 @@ -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/api/admin/service/inventory/impl/InvBusUserServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvBusUserServiceImpl.java index ea9104da..58e1ef52 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvBusUserServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvBusUserServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.admin.service.inventory.impl; import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageHelper; import com.glxp.api.admin.dao.inventory.InvBusUserDao; import com.glxp.api.admin.entity.inventory.InvBusUserEntity; import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest; @@ -23,6 +24,10 @@ public class InvBusUserServiceImpl implements InvBusUserService { 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/CompanyProductRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml index 9f45dea9..d3d2c5cb 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml @@ -52,7 +52,7 @@ basic_products.scbssfbhxlh, basic_products.scbssfbhscrq, basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid,company_product_relevance.price - ,basic_products.spmc + ,basic_products.spmc, basic_products.cpdls FROM company_product_relevance inner JOIN basic_udirel ON company_product_relevance.udiRlIdFk = basic_udirel.id 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 a173d598..4bb01567 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml @@ -264,6 +264,7 @@ allowNoBatch=#{allowNoBatch}, allowNoExpire=#{allowNoExpire}, allowNoProduct=#{allowNoProduct}, + 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 7c625b22..561fedd6 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 @@ -112,6 +113,7 @@ basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber, basic_products.diType,basic_products.productType,basic_products.scbssfbhph, basic_products.scbssfbhxlh, + basic_products.cpdls, basic_products.scbssfbhscrq,basic_corp.name companyName, basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,company_product_relevance.unitFk,basic_products.originUuid FROM basic_udirel @@ -202,6 +204,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/inout/WarehouseBussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml index 214890c3..7e1cf3ee 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml @@ -278,4 +278,11 @@ from inv_warehouse_bussiness_type where code = #{code} + + \ No newline at end of file