diff --git a/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java b/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java index 9c5319957..2b7ed0884 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java @@ -6,6 +6,7 @@ import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.req.inv.FilterInvPlaceRequest; +import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inv.BindInvSpaceRequest; import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.service.inv.InvPlaceService; @@ -68,4 +69,32 @@ public class InvPlaceController { return invPlaceService.checkCodeSpace(bindInvSpaceRequest); } + /** + * 查询库存产品信息 + * + * @param filterInvPlaceRequest + * @return + */ + @GetMapping("/spms/inv/product/getInvProductInfo") + private BaseResponse getInvProductInfo(FilterInvPlaceRequest filterInvPlaceRequest) { + List list = invPlaceService.getInvProductInfo(filterInvPlaceRequest); + return ResultVOUtils.success(list); + } + + /** + * 从库存详情查询单据列表 + * + * @param filterInvPlaceRequest + * @return + */ + @GetMapping("/spms/inv/product/getInvPlaceOrderList") + public BaseResponse getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest) { + if (null == filterInvPlaceRequest || StrUtil.isBlank(filterInvPlaceRequest.getInvCode())) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + List list = invPlaceService.getInvPlaceOrderList(filterInvPlaceRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + } diff --git a/src/main/java/com/glxp/api/dao/inv/InvProductDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvProductDetailDao.java index 0eee70fa2..7035fca6d 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvProductDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvProductDetailDao.java @@ -4,6 +4,7 @@ import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.req.inv.FilterInvPlaceRequest; import com.glxp.api.req.inv.FilterInvProductDetailRequest; +import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inv.BindInvSpaceRequest; import com.glxp.api.res.inv.InvPlaceDetailResponse; import org.apache.ibatis.annotations.Mapper; @@ -72,4 +73,20 @@ public interface InvProductDetailDao extends BaseMapperPlus selectCountOrderCodes(@Param("invCode") String invCode, @Param("invSpaceCode") String invSpaceCode, @Param("relId") Long relId, @Param("batchNo") String batchNo); + + /** + * 查询库存摆放的产品详情数据 + * + * @param filterInvPlaceRequest + * @return + */ + List getInvProductInfo(FilterInvPlaceRequest filterInvPlaceRequest); + + /** + * 从单据详情查询摆放页面的单据列表数据 + * + * @param filterInvPlaceRequest + * @return + */ + List getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest); } diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvPlaceRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvPlaceRequest.java index d1cd93afe..4cdc5cb17 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterInvPlaceRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterInvPlaceRequest.java @@ -24,4 +24,14 @@ public class FilterInvPlaceRequest extends ListPageRequest { */ private String invSpaceCode; + /** + * UDI码 + */ + private String code; + + /** + * 单据号 + */ + private String orderId; + } diff --git a/src/main/java/com/glxp/api/res/inv/InvPlaceDetailResponse.java b/src/main/java/com/glxp/api/res/inv/InvPlaceDetailResponse.java index a92d61f44..19ad425a4 100644 --- a/src/main/java/com/glxp/api/res/inv/InvPlaceDetailResponse.java +++ b/src/main/java/com/glxp/api/res/inv/InvPlaceDetailResponse.java @@ -98,4 +98,24 @@ public class InvPlaceDetailResponse { */ private String invSpaceName; + /** + * 供应商名称 + */ + private String supName; + + /** + * 序列号 + */ + private String serialNo; + + /** + * 计量单位 + */ + private String measname; + + /** + * 生产厂家 + */ + private String manufactory; + } diff --git a/src/main/java/com/glxp/api/service/inv/InvPlaceService.java b/src/main/java/com/glxp/api/service/inv/InvPlaceService.java index ef9376942..69d922cba 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPlaceService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPlaceService.java @@ -2,6 +2,7 @@ package com.glxp.api.service.inv; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.req.inv.FilterInvPlaceRequest; +import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inv.BindInvSpaceRequest; import com.glxp.api.res.inv.InvPlaceDetailResponse; @@ -34,4 +35,18 @@ public interface InvPlaceService { * @return */ BaseResponse checkCodeSpace(BindInvSpaceRequest bindInvSpaceRequest); + + /** + * @param filterInvPlaceRequest + * @return + */ + List getInvProductInfo(FilterInvPlaceRequest filterInvPlaceRequest); + + /** + * 从库存详情查询单据列表 + * + * @param filterInvPlaceRequest + * @return + */ + List getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java index 5c39687cf..b4044c061 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java @@ -12,6 +12,7 @@ import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.inv.InvProductDetailDao; import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.req.inv.FilterInvPlaceRequest; +import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inv.BindInvSpaceRequest; import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.service.inv.InvPlaceService; @@ -82,4 +83,20 @@ public class InvPlaceServiceImpl implements InvPlaceService { } return ResultVOUtils.success(); } + + @Override + public List getInvProductInfo(FilterInvPlaceRequest filterInvPlaceRequest) { + return invProductDetailDao.getInvProductInfo(filterInvPlaceRequest); + } + + @Override + public List getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest) { + if (null == filterInvPlaceRequest) { + return Collections.emptyList(); + } + if (null != filterInvPlaceRequest.getPage() && null != filterInvPlaceRequest.getLimit()) { + PageHelper.offsetPage((filterInvPlaceRequest.getPage() - 1) * filterInvPlaceRequest.getLimit(), filterInvPlaceRequest.getLimit()); + } + return invProductDetailDao.getInvPlaceOrderList(filterInvPlaceRequest); + } } diff --git a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml index 9da0f5f22..f206ea126 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml @@ -161,4 +161,61 @@ + + + +