From 72a4b9095c588b0a63cdb3bff871f6ad15d6eda9 Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 4 Apr 2023 11:01:47 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E7=94=B3=E8=B4=AD=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/PurApplyController.java | 18 +++++-- .../api/dao/purchase/PurApplyDetailDao.java | 4 +- .../req/purchase/PurApplyDetailRequest.java | 51 ++++++++++++++++--- .../res/purchase/PurOrderDetailResponse.java | 2 + .../purchase/PurApplyDetailService.java | 9 +++- .../impl/PurApplyDetailImplService.java | 11 ++++ .../mapper/purchase/PurApplyDetailDao.xml | 43 ++++++++++++++++ 7 files changed, 122 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index 512ab87de..fbca70550 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -12,11 +12,8 @@ import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderEntity; -import com.glxp.api.entity.inout.PurReceiveDetailEntity; -import com.glxp.api.entity.inout.PurReceiveEntity; import com.glxp.api.entity.purchase.*; import com.glxp.api.req.purchase.PostPurApplyRequest; import com.glxp.api.req.purchase.PurApplyDetailRequest; @@ -25,7 +22,7 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.purchase.PurApplyResponse; import com.glxp.api.res.purchase.PurOrderDetailResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.basic.*; +import com.glxp.api.service.basic.IBasicBusTypeChangeService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.purchase.*; @@ -429,6 +426,19 @@ public class PurApplyController { } + /** + * 查询申购单明细列表 + * + * @param purApplyDetailRequest + * @return + */ + @GetMapping("/purchase/apply/getDetailList") + public BaseResponse getDetailList(PurApplyDetailRequest purApplyDetailRequest) { + List list = purApplyDetailService.getDetailList(purApplyDetailRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + /** * 新增申购单 */ diff --git a/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java index a9d4e3285..24361218d 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java @@ -1,9 +1,7 @@ package com.glxp.api.dao.purchase; - import com.glxp.api.entity.purchase.PurApplyDetailEntity; -import com.glxp.api.entity.purchase.PurOrderDetailEntity; import com.glxp.api.req.purchase.PurApplyDetailRequest; import com.glxp.api.res.purchase.PurOrderDetailResponse; import org.apache.ibatis.annotations.Mapper; @@ -28,4 +26,6 @@ public interface PurApplyDetailDao { boolean insertPurApplyDetailEntity(@Param("datas") List purApplyDetailEntityList); + List selectPurApplyDetailList(PurApplyDetailRequest purApplyDetailRequest); + } diff --git a/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java b/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java index 69bdb7691..ac4dda2e1 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java @@ -3,9 +3,6 @@ package com.glxp.api.req.purchase; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - /** * @author anthony.ywj * @date 2022-10-12 @@ -16,20 +13,58 @@ public class PurApplyDetailRequest extends ListPageRequest { private Long id; - + /** + * 关联申购单主键 + */ private String orderIdFk; + /** + * 申购单号 + */ + private String billNo; + /** + * 物资编号 + */ private Long productId; - + /** + * 物资名称 + */ private String productName; - + /** + * 申购数量 + */ private Long count; - + /** + * 供应商ID + */ private String supId; - + /** + * 规格型号 + */ + private String spec; + + /** + * 注册证号 + */ + private String zczbhhzbapzbh; + + /** + * 生产企业 + */ + private String manufactory; + + /** + * 开始时间 + */ + private String startDate; + + /** + * 截止席间 + */ + private String endDate; } diff --git a/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java b/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java index a6e5d488f..7b1476f08 100644 --- a/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java @@ -47,4 +47,6 @@ public class PurOrderDetailResponse { private String supId; private String supName; + + private String billNo; } diff --git a/src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java b/src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java index b28d6a4f5..269f50b6d 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java @@ -1,9 +1,7 @@ package com.glxp.api.service.purchase; - import com.glxp.api.entity.purchase.PurApplyDetailEntity; -import com.glxp.api.entity.purchase.PurOrderDetailEntity; import com.glxp.api.req.purchase.PurApplyDetailRequest; import com.glxp.api.res.purchase.PurOrderDetailResponse; @@ -30,4 +28,11 @@ public interface PurApplyDetailService { boolean insertPurApplyDetailEntity(List purApplyDetailEntityList); + /** + * 查询申购单据明细列表 + * + * @param purApplyDetailRequest + * @return + */ + List getDetailList(PurApplyDetailRequest purApplyDetailRequest); } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java index 7c2e21f01..d675fc131 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java @@ -87,5 +87,16 @@ public class PurApplyDetailImplService implements PurApplyDetailService { return purApplyDetailDao.insertPurApplyDetailEntity(purApplyDetailEntityList); } + @Override + public List getDetailList(PurApplyDetailRequest purApplyDetailRequest) { + if (null == purApplyDetailRequest) { + return Collections.emptyList(); + } + if (null == purApplyDetailRequest.getPage() && null != purApplyDetailRequest.getLimit()) { + PageHelper.offsetPage((purApplyDetailRequest.getPage() - 1) * purApplyDetailRequest.getLimit(), purApplyDetailRequest.getLimit()); + } + return purApplyDetailDao.selectPurApplyDetailList(purApplyDetailRequest); + } + } diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml index ed2b8c54f..cde851989 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml @@ -113,4 +113,47 @@ + \ No newline at end of file