diff --git a/src/main/java/com/glxp/api/constant/Constant.java b/src/main/java/com/glxp/api/constant/Constant.java index 18880e914..139dfb3fe 100644 --- a/src/main/java/com/glxp/api/constant/Constant.java +++ b/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"; + /** * 单据-未校验标识 */ diff --git a/src/main/java/com/glxp/api/controller/BaseController.java b/src/main/java/com/glxp/api/controller/BaseController.java index e8d3fde94..7c7984e72 100644 --- a/src/main/java/com/glxp/api/controller/BaseController.java +++ b/src/main/java/com/glxp/api/controller/BaseController.java @@ -34,8 +34,7 @@ public class BaseController { } public Long getUserId() { - AuthAdmin authAdmin = getUser(); - return authAdmin.getId(); + return customerService.getUserId(); } public String getCustomerId() { diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 8616461aa..2ed6f95cc 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/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 { @@ -105,12 +103,25 @@ public class InvWarehouseController extends BaseController { @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/findByUser") public BaseResponse findByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { - AuthAdmin authAdmin = getUser(); - filterInvWarehouseRequest.setUserId(authAdmin.getId()); + filterInvWarehouseRequest.setUserId(getUserId()); List 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 list = invWarehouseService.findInvListByUser(userId); + return ResultVOUtils.success(list); + } /** * 获取往来仓库(除了自己) diff --git a/src/main/java/com/glxp/api/dao/auth/InvSubWarehouseDao.java b/src/main/java/com/glxp/api/dao/auth/InvSubWarehouseDao.java index 09a9dece2..5ed750636 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvSubWarehouseDao.java +++ b/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 selectInvListByUser(@Param("userId") Long userId); } diff --git a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java index 5ccde0851..13ec0e496 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java +++ b/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; + /** * 分库编码，用于关联查询仓库关联单据类型 */ diff --git a/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java b/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java index e434dc72f..e9f763bd0 100644 --- a/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java +++ b/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java @@ -72,4 +72,11 @@ public interface InvWarehouseService { */ List filterSubInvList(FilterInvWarehouseRequest filterInvWarehouseRequest); + /** + * 查询用户关联所有仓库的编码，名称，父ID字段 + * + * @param userId + * @return + */ + List findInvListByUser(Long userId); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java index 010c66bb6..875458cdb 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java @@ -207,4 +207,9 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { public List filterSubInvList(FilterInvWarehouseRequest filterInvWarehouseRequest) { return invSubWarehouseDao.filterSubInvList(filterInvWarehouseRequest); } + + @Override + public List findInvListByUser(Long userId) { + return invSubWarehouseDao.selectInvListByUser(userId); + } } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index c92c40dd2..07494bd12 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/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)); diff --git a/src/main/resources/mybatis/mapper/auth/InvSubWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvSubWarehouseDao.xml index cbb6d9ad4..6a40ad4d7 100644 --- a/src/main/resources/mybatis/mapper/auth/InvSubWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvSubWarehouseDao.xml @@ -329,4 +329,16 @@ GROUP BY a.code + + \ No newline at end of file