From 5aa1b735adbfbbfe975f5641616f0d723d4d0b8e Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 6 Jan 2023 18:51:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=85=B3=E8=81=94=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/InvBusUserController.java | 45 +++++++++++++++++-- .../glxp/api/dao/inventory/InvBusUserDao.java | 3 ++ ...essTypeDao.java => BussinessTypeDao1.java} | 2 +- .../inventory/FilterInvBusUserRequest.java | 4 ++ .../req/inventory/UpdateRelBusRequset.java | 2 +- .../service/inventory/InvBusUserService.java | 3 ++ .../inventory/impl/InvBusUserServiceImpl.java | 13 ++++++ .../mapper/inventory/InvBusUserDao.xml | 25 +++++++++++ ...inessTypeDao.xml => BussinessTypeDao1.xml} | 2 +- 9 files changed, 93 insertions(+), 6 deletions(-) rename src/main/java/com/glxp/api/dao/rebuild/{BussinessTypeDao.java => BussinessTypeDao1.java} (72%) rename src/main/resources/mybatis/mapper/rebuild/{BussinessTypeDao.xml => BussinessTypeDao1.xml} (71%) diff --git a/src/main/java/com/glxp/api/controller/inventory/InvBusUserController.java b/src/main/java/com/glxp/api/controller/inventory/InvBusUserController.java index 38e5efbc..07f851ff 100644 --- a/src/main/java/com/glxp/api/controller/inventory/InvBusUserController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InvBusUserController.java @@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; +import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; @@ -34,14 +35,12 @@ import java.util.stream.Collectors; @RestController public class InvBusUserController { - @Resource InvBusUserService invBusUserService; - - @Resource WarehouseBussinessTypeService warehouseBussinessTypeService; + @AuthRuleAnnotation("") @GetMapping("spms/bus/user/select/filter") public BaseResponse filterSelectInvUser(FilterInvBusUserRequest filterInvBusUserRequest) { @@ -61,6 +60,27 @@ public class InvBusUserController { return ResultVOUtils.success(warehouseBussinessTypeEntities); } + + //查询用户未关联单据类型 + @AuthRuleAnnotation("") + @GetMapping("spms/bus/user/unselect/filter") + public BaseResponse filterUnSelectInvUser(FilterInvBusUserRequest filterInvBusUserRequest) { + List responses = invBusUserService.filterInvBusUser(filterInvBusUserRequest); + List selectedCodes = new ArrayList<>(); + responses.forEach(invBusUserEntity -> + { + selectedCodes.add(invBusUserEntity.getScAction()); + }); + filterInvBusUserRequest.setSelectedCodes(selectedCodes); + List warehouseBussinessTypeEntityList = invBusUserService.filterUnSelect(filterInvBusUserRequest); + + PageInfo pageInfo = new PageInfo<>(warehouseBussinessTypeEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(warehouseBussinessTypeEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + /** * 查询用户关联的单据类型 * @@ -98,7 +118,26 @@ public class InvBusUserController { invBusUserService.insertInvBusUser(invBusUserEntity); }); } + InvBusUserEntity invBusUserEntity = new InvBusUserEntity(); + invBusUserEntity.setSubInvCode(relBusRequset.getSubInvCode()); + updateInvTime(invBusUserEntity); + return ResultVOUtils.success("修改成功！"); + } + @AuthRuleAnnotation("") + @PostMapping("/spms/bus/user/warehouse/post") + public BaseResponse postRes(@RequestBody UpdateRelBusRequset relBusRequset) { + boolean b = invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode()); + if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) { + relBusRequset.getSelectActions().forEach(action -> + { + InvBusUserEntity invBusUserEntity = new InvBusUserEntity(); + invBusUserEntity.setUserId(relBusRequset.getUserId()); + invBusUserEntity.setSubInvCode(relBusRequset.getSubInvCode()); + invBusUserEntity.setScAction(action); + invBusUserService.insertInvBusUser(invBusUserEntity); + }); + } InvBusUserEntity invBusUserEntity = new InvBusUserEntity(); invBusUserEntity.setSubInvCode(relBusRequset.getSubInvCode()); updateInvTime(invBusUserEntity); diff --git a/src/main/java/com/glxp/api/dao/inventory/InvBusUserDao.java b/src/main/java/com/glxp/api/dao/inventory/InvBusUserDao.java index 70e2b045..eba35fdf 100644 --- a/src/main/java/com/glxp/api/dao/inventory/InvBusUserDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InvBusUserDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.inventory; +import com.glxp.api.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.api.entity.inventory.InvBusUserEntity; import com.glxp.api.req.inventory.FilterInvBusUserRequest; import com.glxp.api.res.inventory.InvBusUserResponse; @@ -14,6 +15,8 @@ public interface InvBusUserDao { List filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest); + List filterUnSelect(FilterInvBusUserRequest filterInvBusUserRequest); + List filterJoinInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest); boolean insertInvBusUser(InvBusUserEntity InvBusUserEntity); diff --git a/src/main/java/com/glxp/api/dao/rebuild/BussinessTypeDao.java b/src/main/java/com/glxp/api/dao/rebuild/BussinessTypeDao1.java similarity index 72% rename from src/main/java/com/glxp/api/dao/rebuild/BussinessTypeDao.java rename to src/main/java/com/glxp/api/dao/rebuild/BussinessTypeDao1.java index 2830abb9..ae86ab55 100644 --- a/src/main/java/com/glxp/api/dao/rebuild/BussinessTypeDao.java +++ b/src/main/java/com/glxp/api/dao/rebuild/BussinessTypeDao1.java @@ -5,7 +5,7 @@ import com.glxp.api.entity.rebuild.BussinessTypeEntity; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface BussinessTypeDao extends BaseMapper { +public interface BussinessTypeDao1 extends BaseMapper { } diff --git a/src/main/java/com/glxp/api/req/inventory/FilterInvBusUserRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterInvBusUserRequest.java index 839050a3..a1d2dce2 100644 --- a/src/main/java/com/glxp/api/req/inventory/FilterInvBusUserRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterInvBusUserRequest.java @@ -3,6 +3,8 @@ package com.glxp.api.req.inventory; import com.glxp.api.req.ListPageRequest; import lombok.Data; +import java.util.List; + @Data public class FilterInvBusUserRequest extends ListPageRequest { @@ -10,4 +12,6 @@ public class FilterInvBusUserRequest extends ListPageRequest { private String userId; private String subInvCode; private String scAction; + + private List selectedCodes; } diff --git a/src/main/java/com/glxp/api/req/inventory/UpdateRelBusRequset.java b/src/main/java/com/glxp/api/req/inventory/UpdateRelBusRequset.java index bcde487a..3005db8f 100644 --- a/src/main/java/com/glxp/api/req/inventory/UpdateRelBusRequset.java +++ b/src/main/java/com/glxp/api/req/inventory/UpdateRelBusRequset.java @@ -9,7 +9,7 @@ import java.util.List; public class UpdateRelBusRequset { private String userId; private String subInvCode; - + private List selectActions; private List invBusUserEntities; diff --git a/src/main/java/com/glxp/api/service/inventory/InvBusUserService.java b/src/main/java/com/glxp/api/service/inventory/InvBusUserService.java index 94919523..89d88cfd 100644 --- a/src/main/java/com/glxp/api/service/inventory/InvBusUserService.java +++ b/src/main/java/com/glxp/api/service/inventory/InvBusUserService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.inventory; +import com.glxp.api.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.api.entity.inventory.InvBusUserEntity; import com.glxp.api.req.inventory.FilterInvBusUserRequest; import com.glxp.api.res.inventory.InvBusUserResponse; @@ -11,6 +12,8 @@ public interface InvBusUserService { List filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest); + List filterUnSelect(FilterInvBusUserRequest filterInvBusUserRequest); + List filterJoinInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest); List selectByUnion(String userId, String subInvCode); diff --git a/src/main/java/com/glxp/api/service/inventory/impl/InvBusUserServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InvBusUserServiceImpl.java index 6193d436..a467a216 100644 --- a/src/main/java/com/glxp/api/service/inventory/impl/InvBusUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InvBusUserServiceImpl.java @@ -3,6 +3,7 @@ package com.glxp.api.service.inventory.impl; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inventory.InvBusUserDao; +import com.glxp.api.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.api.entity.inventory.InvBusUserEntity; import com.glxp.api.req.inventory.FilterInvBusUserRequest; import com.glxp.api.res.inventory.InvBusUserResponse; @@ -32,6 +33,18 @@ public class InvBusUserServiceImpl implements InvBusUserService { return invBusUserDao.filterInvBusUser(filterInvBusUserRequest); } + @Override + public List filterUnSelect(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.filterUnSelect(filterInvBusUserRequest); + } + @Override public List filterJoinInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest) { diff --git a/src/main/resources/mybatis/mapper/inventory/InvBusUserDao.xml b/src/main/resources/mybatis/mapper/inventory/InvBusUserDao.xml index b48ca2e3..540e1e1c 100644 --- a/src/main/resources/mybatis/mapper/inventory/InvBusUserDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InvBusUserDao.xml @@ -22,6 +22,31 @@ + + + +