From f1e9becf45e85e6100a2c82d5e912687fcace462 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 15 Feb 2023 16:41:57 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E5=BA=93=E5=AD=98=E5=85=BB?= =?UTF-8?q?=E6=8A=A4=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inv/InvProductController.java | 15 ++++++ .../com/glxp/api/dao/inv/InvProductDao.java | 8 ++++ .../api/req/inv/FilterInvProductRequest.java | 5 ++ .../api/res/inv/InvMAProductResponse.java | 46 +++++++++++++++++++ .../api/service/inv/InvProductService.java | 9 ++++ .../inv/impl/InvMAOrderServiceImpl.java | 6 ++- .../inv/impl/InvProductServiceImpl.java | 11 +++++ .../mybatis/mapper/inv/InvMAOrderDao.xml | 4 +- .../mybatis/mapper/inv/invProductDao.xml | 32 +++++++++++++ 9 files changed, 133 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/glxp/api/res/inv/InvMAProductResponse.java diff --git a/src/main/java/com/glxp/api/controller/inv/InvProductController.java b/src/main/java/com/glxp/api/controller/inv/InvProductController.java index d0f615e6e..bafa27412 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java @@ -176,4 +176,19 @@ public class InvProductController { return ResultVOUtils.success(pageResponse); } + /** + * 库存养护查询库存详情接口 + * + * @param filterInvProductRequest + * @return + */ + @GetMapping("/spms/inv/product/getInvMAProducts") + public BaseResponse getInvMAProducts(FilterInvProductRequest filterInvProductRequest) { + if (null == filterInvProductRequest || StrUtil.isBlank(filterInvProductRequest.getInvCode())) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + List list = invProductService.getInvMAProducts(filterInvProductRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } } diff --git a/src/main/java/com/glxp/api/dao/inv/InvProductDao.java b/src/main/java/com/glxp/api/dao/inv/InvProductDao.java index bb513dd41..66b70f378 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvProductDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvProductDao.java @@ -26,4 +26,12 @@ public interface InvProductDao extends BaseMapperPlus stockStatistics(FilterInvProductRequest filterInvProductRequest); + + /** + * 库存养护查询库存产品信息 + * + * @param filterInvProductRequest + * @return + */ + List getMAInvProducts(FilterInvProductRequest filterInvProductRequest); } diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java index 119adfbc8..a2ead3e7d 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java @@ -98,4 +98,9 @@ public class FilterInvProductRequest extends ListPageRequest { */ private String cplb; + /** + * 货位号 + */ + private String invSpaceCode; + } diff --git a/src/main/java/com/glxp/api/res/inv/InvMAProductResponse.java b/src/main/java/com/glxp/api/res/inv/InvMAProductResponse.java new file mode 100644 index 000000000..f24dd5f4e --- /dev/null +++ b/src/main/java/com/glxp/api/res/inv/InvMAProductResponse.java @@ -0,0 +1,46 @@ +package com.glxp.api.res.inv; + +import lombok.Data; + +/** + * 库存养护查询库存产品VO + */ +@Data +public class InvMAProductResponse { + + /** + * id + */ + private String id; + + /** + * 产品标识 + */ + private String nameCode; + + /** + * 产品名称 + */ + private String cpmctymc; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String productionDate; + + /** + * 失效日期 + */ + private String expireDate; + +} diff --git a/src/main/java/com/glxp/api/service/inv/InvProductService.java b/src/main/java/com/glxp/api/service/inv/InvProductService.java index afa048502..d123b473a 100644 --- a/src/main/java/com/glxp/api/service/inv/InvProductService.java +++ b/src/main/java/com/glxp/api/service/inv/InvProductService.java @@ -48,4 +48,13 @@ public interface InvProductService { * @return */ List stockStatistics(FilterInvProductRequest filterInvProductRequest); + + /** + * 库存养护查询库存产品详情 + * + * @param filterInvProductRequest + * @return + */ + List getInvMAProducts(FilterInvProductRequest filterInvProductRequest); + } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderServiceImpl.java index 80d904aa5..6bd103e13 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderServiceImpl.java @@ -63,7 +63,7 @@ public class InvMAOrderServiceImpl implements InvMAOrderService { //创建时间 invMAOrderEntity.setCreateTime(new Date()); //创建人 - String createUser = customerService.getUserBean().getUserName(); + String createUser = customerService.getUserIdStr(); invMAOrderEntity.setCreateUser(createUser); //设置状态为草稿 invMAOrderEntity.setStatus(0); @@ -114,6 +114,10 @@ public class InvMAOrderServiceImpl implements InvMAOrderService { maOrder.setStatus(status); maOrder.setAuditTime(new Date()); maOrder.setUpdateTime(new Date()); + if (status == 2) { + //审核通过，更新审核人 + maOrder.setAuditUser(customerService.getUserIdStr()); + } invMAOrderDao.updateById(maOrder); return ResultVOUtils.success("更新成功"); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java index fcbdd8692..5483f9fe3 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java @@ -74,4 +74,15 @@ public class InvProductServiceImpl implements InvProductService { return invProductDao.stockStatistics(filterInvProductRequest); } + @Override + public List getInvMAProducts(FilterInvProductRequest filterInvProductRequest) { + if (null == filterInvProductRequest) { + return Collections.emptyList(); + } + if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) { + PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit()); + } + return invProductDao.getMAInvProducts(filterInvProductRequest); + } + } \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inv/InvMAOrderDao.xml b/src/main/resources/mybatis/mapper/inv/InvMAOrderDao.xml index fd3c74c9a..ed41d1dec 100644 --- a/src/main/resources/mybatis/mapper/inv/InvMAOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvMAOrderDao.xml @@ -12,8 +12,8 @@ ma.auditTime, ma.createUser, ma.auditUser, - (select name from auth_user where id = ma.createUser) createUserName, - (select name from auth_user where id = ma.auditUser) auditUserName, + (select employeeName from auth_user where id = ma.createUser) createUserName, + (select employeeName from auth_user where id = ma.auditUser) auditUserName, ma.remark, auth_warehouse.name invName, auth_space.name invSpaceName diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml index 435235af5..ace044f26 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml @@ -138,4 +138,36 @@ group by ip.relIdFk, ip.batchNo + +