仓库关联相关修改

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<InvBusUserEntity> responses = invBusUserService.filterInvBusUser(filterInvBusUserRequest);
+        List<String> selectedCodes = new ArrayList<>();
+        responses.forEach(invBusUserEntity ->
+        {
+            selectedCodes.add(invBusUserEntity.getScAction());
+        });
+        filterInvBusUserRequest.setSelectedCodes(selectedCodes);
+        List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntityList = invBusUserService.filterUnSelect(filterInvBusUserRequest);
+
+        PageInfo<WarehouseBussinessTypeEntity> pageInfo = new PageInfo<>(warehouseBussinessTypeEntityList);
+        PageSimpleResponse<WarehouseBussinessTypeEntity> 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);

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<InvBusUserEntity> filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest);
 
+    List<WarehouseBussinessTypeEntity> filterUnSelect(FilterInvBusUserRequest filterInvBusUserRequest);
+
     List<InvBusUserResponse> filterJoinInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest);
 
     boolean insertInvBusUser(InvBusUserEntity InvBusUserEntity);

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<BussinessTypeEntity> {
+public interface BussinessTypeDao1 extends BaseMapper<BussinessTypeEntity> {
 
 
 }

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<String> selectedCodes;
 }

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<String> selectActions;
     private List<WarehouseBussinessTypeEntity> invBusUserEntities;
 
 

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<InvBusUserEntity> filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest);
 
+    List<WarehouseBussinessTypeEntity> filterUnSelect(FilterInvBusUserRequest filterInvBusUserRequest);
+
     List<InvBusUserResponse> filterJoinInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest);
 
     List<InvBusUserEntity> selectByUnion(String userId, String subInvCode);

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<WarehouseBussinessTypeEntity> 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<InvBusUserResponse> filterJoinInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest) {

src/main/resources/mybatis/mapper/inventory/InvBusUserDao.xml

@@ -22,6 +22,31 @@
 
     </select>
 
+
+    <select id="filterUnSelect" parameterType="com.glxp.api.req.inventory.FilterInvBusUserRequest"
+            resultType="com.glxp.api.entity.inout.WarehouseBussinessTypeEntity">
+        select inv_warehouse_bussiness_type.id,
+        inv_warehouse_bussiness_type.code,
+        inv_warehouse_bussiness_type.action,
+        basic_bussiness_type.name
+        from inv_warehouse_bussiness_type
+        inner join basic_bussiness_type on inv_warehouse_bussiness_type.action = basic_bussiness_type.action
+        <where>
+            <if test="subInvCode != '' and subInvCode != null">
+                AND code = #{subInvCode}
+            </if>
+            <if test="selectedCodes != null and selectedCodes.size()!=0">
+                and inv_warehouse_bussiness_type.action not in
+                <foreach collection="selectedCodes" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+
+        </where>
+
+    </select>
+
+
     <select id="filterJoinInvBusUser" parameterType="com.glxp.api.req.inventory.FilterInvBusUserRequest"
             resultType="com.glxp.api.res.inventory.InvBusUserResponse">
         select inv_bustype_user.*,basic_bussiness_type.name billTypeName

src/main/resources/mybatis/mapper/rebuild/BussinessTypeDao1.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 
-<mapper namespace="com.glxp.api.dao.rebuild.BussinessTypeDao">
+<mapper namespace="com.glxp.api.dao.rebuild.BussinessTypeDao1">
 
 
 </mapper>