Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/constant/Constant.java

@@ -155,7 +155,6 @@ public class Constant {
     public static final String LOGIN_FAIL = "Error";
 
 
-
     //-------------前端页面查询单据列表标识类型------------------
     /**
      * 单据-草稿标识
@@ -167,6 +166,11 @@ public class Constant {
      */
     public static final String ORDER_STATUS_PROCESSED_ERROR = "processedError";
 
+    /**
+     * 单据-新增单据标识（包括草稿和异常单据）
+     */
+    public static final String ORDER_STATUS_NEW_ORDER = "newOrder";
+
     /**
      * 单据-未校验标识
      */

src/main/java/com/glxp/api/controller/BaseController.java

@@ -34,8 +34,7 @@ public class BaseController {
     }
 
     public Long getUserId() {
-        AuthAdmin authAdmin = getUser();
+        return customerService.getUserId();
-        return authAdmin.getId();
     }
 
     public String getCustomerId() {

src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java

@@ -18,7 +18,6 @@ import com.glxp.api.req.basic.FilterBussinessTypeRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest;
 import com.glxp.api.res.PageSimpleResponse;
-import com.glxp.api.res.auth.InvBusUserResponse;
 import com.glxp.api.res.auth.InvSubWarehouseResponse;
 import com.glxp.api.res.auth.InvWarehouseThirdSysResponse;
 import com.glxp.api.res.auth.WarehouseUserResponse;
@@ -36,7 +35,6 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @RestController
 public class InvWarehouseController extends BaseController {
@@ -101,12 +99,25 @@ public class InvWarehouseController extends BaseController {
     @AuthRuleAnnotation("")
     @GetMapping("spms/inv/warehouse/findByUser")
     public BaseResponse findByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
-        AuthAdmin authAdmin = getUser();
+        filterInvWarehouseRequest.setUserId(getUserId());
-        filterInvWarehouseRequest.setUserId(authAdmin.getId());
         List<InvWarehouseEntity> invSubWarehouseEntities = invWarehouseService.filterGroupInvSub(filterInvWarehouseRequest);
         return ResultVOUtils.success(invSubWarehouseEntities);
     }
 
+    /**
+     * 前端页面查询参数拉取用户关联所有仓库接口，只返回编码，父ID和名称
+     *
+     * @return
+     */
+    @GetMapping("spms/inv/warehouse/findInvListByUser")
+    public BaseResponse findInvListByUser() {
+        Long userId = getUserId();
+        if (null == userId) {
+            return ResultVOUtils.error(ResultEnum.LOGIN_VERIFY_FALL);
+        }
+        List<InvWarehouseEntity> list = invWarehouseService.findInvListByUser(userId);
+        return ResultVOUtils.success(list);
+    }
 
     /**
      * 获取往来仓库(除了自己)

src/main/java/com/glxp/api/dao/auth/InvSubWarehouseDao.java

@@ -1,9 +1,7 @@
 package com.glxp.api.dao.auth;
 
 import com.glxp.api.dao.BaseMapperPlus;
-import com.glxp.api.dao.inout.IoOrderDetailCodeDao;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
-import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.req.auth.FilterInvSubWarehouseRequest;
 import com.glxp.api.req.auth.FilterInvWarehouseRequest;
 import com.glxp.api.res.auth.InvSubWarehouseResponse;
@@ -81,4 +79,11 @@ public interface InvSubWarehouseDao extends BaseMapperPlus<InvSubWarehouseDao, I
 
     boolean updateTime(@Param("code") String code, @Param("updateTime") Date updateTime);
 
+    /**
+     * 查询用户关联的仓库列表，只查询仓库编码，名称，父ID字段
+     *
+     * @param userId
+     * @return
+     */
+    List<InvWarehouseEntity> selectInvListByUser(@Param("userId") Long userId);
 }

src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java

@@ -68,6 +68,11 @@ public class FilterBussinessTypeRequest extends ListPageRequest {
      */
     private String locInvCode;
 
+    /**
+     *
+     */
+    private String invCode;
+
     /**
      * 分库编码，用于关联查询仓库关联单据类型
      */

src/main/java/com/glxp/api/service/auth/InvWarehouseService.java

@@ -72,4 +72,11 @@ public interface InvWarehouseService {
      */
     List<InvSubWarehouseResponse> filterSubInvList(FilterInvWarehouseRequest filterInvWarehouseRequest);
 
+    /**
+     * 查询用户关联所有仓库的编码，名称，父ID字段
+     *
+     * @param userId
+     * @return
+     */
+    List<InvWarehouseEntity> findInvListByUser(Long userId);
 }

src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java

@@ -207,4 +207,9 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
     public List<InvSubWarehouseResponse> filterSubInvList(FilterInvWarehouseRequest filterInvWarehouseRequest) {
         return invSubWarehouseDao.filterSubInvList(filterInvWarehouseRequest);
     }
+
+    @Override
+    public List<InvWarehouseEntity> findInvListByUser(Long userId) {
+        return invSubWarehouseDao.selectInvListByUser(userId);
+    }
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -162,6 +162,10 @@ public class IoOrderServiceImpl implements IoOrderService {
                 filterOrderRequest.setStatuses(Arrays.asList(4));
                 filterOrderRequest.setDealStatuses(Arrays.asList(2));
                 break;
+            case Constant.ORDER_STATUS_NEW_ORDER:
+                filterOrderRequest.setStatuses(Arrays.asList(1, 2, 4));
+                filterOrderRequest.setDealStatuses(Arrays.asList(1, 2));
+                break;
             case Constant.ORDER_STATUS_UN_CHECK:
                 filterOrderRequest.setStatuses(Arrays.asList(3));
                 filterOrderRequest.setDealStatuses(Arrays.asList(2));

src/main/resources/mybatis/mapper/auth/InvSubWarehouseDao.xml

@@ -329,4 +329,16 @@
         </where>
         GROUP BY a.code
     </select>
+
+    <select id="selectInvListByUser" resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
+        select auth_warehouse.code,
+               auth_warehouse.name,
+               auth_warehouse.parentId,
+               auth_warehouse.parentCode,
+               auth_dept.name warehouseName
+        from auth_warehouse
+                 inner join auth_dept on auth_warehouse.parentId = auth_dept.code
+                 inner join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code
+        where userId = #{userId}
+    </select>
 </mapper>