新增部门，单据类型关联用户，代码备份

api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java

@@ -80,7 +80,8 @@ public class ConstantStatus {
     public static final int CORP_TYPE_INPUT = 2;          //客户
     public static final int CORP_TYPE_OUT = 0;            //供应商
     public static final int CORP_TYPE_INNOR = 1;     //内部科室等
-    public static final int CORP_TYPE_SPECIAL = 3;
+    public static final int CORP_TYPE_SPECIAL = 3;      //特殊往来
+    public static final int CORP_TYPE_DEPT = 4;         //部门
 
 
     public static final int CORP_SICK_SICK = 1;

api-admin/src/main/java/com/glxp/sale/admin/controller/auth/DeptController.java

@@ -0,0 +1,83 @@
+package com.glxp.sale.admin.controller.auth;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
+import com.glxp.sale.admin.entity.auth.DeptEntity;
+import com.glxp.sale.admin.req.auth.FilterDeptRequest;
+import com.glxp.sale.admin.req.info.DeleteRequest;
+import com.glxp.sale.admin.res.PageSimpleResponse;
+import com.glxp.sale.admin.service.auth.DeptService;
+import com.glxp.sale.admin.util.GennerOrderUtils;
+import com.glxp.sale.common.res.BaseResponse;
+import com.glxp.sale.common.util.ResultVOUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@RestController
+public class DeptController {
+
+
+    @Resource
+    private DeptService deptService;
+    @Resource
+    private GennerOrderUtils gennerOrderUtils;
+
+    @AuthRuleAnnotation("")
+    @GetMapping("udi/auth/dept/filter")
+    public BaseResponse filterList(FilterDeptRequest filterDeptRequest) {
+        List<DeptEntity> deptEntityList = deptService.filterDepts(filterDeptRequest);
+        PageInfo<DeptEntity> pageInfo = new PageInfo<>(deptEntityList);
+        PageSimpleResponse<DeptEntity> deptEntityPageSimpleResponse = new PageSimpleResponse<>();
+        deptEntityPageSimpleResponse.setTotal(pageInfo.getTotal());
+        deptEntityPageSimpleResponse.setList(deptEntityList);
+        return ResultVOUtils.success(deptEntityPageSimpleResponse);
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("udi/auth/dept/add")
+    public BaseResponse addDept(@RequestBody DeptEntity deptEntity) {
+        deptEntity.setCode(gennerOrderUtils.getDeptCode());
+        deptEntity.setUpdateTime(new Date());
+        boolean b = deptService.insertDept(deptEntity);
+        if (b)
+            return ResultVOUtils.success("添加成功");
+        else {
+            return ResultVOUtils.error(500, "添加失败");
+        }
+
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("udi/auth/dept/update")
+    public BaseResponse updateDept(@RequestBody DeptEntity deptEntity) {
+        deptEntity.setUpdateTime(new Date());
+        boolean b = deptService.updateDept(deptEntity);
+
+        if (b)
+            return ResultVOUtils.success("更新成功！");
+        else {
+            return ResultVOUtils.error(500, "更新成功!");
+        }
+
+    }
+
+
+    @AuthRuleAnnotation("")
+    @PostMapping("udi/auth/dept/delete")
+    public BaseResponse deleteDept(@RequestBody DeleteRequest deleteRequest) {
+        boolean b = deptService.deleteById(Integer.parseInt(deleteRequest.getId()));
+        if (b)
+            return ResultVOUtils.success("删除成功");
+        else {
+            return ResultVOUtils.error(500, "删除失败");
+        }
+    }
+
+
+}

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java

@@ -220,6 +220,9 @@ public class OrderController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
+        if (StrUtil.isEmpty(orderFilterRequest.getInvWarehouseCode())) {
+            return ResultVOUtils.error(500, "当前分库不能为空");
+        }
         List<OrderEntity> orderEntityList;
         if (orderFilterRequest.getStatus() == null || orderFilterRequest.getStatus() == 0) {
             orderFilterRequest.setStatus(4);

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java

@@ -280,6 +280,9 @@ public class StockOrderController {
             }
             stockOrderFilterRequest.setCorpId(null);
         }
+        if (StrUtil.isEmpty(stockOrderFilterRequest.getInvWarehouseCode())) {
+            return ResultVOUtils.error(500, "当前分库不能为空");
+        }
 
         stockOrderEntityList = stockOrderService.filterListOr(stockOrderFilterRequest);
         PageInfo<StockOrderEntity> pageInfo;

api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvBusUserController.java

@@ -0,0 +1,132 @@
+package com.glxp.sale.admin.controller.inventory;
+
+import cn.hutool.core.collection.CollUtil;
+import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
+import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity;
+import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
+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.service.inout.WarehouseBussinessTypeService;
+import com.glxp.sale.admin.service.inventory.InvBusUserService;
+import com.glxp.sale.common.enums.ResultEnum;
+import com.glxp.sale.common.res.BaseResponse;
+import com.glxp.sale.common.util.ResultVOUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+public class InvBusUserController {
+
+
+    @Resource
+    InvBusUserService invBusUserService;
+
+
+    @Resource
+    WarehouseBussinessTypeService warehouseBussinessTypeService;
+
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/bus/user/select/filter")
+    public BaseResponse filterSelectInvUser(FilterInvBusUserRequest filterInvBusUserRequest) {
+        List<InvBusUserEntity> responses = invBusUserService.filterInvBusUser(filterInvBusUserRequest);
+        List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities =
+                warehouseBussinessTypeService.getListByCode(filterInvBusUserRequest.getSubInvCode());
+
+        warehouseBussinessTypeEntities.forEach(warehouseBussinessTypeEntity ->
+        {
+            for (InvBusUserEntity invBusUserEntity : responses) {
+                if (invBusUserEntity.getScAction().equals(warehouseBussinessTypeEntity.getAction())) {
+                    warehouseBussinessTypeEntity.setSelect(true);
+                    break;
+                }
+            }
+        });
+        return ResultVOUtils.success(warehouseBussinessTypeEntities);
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/spms/bus/user/warehouse/update")
+    public BaseResponse updateRes(@RequestBody UpdateRelBusRequset relBusRequset) {
+        boolean b = invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode());
+        if (CollUtil.isNotEmpty(relBusRequset.getInvBusUserEntities())) {
+            relBusRequset.getInvBusUserEntities().forEach(warehouseBussinessTypeEntity ->
+            {
+                InvBusUserEntity invBusUserEntity = new InvBusUserEntity();
+                invBusUserEntity.setUserId(relBusRequset.getUserId());
+                invBusUserEntity.setSubInvCode(relBusRequset.getSubInvCode());
+                invBusUserEntity.setScAction(warehouseBussinessTypeEntity.getAction());
+                invBusUserService.insertInvBusUser(invBusUserEntity);
+            });
+
+        }
+        return ResultVOUtils.success("修改成功！");
+    }
+
+
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/bus/user/warehouse/filter")
+    public BaseResponse filterInvWarehouse(FilterInvBusUserRequest filterInvBusUserRequest) {
+        List<InvBusUserEntity> responses = invBusUserService.filterInvBusUser(filterInvBusUserRequest);
+        return ResultVOUtils.success(responses);
+    }
+
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/spms/bus/user/warehouse/save")
+    public BaseResponse save(@RequestBody @Valid InvBusUserEntity invBusUserEntity,
+                             BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        boolean b = invBusUserService.insertInvBusUser(invBusUserEntity);
+
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+        return ResultVOUtils.success("添加成功！");
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/spms/bus/user/warehouse/edit")
+    public BaseResponse edit(@RequestBody @Valid InvBusUserEntity invBusUserEntity,
+                             BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        if (invBusUserEntity.getId() == null) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        boolean b = invBusUserService.updateInvBusUser(invBusUserEntity);
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+        return ResultVOUtils.success("修改成功！");
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/spms/bus/user/warehouse/delete")
+    public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
+
+        if (deleteRequest.getId() == null) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        boolean b = invBusUserService.deleteById(deleteRequest.getId());
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+        return ResultVOUtils.success();
+    }
+
+
+}

api-admin/src/main/java/com/glxp/sale/admin/dao/auth/DeptDao.java

@@ -0,0 +1,23 @@
+package com.glxp.sale.admin.dao.auth;
+
+import com.glxp.sale.admin.entity.auth.DeptEntity;
+import com.glxp.sale.admin.req.auth.FilterDeptRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface DeptDao {
+
+
+    List<DeptEntity> filterDepts(FilterDeptRequest filterDeptRequest);
+
+    boolean insertDept(DeptEntity deptEntity);
+
+    boolean updateDept(DeptEntity deptEntity);
+
+
+    boolean deleteById(Integer id);
+
+
+}

api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvBusUserDao.java

@@ -0,0 +1,24 @@
+package com.glxp.sale.admin.dao.inventory;
+
+import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
+import com.glxp.sale.admin.req.inventory.FilterInvBusUserRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface InvBusUserDao {
+
+
+    List<InvBusUserEntity> filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest);
+
+    boolean insertInvBusUser(InvBusUserEntity InvBusUserEntity);
+
+    boolean updateInvBusUser(InvBusUserEntity InvBusUserEntity);
+
+    boolean deleteById(@Param("id") String id);
+
+
+    boolean deleteByUnion(@Param("userId") String userId, @Param("subInvCode") String subInvCode);
+}

api-admin/src/main/java/com/glxp/sale/admin/entity/auth/DeptEntity.java

@@ -0,0 +1,15 @@
+package com.glxp.sale.admin.entity.auth;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeptEntity {
+    private String code;
+    private Integer id;
+    private String name;
+    private String remark;
+    private Integer flag;
+    private Date updateTime;
+}

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseBussinessTypeEntity.java

@@ -26,4 +26,6 @@ public class WarehouseBussinessTypeEntity {
      * 业务名称
      */
     private String name;
+
+    private boolean select;
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvBusUserEntity.java

@@ -0,0 +1,13 @@
+package com.glxp.sale.admin.entity.inventory;
+
+import lombok.Data;
+
+@Data
+public class InvBusUserEntity {
+    private Integer id;
+    private String userId;
+    private String subInvCode;
+    private String scAction;
+    private String remark;
+
+}

api-admin/src/main/java/com/glxp/sale/admin/req/auth/FilterDeptRequest.java

@@ -0,0 +1,12 @@
+package com.glxp.sale.admin.req.auth;
+
+import com.glxp.sale.admin.req.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class FilterDeptRequest extends ListPageRequest {
+    private String code;
+    private String name;
+    private Integer flag;
+
+}

api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvBusUserRequest.java

@@ -0,0 +1,13 @@
+package com.glxp.sale.admin.req.inventory;
+
+import com.glxp.sale.admin.req.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class FilterInvBusUserRequest extends ListPageRequest {
+
+
+    private String userId;
+    private String subInvCode;
+    private String scAction;
+}

api-admin/src/main/java/com/glxp/sale/admin/req/inventory/UpdateRelBusRequset.java

@@ -0,0 +1,18 @@
+package com.glxp.sale.admin.req.inventory;
+
+import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity;
+import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class UpdateRelBusRequset {
+    private String userId;
+    private String subInvCode;
+
+    private List<WarehouseBussinessTypeEntity> invBusUserEntities;
+
+
+}
+

api-admin/src/main/java/com/glxp/sale/admin/service/auth/DeptService.java

@@ -0,0 +1,21 @@
+package com.glxp.sale.admin.service.auth;
+
+
+import com.glxp.sale.admin.entity.auth.DeptEntity;
+import com.glxp.sale.admin.req.auth.FilterDeptRequest;
+
+import java.util.List;
+
+public interface DeptService {
+
+
+    List<DeptEntity> filterDepts(FilterDeptRequest filterDeptRequest);
+
+    boolean insertDept(DeptEntity deptEntity);
+
+    boolean updateDept(DeptEntity deptEntity);
+
+
+    boolean deleteById(Integer id);
+
+}

api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/DeptServiceImpl.java

@@ -0,0 +1,41 @@
+package com.glxp.sale.admin.service.auth.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.sale.admin.dao.auth.DeptDao;
+import com.glxp.sale.admin.entity.auth.DeptEntity;
+import com.glxp.sale.admin.req.auth.FilterDeptRequest;
+import com.glxp.sale.admin.service.auth.DeptService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class DeptServiceImpl implements DeptService {
+    @Resource
+    DeptDao deptDao;
+
+    @Override
+    public List<DeptEntity> filterDepts(FilterDeptRequest filterDeptRequest) {
+        if (filterDeptRequest.getPage() != null) {
+            int offset = (filterDeptRequest.getPage() - 1) * filterDeptRequest.getLimit();
+            PageHelper.offsetPage(offset, filterDeptRequest.getLimit());
+        }
+        return deptDao.filterDepts(filterDeptRequest);
+    }
+
+    @Override
+    public boolean insertDept(DeptEntity deptEntity) {
+        return deptDao.insertDept(deptEntity);
+    }
+
+    @Override
+    public boolean updateDept(DeptEntity deptEntity) {
+        return deptDao.updateDept(deptEntity);
+    }
+
+    @Override
+    public boolean deleteById(Integer id) {
+        return deptDao.deleteById(id);
+    }
+}

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvBusUserService.java

@@ -0,0 +1,22 @@
+package com.glxp.sale.admin.service.inventory;
+
+import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
+import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
+import com.glxp.sale.admin.req.inventory.FilterInvBusUserRequest;
+import com.glxp.sale.admin.req.inventory.FilterInvSubWarehouseRequest;
+
+import java.util.List;
+
+public interface InvBusUserService {
+
+    List<InvBusUserEntity> filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest);
+
+    boolean insertInvBusUser(InvBusUserEntity InvBusUserEntity);
+
+    boolean updateInvBusUser(InvBusUserEntity InvBusUserEntity);
+
+    boolean deleteById(String id);
+
+    boolean deleteByUnion(String userId,String subInvCode);
+
+}

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvBusUserServiceImpl.java

@@ -0,0 +1,47 @@
+package com.glxp.sale.admin.service.inventory.impl;
+
+import com.glxp.sale.admin.dao.inventory.InvBusUserDao;
+import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
+import com.glxp.sale.admin.req.inventory.FilterInvBusUserRequest;
+import com.glxp.sale.admin.service.inventory.InvBusUserService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class InvBusUserServiceImpl implements InvBusUserService {
+
+    @Resource
+    InvBusUserDao invBusUserDao;
+
+    @Override
+    public List<InvBusUserEntity> filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest) {
+
+        if (filterInvBusUserRequest == null) {
+            return Collections.emptyList();
+        }
+        return invBusUserDao.filterInvBusUser(filterInvBusUserRequest);
+    }
+
+    @Override
+    public boolean insertInvBusUser(InvBusUserEntity invBusUserEntity) {
+        return invBusUserDao.insertInvBusUser(invBusUserEntity);
+    }
+
+    @Override
+    public boolean updateInvBusUser(InvBusUserEntity invBusUserEntity) {
+        return invBusUserDao.updateInvBusUser(invBusUserEntity);
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return invBusUserDao.deleteById(id);
+    }
+
+    @Override
+    public boolean deleteByUnion(String userId, String subInvCode) {
+        return invBusUserDao.deleteByUnion(userId, subInvCode);
+    }
+}

api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java

@@ -443,9 +443,9 @@ public class InvProductsTrService {
 
         List<WarehouseEntity> warehouseEntities = codesService.findByReceiptId(orderEntity.getId());
         List<WarehouseEntity> prePutList = new ArrayList<>();
-
-        SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("ullage_supplement_all");
-        if (systemParamConfigEntity != null && systemParamConfigEntity.getParamValue().equals("1")) {
+        BussinessTypeEntity bussinessTypeEntity1 = bussinessTypeService.findBTByAction(orderEntity.getAction());
+//        SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("ullage_supplement_all");
+        if (bussinessTypeEntity1.isSupplementAll()) {
             for (WarehouseEntity warehouseEntity : warehouseEntities) {
                 prePutList.add(warehouseEntity);
             }

api-admin/src/main/java/com/glxp/sale/admin/util/GennerOrderUtils.java

@@ -63,6 +63,21 @@ public class GennerOrderUtils {
         return sb.toString();
     }
 
+    private static String completionSerial(String serialPrefix, Long incrementalSerial,
+                                           int serialLength) {
+        StringBuffer sb = new StringBuffer(serialPrefix);
+
+        //需要补0的长度=流水号长度 -当日自增计数长度
+        int length = serialLength - String.valueOf(incrementalSerial).length();
+        //补零
+        for (int i = 0; i < length; i++) {
+            sb.append("0");
+        }
+        //redis当日自增数
+        sb.append(incrementalSerial);
+        return sb.toString();
+    }
+
 
     /**
      * 补全随机数
@@ -145,6 +160,7 @@ public class GennerOrderUtils {
     }
 
 
+    //生成耗材字典关联主键
     public long getRelId() {
         Long incrementalSerial = redisUtil.incr("udiRelId", 1);
         if (incrementalSerial == 1) {
@@ -154,4 +170,11 @@ public class GennerOrderUtils {
         return Long.parseLong("80" + curTime.substring(1, curTime.length() - 5)) + incrementalSerial;
     }
 
+
+    //生成部门编码
+    public String getDeptCode() {
+        Long incrementalSerial = redisUtil.incr("genDeptCode", 1);
+        return completionSerial("D", incrementalSerial, 4);
+    }
+
 }

api-admin/src/main/resources/application-dev.properties

@@ -1,7 +1,7 @@
 # \u751F\u4EA7\u73AF\u5883
 server.port=9906
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_za?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_ph2?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=123456
 #spring.datasource.password=123456

api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml

@@ -0,0 +1,43 @@
+<?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.sale.admin.dao.auth.DeptDao">
+
+    <select id="filterDepts" parameterType="com.glxp.sale.admin.req.auth.FilterDeptRequest"
+            resultType="com.glxp.sale.admin.entity.auth.DeptEntity">
+        SELECT *
+        FROM auth_dept
+        <where>
+            <if test="name != null and '' != name">
+                AND `name` LIKE CONCAT('%',#{name},'%')
+            </if>
+        </where>
+    </select>
+
+
+    <insert id="insertDept" keyProperty="id" parameterType="com.glxp.sale.admin.entity.auth.DeptEntity">
+        INSERT INTO auth_dept(`name`, `flag`, `remark`, updateTime, code)
+        values (#{name},
+                #{flag},
+                #{remark}, #{updateTime}, #{code})
+    </insert>
+
+    <update id="updateDept" parameterType="com.glxp.sale.admin.entity.auth.DeptEntity">
+        UPDATE auth_dept
+        <trim prefix="set" suffixOverrides=",">
+            <if test="name != null">`name`=#{name},</if>
+            <if test="flag != null">`flag`=#{flag},</if>
+            <if test="remark != null">remark=#{remark},</if>
+            <if test="code != null">code=#{code},</if>
+            <if test="updateTime != null">updateTime=#{updateTime},</if>
+        </trim>
+        WHERE id=#{id}
+    </update>
+
+    <delete id="deleteById" parameterType="java.lang.Integer">
+        delete
+        from auth_dept
+        where id = #{id}
+    </delete>
+
+</mapper>

api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml

@@ -100,6 +100,7 @@
         INNER JOIN inv_warehouse on inv_warehouse_sub.parentId = inv_warehouse.`code`
         INNER JOIN inv_warehouse_user on inv_warehouse_sub.`code` =inv_warehouse_user.`code`
         left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action
+        INNER JOIN inv_bustype_user on inv_warehouse_bussiness_type.action = inv_bustype_user.scAction
         <where>
             <if test="name != ''and name != null">
                 AND basic_bustype_local.name LIKE concat('%',#{name},'%')

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -191,7 +191,8 @@
     </update>
     <select id="filterListOr" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
-        SELECT io_order.* ,inv_warehouse.name invName, iws.name subInvName ,basic_bussiness_type.name billTypeName FROM io_order
+        SELECT io_order.* ,inv_warehouse.name invName, iws.name subInvName ,basic_bussiness_type.name billTypeName FROM
+        io_order
         left join basic_bussiness_type on io_order.action = basic_bussiness_type.action
         LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_sub iws ON io_order.invWarehouseCode = iws.`code`
@@ -271,6 +272,12 @@
             </if>
             <if test="invWarehouseCode != '' and invWarehouseCode!=null">
                 and invWarehouseCode =#{invWarehouseCode}
+                and
+                io_order.action in
+                (select basic_bussiness_type.action from inv_bustype_user INNER JOIN basic_bussiness_type on
+                inv_bustype_user.scAction = basic_bussiness_type.action
+                WHERE userId =#{userId} and invWarehouseCode  =#{invWarehouseCode}
+                GROUP BY inv_bustype_user.id)
             </if>
 
         </where>
@@ -287,9 +294,9 @@
     <select id="filterList" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
         SELECT io_order.* ,
-                inv_warehouse.name as invName,
-                inv_warehouse_sub.name as subInvName
-               FROM io_order
+        inv_warehouse.name as invName,
+        inv_warehouse_sub.name as subInvName
+        FROM io_order
         LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`

api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml

@@ -180,6 +180,12 @@
             </if>
             <if test="invWarehouseCode != '' and invWarehouseCode!=null">
                 and invWarehouseCode = #{invWarehouseCode}
+                and
+                stock_order.billType in
+                (select basic_bussiness_type.localAction from inv_bustype_user INNER JOIN basic_bussiness_type on
+                inv_bustype_user.scAction = basic_bussiness_type.action
+                WHERE userId =#{userId} and invWarehouseCode  =#{invWarehouseCode}
+                GROUP BY inv_bustype_user.id)
             </if>
             <if test="createUser!=null">
                 and createUser = #{createUser}

api-admin/src/main/resources/mybatis/mapper/inventory/InvBusUserDao.xml

@@ -0,0 +1,64 @@
+<?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.sale.admin.dao.inventory.InvBusUserDao">
+
+    <select id="filterInvBusUser" parameterType="com.glxp.sale.admin.req.inventory.FilterInvBusUserRequest"
+            resultType="com.glxp.sale.admin.entity.inventory.InvBusUserEntity">
+        select *
+        FROM inv_bustype_user
+        <where>
+            <if test="userId != '' and userId != null">
+                AND userId = #{userId}
+            </if>
+            <if test="subInvCode != '' and subInvCode != null">
+                AND subInvCode = #{subInvCode}
+            </if>
+            <if test="scAction != '' and scAction != null">
+                AND scAction = #{scAction}
+            </if>
+
+        </where>
+
+    </select>
+
+
+    <insert id="insertInvBusUser" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inventory.InvBusUserEntity">
+        replace
+        INTO  inv_bustype_user
+        (userId, `subInvCode`, scAction, remark)
+        values (
+        #{userId},
+        #{subInvCode},
+        #{scAction},
+        #{remark}
+        )
+    </insert>
+
+
+    <delete id="deleteById" parameterType="Map">
+        DELETE
+        FROM inv_bustype_user
+        WHERE id = #{id}
+    </delete>
+
+    <delete id="deleteByUnion" parameterType="Map">
+        DELETE
+        FROM inv_bustype_user
+        WHERE subInvCode = #{subInvCode}
+          and userId = #{userId}
+    </delete>
+    <update id="updateInvBusUser" parameterType="com.glxp.sale.admin.entity.inventory.InvBusUserEntity">
+        UPDATE inv_bustype_user
+        <trim prefix="set" suffixOverrides=",">
+            <if test="userId != null">userId=#{userId},</if>
+            <if test="subInvCode != null">subInvCode=#{subInvCode},</if>
+            <if test="parentId != null">parentId=#{parentId},</if>
+            <if test="scAction != null">scAction=#{scAction},</if>
+            <if test="remark != null">remark=#{remark},</if>
+        </trim>
+        WHERE id = #{id}
+    </update>
+
+</mapper>