分库功能完善

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

@@ -274,6 +274,29 @@ public class AuthAdminController {
         return ResultVOUtils.success();
     }
 
+
+    @AuthRuleAnnotation("admin/auth/admin/updateInv")
+    @PostMapping("/admin/auth/admin/updateInv")
+    public BaseResponse updateInv(@RequestBody @Valid AuthAdminSaveRequest authAdminSaveRequest,
+                             BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        if (authAdminSaveRequest.getId() == null) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误！");
+        }
+        AuthAdmin authAdmin = new AuthAdmin();
+        BeanUtils.copyProperties(authAdminSaveRequest, authAdmin);
+        authAdmin.setLastModifyTime(new Date());
+        boolean b = authAdminService.updateAuthAdmin(authAdmin);
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+        return ResultVOUtils.success();
+    }
+
     /**
      * 删除
      *

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

@@ -8,6 +8,8 @@ import com.glxp.sale.admin.entity.auth.AuthLicense;
 import com.glxp.sale.admin.entity.auth.CustomerInfoEntity;
 import com.glxp.sale.admin.entity.info.CompanyEntity;
 import com.glxp.sale.admin.entity.info.DeviceKeyEntity;
+import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
+import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
 import com.glxp.sale.admin.exception.JsonException;
 import com.glxp.sale.admin.req.auth.LoginRequest;
 import com.glxp.sale.admin.req.auth.PCLoginRequest;
@@ -18,6 +20,8 @@ import com.glxp.sale.admin.service.auth.AuthLoginService;
 import com.glxp.sale.admin.service.auth.CustomerInfoService;
 import com.glxp.sale.admin.service.auth.DeviceKeyService;
 import com.glxp.sale.admin.service.info.CompanyService;
+import com.glxp.sale.admin.service.inventory.InvSubWarehouseService;
+import com.glxp.sale.admin.service.inventory.InvWarehouseService;
 import com.glxp.sale.admin.util.*;
 import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
@@ -219,19 +223,34 @@ public class LoginController {
     public BaseResponse userInfo(HttpServletRequest request) {
         String adminId = request.getHeader("ADMIN_ID");
         Long id = Long.valueOf(adminId);
-
         AuthAdmin authAdmin = authAdminService.findById(id);
-
         List<String> authRules = authLoginService.listRuleByAdminId(authAdmin.getId());
-
         LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse();
         BeanUtils.copyProperties(authAdmin, loginUserInfoResponse);
         loginUserInfoResponse.setAuthRules(authRules);
-
         CompanyEntity companyEntity = companyService.findCompany(loginUserInfoResponse.getCustomerId());
         loginUserInfoResponse.setCompanyName(companyEntity.getCompanyName());
+        return ResultVOUtils.success(loginUserInfoResponse);
+    }
 
 
+    @Resource
+    InvWarehouseService invWarehouseService;
+    @Resource
+    InvSubWarehouseService invSubWarehouseService;
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/admin/auth/login/getInv")
+    public BaseResponse getInv(HttpServletRequest request) {
+        String adminId = request.getHeader("ADMIN_ID");
+        Long id = Long.valueOf(adminId);
+        AuthAdmin authAdmin = authAdminService.findById(id);
+        LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse();
+        BeanUtils.copyProperties(authAdmin, loginUserInfoResponse);
+        InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(authAdmin.getLocInvCode());
+        InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.findByInvSubByCode(authAdmin.getLocSubInvCode());
+        loginUserInfoResponse.setLocInvName(invWarehouseEntity.getName());
+        loginUserInfoResponse.setLocSubInvName(invSubWarehouseEntity.getName());
         return ResultVOUtils.success(loginUserInfoResponse);
     }
 

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

@@ -3,6 +3,7 @@ package com.glxp.sale.admin.controller.inventory;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
+import com.glxp.sale.admin.entity.auth.AuthAdmin;
 import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity;
 import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity;
 import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
@@ -11,6 +12,7 @@ import com.glxp.sale.admin.req.info.DeleteRequest;
 import com.glxp.sale.admin.req.inventory.FilterInvSubWarehouseRequest;
 import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
 import com.glxp.sale.admin.res.inventory.InvWarehouseResponse;
+import com.glxp.sale.admin.service.auth.CustomerService;
 import com.glxp.sale.admin.service.inventory.InvSubWarehouseService;
 import com.glxp.sale.admin.service.inventory.InvWarehouseService;
 import com.glxp.sale.common.enums.ResultEnum;
@@ -36,7 +38,8 @@ public class InvSubWarehouseController {
     InvSubWarehouseService invSubWarehouseService;
     @Resource
     InvWarehouseService invWarehouseService;
-
+    @Resource
+    CustomerService customerService;
 
     @AuthRuleAnnotation("")
     @GetMapping("spms/sub/inv/warehouse/filter")
@@ -53,6 +56,8 @@ public class InvSubWarehouseController {
 //        if (StrUtil.isEmpty(filterInvWarehouseRequest.getPcode()) || filterInvWarehouseRequest.getUserId() == null) {
 //            return ResultVOUtils.error(500, "用户或仓库不能未空！");
 //        }
+        AuthAdmin authAdmin = customerService.getUserBean();
+        filterInvWarehouseRequest.setUserId(authAdmin.getId() + "");
         List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.filterGroupInvSub(filterInvWarehouseRequest);
         return ResultVOUtils.success(invSubWarehouseEntities);
     }

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

@@ -113,7 +113,7 @@ public class InvWarehouseController {
         AuthAdmin authAdmin = customerService.getUserBean();
         filterInvWarehouseRequest.setPid(0);
         filterInvWarehouseRequest.setStatus(1);
-        filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue());
+        filterInvWarehouseRequest.setUserId(authAdmin.getId() + "");
         List<InvWarehouseEntity> mInvWarehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest);
         return ResultVOUtils.success(mInvWarehouseEntities);
     }
@@ -159,7 +159,7 @@ public class InvWarehouseController {
             filterInvWarehouseRequest.setPcode("0");
             invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest);
         } else {
-            filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue());
+            filterInvWarehouseRequest.setUserId(authAdmin.getId() + "");
             filterInvWarehouseRequest.setPid(0);
             List<InvWarehouseEntity> mInvWarehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest);
             Map<String, InvWarehouseEntity> invWarehouseEntityMap = new HashMap<>();
@@ -191,7 +191,7 @@ public class InvWarehouseController {
             filterInvWarehouseRequest.setStatus(1);
             invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest);
         } else {
-            filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue());
+            filterInvWarehouseRequest.setUserId(authAdmin.getId() + "");
             filterInvWarehouseRequest.setPid(0);
             invWarehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest);
         }

api-admin/src/main/java/com/glxp/sale/admin/dao/basic/EntrustReceDao.java

@@ -16,7 +16,6 @@ public interface EntrustReceDao {
 
     List<DlEntrustReceEntity> downloadEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest);
 
-
     List<EntrustReceRespose> filterJoinEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest);
 
     boolean insertEntrustRec(EntrustReceEntity ioOrderStatusEntity);

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

@@ -27,5 +27,7 @@ public class AuthAdmin {
     private String comments;
     private String employeeName;
     private long CustomerId;
+    private String locInvCode;
+    private String locSubInvCode;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/basic/EntrustReceEntity.java

@@ -17,5 +17,6 @@ public class EntrustReceEntity {
     private Date updateTime;
     private String remark;
     private boolean finishRece;
-
+    private String entrustSubInv;
+    private String invWarehouseCode;
 }

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

@@ -19,7 +19,6 @@ public class AuthAdminSaveRequest {
     // 登录密码
     private String passWord;
     // 状态
-    @NotNull(message = "请选择状态")
     private Integer userFlag;
     private String employeeName;
 
@@ -35,6 +34,7 @@ public class AuthAdminSaveRequest {
     private String comments;
     // 角色ids
     private List<Long> roles;
-
+    private String locInvCode;
+    private String locSubInvCode;
     private long CustomerId;
 }

api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java

@@ -19,5 +19,6 @@ public class BussinessTypeFilterRequest extends ListPageRequest {
     private Integer userId;
     private String filterAction;
     private String locInvCode;
+    private String locSubInvCode;
     private String lastUpdateTime;
 }

api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java

@@ -30,6 +30,7 @@ public class StockOrderFilterRequest extends ListPageRequest {
     private String orderIdFk;
     private BigDecimal totalPrice;
     private String locStorageCode;
+    private String invWarehouseCode;
     private Integer createUser;
     private Integer reviewUser;
     private Integer userId;

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

@@ -18,7 +18,7 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
     private Date updateTime;
     private Integer level;
     private String pcode;
-    private Integer userId;
+    private String userId;
     private String locInvCode;
     private Integer status;
     private String lastUpdateTime;

api-admin/src/main/java/com/glxp/sale/admin/res/auth/LoginUserInfoResponse.java

@@ -18,4 +18,9 @@ public class LoginUserInfoResponse {
     private String companyName;
     // 权限列表
     private List<String> authRules;
+    private String locInvCode;
+    private String locSubInvCode;
+
+    private String locInvName;
+    private String locSubInvName;
 }

api-admin/src/main/java/com/glxp/sale/admin/res/basic/EntrustReceRespose.java

@@ -22,4 +22,8 @@ public class EntrustReceRespose {
     private String curInv;
     private String curInvName;
 
+
+    private String entrustSubInv;
+    private String invWarehouseCode;
+
 }

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

@@ -15,11 +15,13 @@ public interface InvSubWarehouseService {
 
     InvSubWarehouseEntity selectMaxCode(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
 
+
+    InvSubWarehouseEntity findByInvSubByCode(String code);
+
     boolean insertInvSubWarehouse(InvSubWarehouseEntity invSubWarehouseEntity);
 
     boolean updateInvSubWarehouse(InvSubWarehouseEntity invSubWarehouseEntity);
 
-
     boolean deleteById(String id);
 
 

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

@@ -1,5 +1,6 @@
 package com.glxp.sale.admin.service.inventory.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.sale.admin.dao.inventory.InvSubWarehouseDao;
 import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
@@ -51,6 +52,17 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService {
         return invSubWarehouseDao.selectMaxCode(filterInvSubWarehouseRequest);
     }
 
+    @Override
+    public InvSubWarehouseEntity findByInvSubByCode(String code) {
+        FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
+        filterInvSubWarehouseRequest.setCode(code);
+        List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest);
+        if (CollUtil.isNotEmpty(invSubWarehouseEntities)) {
+            return invSubWarehouseEntities.get(0);
+        }
+        return null;
+    }
+
     @Override
     public boolean insertInvSubWarehouse(InvSubWarehouseEntity invSubWarehouseEntity) {
         return invSubWarehouseDao.insertInvSubWarehouse(invSubWarehouseEntity);

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

@@ -34,7 +34,7 @@
     <insert id="replaceAuthAdmin" keyProperty="id" parameterType="com.glxp.sale.admin.entity.auth.AuthAdmin">
         replace
         INTO auth_user(id, userName, passWord, lastLoginIp,
-                              lastLoginTime, createTime, userFlag, lastModifyTime, employeeName,CustomerId)
+                              lastLoginTime, createTime, userFlag, lastModifyTime, employeeName,CustomerId,locInvCode,locSubInvCode)
         values (
         #{id},
         #{userName},
@@ -44,7 +44,10 @@
         #{createTime},
         #{userFlag,jdbcType=INTEGER},
         #{lastModifyTime},
-        #{employeeName},#{CustomerId}
+        #{employeeName},
+        #{CustomerId},
+        #{locInvCode},
+        #{locSubInvCode}
         )
     </insert>
     <select id="findByUserName" parameterType="hashmap" resultType="com.glxp.sale.admin.entity.auth.AuthAdmin">
@@ -95,7 +98,7 @@
 
     <insert id="insertAuthAdmin" keyProperty="id" parameterType="com.glxp.sale.admin.entity.auth.AuthAdmin">
         INSERT INTO
-        auth_user(userName,passWord,lastLoginIp,lastLoginTime,createTime,userFlag,employeeName,CustomerId,lastModifyTime)
+        auth_user(userName,passWord,lastLoginIp,lastLoginTime,createTime,userFlag,employeeName,CustomerId,lastModifyTime,locInvCode,locSubInvCode)
         values
         (#{userName},
         <choose>
@@ -127,20 +130,22 @@
         #{createTime},
         #{userFlag,jdbcType=INTEGER},
         #{employeeName},
-        #{CustomerId},#{lastModifyTime})
+        #{CustomerId},#{lastModifyTime},#{locInvCode},#{locSubInvCode})
     </insert>
 
     <update id="updateAuthAdmin" parameterType="com.glxp.sale.admin.entity.auth.AuthAdmin">
         UPDATE auth_user
-        <set>
+        <trim prefix="set" suffixOverrides=",">
             <if test="userName != null">userName=#{userName},</if>
             <if test="passWord != null">passWord=#{passWord},</if>
             <if test="lastLoginIp != null">lastLoginIp=#{lastLoginIp},</if>
             <if test="lastLoginTime != null">lastLoginTime=#{lastLoginTime},</if>
             <if test="lastModifyTime != null">lastModifyTime=#{lastModifyTime},</if>
             <if test="userFlag != null">userFlag=#{userFlag},</if>
-            <if test="employeeName != null">employeeName=#{employeeName}</if>
+            <if test="employeeName != null">employeeName=#{employeeName},</if>
-        </set>
+            <if test="locInvCode != null">locInvCode=#{locInvCode},</if>
+            <if test="locSubInvCode != null">locSubInvCode=#{locSubInvCode},</if>
+        </trim>
         WHERE id=#{id}
     </update>
 

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

@@ -163,6 +163,11 @@
             <if test="locInvCode != ''and locInvCode != null">
                 AND inv_warehouse.`code` =#{locInvCode}
             </if>
+
+            <if test="locSubInvCode != ''and locSubInvCode != null">
+                AND inv_warehouse_sub.`code` =#{locSubInvCode}
+            </if>
+
             <if test="userId != null">
                 AND inv_warehouse_user.userId = #{userId}
             </if>

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

@@ -95,6 +95,7 @@
                 and curInv = #{curInv}
             </if>
         </where>
+        group by basic_entrust_accept.id
         order by updateTime desc
     </select>
 
@@ -102,7 +103,8 @@
     <insert id="insertEntrustRec" keyProperty="id"
             parameterType="com.glxp.sale.admin.entity.basic.EntrustReceEntity">
         replace
-        INTO basic_entrust_accept(`action`, entrustInv, `entrustUser`, userId, updateTime, remark,entrustAction,finishRece,curInv)
+        INTO basic_entrust_accept(`action`, entrustInv, `entrustUser`, userId,
+        updateTime, remark,entrustAction,finishRece,curInv,entrustSubInv,invWarehouseCode)
         values (
         #{action},
         #{entrustInv},
@@ -112,14 +114,15 @@
         #{remark},
         #{entrustAction},
         #{finishRece},
-        #{curInv}
+        #{curInv},#{entrustSubInv},#{invWarehouseCode}
         )
     </insert>
 
     <insert id="replaceEntrustRec" keyProperty="id"
             parameterType="com.glxp.sale.admin.entity.basic.EntrustReceEntity">
         replace
-        INTO basic_entrust_accept(id,`action`, entrustInv, `entrustUser`, userId, updateTime, remark,entrustAction,finishRece,curInv)
+        INTO basic_entrust_accept(id,`action`, entrustInv, `entrustUser`, userId, updateTime, remark,
+            entrustAction,finishRece,curInv,entrustSubInv,invWarehouseCode)
         values (
         #{id},
         #{action},
@@ -130,7 +133,7 @@
         #{remark},
         #{entrustAction},
         #{finishRece},
-        #{curInv}
+        #{curInv},#{entrustSubInv},#{invWarehouseCode}
         )
     </insert>
 
@@ -146,6 +149,8 @@
             <if test="remark != null">remark=#{remark},</if>
             <if test="finishRece != null">finishRece=#{finishRece},</if>
             <if test="entrustAction != null">entrustAction=#{entrustAction},</if>
+            <if test="entrustSubInv != null">entrustSubInv=#{entrustSubInv},</if>
+            <if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
         </trim>
         WHERE id = #{id}
     </update>

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

@@ -247,17 +247,20 @@
             <if test="reviewUser!=null">
                 and reviewUser =#{reviewUser}
             </if>
+            <if test="userId != '' and userId!=null">
+                and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId})   or invWarehouseCode is null)
+            </if>
 
             <if test="ullageSupNo != '' and ullageSupNo!=null">
                 and ullageSupNo =#{ullageSupNo}
             </if>
-            <if test="userId!=null">
+            <if test="userId != '' and userId!=null">
                 and inv_warehouse_user.userId =#{userId}
             </if>
-            <if test="locStorageCode!=null">
+            <if test="locStorageCode != '' and locStorageCode!=null">
                 and locStorageCode =#{locStorageCode}
             </if>
-            <if test="invWarehouseCode!=null">
+            <if test="invWarehouseCode != '' and invWarehouseCode!=null">
                 and invWarehouseCode =#{invWarehouseCode}
             </if>
 
@@ -342,6 +345,10 @@
             <if test="invWarehouseCode!=null">
                 and invWarehouseCode =#{invWarehouseCode}
             </if>
+            <if test="userId!=null">
+                and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId})   or invWarehouseCode is null)
+            </if>
+
         </where>
         group by io_order.id
         ORDER BY actDate DESC
@@ -400,22 +407,26 @@
             <if test="customerId != '' and customerId!=null">
                 and customerId =#{customerId}
             </if>
-            <if test=" createUser!=null">
+            <if test="createUser!=null">
                 and createUser =#{createUser}
             </if>
-            <if test=" reviewUser!=null">
+            <if test="reviewUser!=null">
                 and reviewUser =#{reviewUser}
             </if>
             <if test="ullageSupNo != '' and ullageSupNo!=null">
                 and ullageSupNo =#{ullageSupNo}
             </if>
-            <if test="userId!=null">
+            <if test="userId != '' and userId!=null">
                 and inv_warehouse_user.userId =#{userId}
             </if>
-            <if test="locStorageCode!=null">
+            <if test="userId != '' and userId!=null">
+                and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId})   or invWarehouseCode is null)
+            </if>
+
+            <if test="locStorageCode != '' and locStorageCode!=null">
                 and locStorageCode =#{locStorageCode}
             </if>
-            <if test="invWarehouseCode!=null">
+            <if test="invWarehouseCode != '' and invWarehouseCode!=null">
                 and invWarehouseCode =#{invWarehouseCode}
             </if>
         </where>
@@ -478,13 +489,17 @@
             <if test="ullageSupNo != '' and ullageSupNo!=null">
                 and ullageSupNo =#{ullageSupNo}
             </if>
-            <if test="userId!=null">
+            <if test="userId != '' and userId!=null">
                 and inv_warehouse_user.userId =#{userId}
             </if>
-            <if test="locStorageCode!=null">
+            <if test="userId != '' and userId!=null">
+                and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId})   or invWarehouseCode is null)
+            </if>
+
+            <if test="locStorageCode != '' and locStorageCode!=null">
                 and locStorageCode =#{locStorageCode}
             </if>
-            <if test="invWarehouseCode!=null">
+            <if test="invWarehouseCode != '' and invWarehouseCode!=null">
                 and invWarehouseCode =#{invWarehouseCode}
             </if>
         </where>

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

@@ -29,7 +29,8 @@
         insert INTO stock_order(id, billNo, billdate, corpId, corpName, billType, billFlag,
                                 thirdSysFk, status, statusInfo, type, sourceType,
                                 printStatus, unitIdFk, customerId, thirdOrderFk, orderIdFk,
-                                totalPrice, locStorageCode, supplementNo, createUser, reviewUser, entrustEnd,auditTime,updateTime,invWarehouseCode)
+                                totalPrice, locStorageCode, supplementNo, createUser, reviewUser, entrustEnd, auditTime,
+                                updateTime, invWarehouseCode)
         values (#{id},
                 #{billNo},
                 #{billdate},
@@ -43,7 +44,8 @@
                 #{type},
                 #{sourceType},
                 #{printStatus}, #{unitIdFk}, #{customerId}, #{thirdOrderFk}, #{orderIdFk}, #{totalPrice},
-                #{locStorageCode}, #{supplementNo}, #{createUser}, #{reviewUser}, #{entrustEnd},#{auditTime},#{updateTime},#{invWarehouseCode})
+                #{locStorageCode}, #{supplementNo}, #{createUser}, #{reviewUser}, #{entrustEnd}, #{auditTime},
+                #{updateTime}, #{invWarehouseCode})
     </insert>
     <update id="updateById" parameterType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
         UPDATE stock_order
@@ -103,7 +105,7 @@
     <select id="filterListOr" parameterType="com.glxp.sale.admin.req.inout.StockOrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
         SELECT stock_order.* FROM stock_order
-        LEFT  JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code`
+        LEFT JOIN inv_warehouse ON stock_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`
         <where>
@@ -149,6 +151,12 @@
             <if test="unitIdFk != '' and unitIdFk!=null">
                 and unitIdFk = #{unitIdFk}
             </if>
+
+            <if test="userId!=null">
+                and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId}) or
+                invWarehouseCode is null)
+            </if>
+
             <if test="customerId != '' and customerId!=null">
                 and customerId = #{customerId}
             </if>
@@ -164,9 +172,8 @@
             <if test="locStorageCode != '' and locStorageCode!=null">
                 and locStorageCode = #{locStorageCode}
             </if>
-            <if test="unionUser != '' and unionUser!=null">
+            <if test="invWarehouseCode != '' and invWarehouseCode!=null">
-                and ((createUser =#{unionUser} or reviewUser =#{unionUser}) or (reviewUser is null and createUser is
+                and invWarehouseCode = #{invWarehouseCode}
-                null) )
             </if>
             <if test="createUser!=null">
                 and createUser = #{createUser}
@@ -183,7 +190,6 @@
             <if test="userId!=null">
                 and inv_warehouse_user.userId =#{userId}
             </if>
-
         </where>
         group by stock_order.id
         ORDER BY id DESC
@@ -242,7 +248,9 @@
             <if test="reviewUser!=null">
                 and reviewUser = #{reviewUser}
             </if>
-
+            <if test="invWarehouseCode != '' and invWarehouseCode!=null">
+                and invWarehouseCode = #{invWarehouseCode}
+            </if>
         </where>
         limit 1
     </select>
@@ -257,7 +265,7 @@
         stock_order_detail on
         stock_order.id =
         stock_order_detail.orderIdFk
-        LEFT  JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code`
+        LEFT JOIN inv_warehouse ON stock_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`
         <where>
@@ -273,6 +281,13 @@
             <if test="customerId != '' and customerId !=null">
                 and stock_order.customerId =#{customerId}
             </if>
+            <if test="invWarehouseCode != '' and invWarehouseCode!=null">
+                and invWarehouseCode = #{invWarehouseCode}
+            </if>
+            <if test="userId!=null">
+                and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId}) or
+                invWarehouseCode is null)
+            </if>
 
         </where>
         group by stock_order_detail.id