diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java index 659983e3..dbff7054 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java @@ -485,12 +485,12 @@ public class InvProductsController { * @return */ @AuthRuleAnnotation("") - @GetMapping("spms/inv/products/getCountInvProductProduct") - public BaseResponse getCountInvProductProduct(FilterInvProductRequest filterInvProductRequest) { - if (StrUtil.isBlank(filterInvProductRequest.getInvStorageCode()) || StrUtil.isBlank(filterInvProductRequest.getInvWarehouseCode())) { + @GetMapping("spms/inv/products/getCountInvProduct") + public BaseResponse getCountInvProduct(FilterInvProductRequest filterInvProductRequest) { + if (null == filterInvProductRequest || StrUtil.isBlank(filterInvProductRequest.getInvStorageCode()) || StrUtil.isBlank(filterInvProductRequest.getInvWarehouseCode())) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } - List list = invProductService.getCountInvProductProduct(filterInvProductRequest); + List list = invProductService.getCountInvProduct(filterInvProductRequest); PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setList(pageInfo.getList()); @@ -498,4 +498,19 @@ public class InvProductsController { return ResultVOUtils.success(pageSimpleResponse); } + /** + * 库存养护查询库存详情接口 + * + * @param filterInvProductRequest + * @return + */ + @GetMapping("spms/inv/products/getMAInvProducts") + public BaseResponse getMAInvProducts(FilterInvProductRequest filterInvProductRequest) { + if (null == filterInvProductRequest || StrUtil.isBlank(filterInvProductRequest.getInvWarehouseCode())) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + //invProductDetailService.getMAInvProducts(filterInvProductRequest); + return ResultVOUtils.success(); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/MAInvProductDetailResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/MAInvProductDetailResponse.java new file mode 100644 index 00000000..731e920f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/MAInvProductDetailResponse.java @@ -0,0 +1,43 @@ +package com.glxp.api.admin.res.inventory; + +import lombok.Data; + +@Data +public class MAInvProductDetailResponse { + + /** + * 条码 + */ + private String code; + + /** + * 产品标识 + */ + private String nameCode; + + /** + * 产品名称 + */ + private String cpmctymc; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String productionDate; + + /** + * 失效日期 + */ + private String expireDate; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductService.java index 7b93121d..e495d100 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductService.java @@ -43,6 +43,6 @@ public interface InvProductService { * @param filterInvProductRequest * @return */ - List getCountInvProductProduct(FilterInvProductRequest filterInvProductRequest); + List getCountInvProduct(FilterInvProductRequest filterInvProductRequest); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java index fff69534..ca8cfd2a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java @@ -145,7 +145,7 @@ public class InvProductServiceImpl implements InvProductService { } @Override - public List getCountInvProductProduct(FilterInvProductRequest filterInvProductRequest) { + public List getCountInvProduct(FilterInvProductRequest filterInvProductRequest) { if (null == filterInvProductRequest) { return Collections.emptyList(); }