From 71cb1c1e2d64b7bef9ffa579566080a479ad610f Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 4 Apr 2023 13:45:49 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E9=87=87=E8=B4=AD=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=92=8C=E9=87=87=E8=B4=AD=E5=8D=95=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/PurOrderController.java | 42 ++++++++++++------- .../purchase/PurPlanController.java | 20 ++++++--- .../api/dao/purchase/PurOrderDetailDao.java | 4 +- .../api/dao/purchase/PurPlanDetailDao.java | 3 +- .../req/purchase/PurOrderDetailRequest.java | 29 +++++++++++++ .../req/purchase/PurPlanDetailRequest.java | 29 +++++++++++++ .../purchase/PurOrderDetailService.java | 4 +- .../purchase/PurPlanDetailService.java | 4 +- .../impl/PurOrderDetailServiceImpl.java | 15 +++++-- .../impl/PurPlanDetailServiceImpl.java | 13 +++++- .../mapper/purchase/PurOrderDetailDao.xml | 42 +++++++++++++++++++ .../mapper/purchase/PurPlanDetailDao.xml | 42 +++++++++++++++++++ 12 files changed, 212 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java index 964fc8c0f..a7523de59 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java @@ -1,29 +1,28 @@ package com.glxp.api.controller.purchase; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; -import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.constant.ConstantType; -import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; -import com.glxp.api.entity.inout.IoOrderEntity; -import com.glxp.api.entity.purchase.*; -import com.glxp.api.req.purchase.*; +import com.glxp.api.entity.purchase.PurApplyEntity; +import com.glxp.api.entity.purchase.PurOrderDetailEntity; +import com.glxp.api.entity.purchase.PurOrderEntity; +import com.glxp.api.entity.purchase.PurPlanDetailEntity; +import com.glxp.api.req.purchase.PostPurOrderRequest; +import com.glxp.api.req.purchase.PurOrderDetailRequest; +import com.glxp.api.req.purchase.PurOrderRequest; +import com.glxp.api.req.purchase.PurPlanDetailRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.purchase.PurOrderDetailResponse; import com.glxp.api.res.purchase.PurOrderResponse; -import com.glxp.api.res.purchase.PurPlanResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; -import com.glxp.api.service.purchase.*; -import com.glxp.api.util.CustomUtil; +import com.glxp.api.service.purchase.PurOrderDetailService; +import com.glxp.api.service.purchase.PurOrderService; +import com.glxp.api.service.purchase.PurPlanDetailService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.RequiredArgsConstructor; @@ -33,8 +32,10 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.constraints.NotEmpty; -import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; import java.util.stream.Collectors; @@ -238,6 +239,19 @@ public class PurOrderController { } + /** + * 查询采购订单明细列表 + * + * @param purOrderDetailRequest + * @return + */ + @GetMapping("/purchase/order/list/getDetailList") + public BaseResponse getDetailList(PurOrderDetailRequest purOrderDetailRequest) { + List list = purOrderDetailService.getDetailList(purOrderDetailRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + /** * 添加申购单到采购单里面 */ diff --git a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java index c0229178d..fe383190c 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.purchase; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -11,7 +10,6 @@ import com.glxp.api.constant.Constant; 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.BasicCorpEntity; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderEntity; @@ -21,13 +19,10 @@ import com.glxp.api.req.purchase.PurApplyDetailRequest; import com.glxp.api.req.purchase.PurPlanDetailRequest; import com.glxp.api.req.purchase.PurPlanRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.purchase.PurOrderDetailResponse; import com.glxp.api.res.purchase.PurPlanResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.basic.BasicCorpService; import com.glxp.api.service.basic.IBasicBusTypeChangeService; -import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.purchase.*; @@ -189,7 +184,7 @@ public class PurPlanController { purPlanEntity.setAuditUser(userId + ""); purPlanEntity.setAuditUser(userId + ""); purPlanEntity.setStatus(postPurPlanRequest.getEditStatus()); - purPlanService.update(purPlanEntity); + purPlanService.update(purPlanEntity); if (purPlanEntity.getStatus() == 3) { purChangeService.purPlanChange(purPlanEntity); // generateDocument(purPlanEntity); @@ -388,6 +383,19 @@ public class PurPlanController { } + /** + * 查询采购计划详情列表 + * + * @param purPlanDetailRequest + * @return + */ + @GetMapping("/purchase/plan/list/getDetailList") + public BaseResponse getDetailList(PurPlanDetailRequest purPlanDetailRequest) { + List list = purPlanDetailService.getDetailList(purPlanDetailRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + /** * 添加申购单到采购单里面 */ diff --git a/src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java index af60ca523..cdc2de4ed 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java @@ -3,9 +3,7 @@ package com.glxp.api.dao.purchase; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.purchase.PurOrderDetailEntity; -import com.glxp.api.entity.purchase.PurPlanDetailEntity; import com.glxp.api.req.purchase.PurOrderDetailRequest; -import com.glxp.api.req.purchase.PurPlanDetailRequest; import com.glxp.api.res.purchase.PurOrderDetailResponse; import org.apache.ibatis.annotations.Param; @@ -26,4 +24,6 @@ public interface PurOrderDetailDao extends BaseMapper { boolean insertPurOrderDetailEntity(@Param("datas") List purOrderDetailEntityList); BasicProductsEntity selectIoOrderDetailBiz(@Param("id") long id); + + List selectDetailList(PurOrderDetailRequest purOrderDetailRequest); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java index 0891cbdde..23cc6d285 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java @@ -2,8 +2,6 @@ package com.glxp.api.dao.purchase; import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.basic.ProductInfoEntity; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.purchase.PurPlanDetailEntity; import com.glxp.api.req.purchase.PurPlanDetailRequest; import com.glxp.api.res.purchase.PurOrderDetailResponse; @@ -30,4 +28,5 @@ public interface PurPlanDetailDao { BasicProductsEntity selectIoOrderDetailBiz(@Param("id") long id); + List seletDetaiList(PurPlanDetailRequest purPlanDetailRequest); } diff --git a/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java b/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java index 6d4bc6da5..347b3dc02 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java @@ -46,5 +46,34 @@ public class PurOrderDetailRequest extends ListPageRequest { @NotBlank(message = "供应商ID不能为空") private String supId; + /** + * 采购计划单号 + */ + private String billNo; + + /** + * 规格型号 + */ + private String spec; + + /** + * 开始时间 + */ + private String startDate; + + /** + * 结束时间 + */ + private String endDate; + + /** + * 注册/凭证号 + */ + private String zczbhhzbapzbh; + + /** + * 生产企业 + */ + private String manufactory; } diff --git a/src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java b/src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java index ca293d611..48a2fed15 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java @@ -46,5 +46,34 @@ public class PurPlanDetailRequest extends ListPageRequest { @NotBlank(message = "供应商ID不能为空") private String supId; + /** + * 采购计划单号 + */ + private String billNo; + + /** + * 规格型号 + */ + private String spec; + + /** + * 开始时间 + */ + private String startDate; + + /** + * 结束时间 + */ + private String endDate; + + /** + * 注册/凭证号 + */ + private String zczbhhzbapzbh; + + /** + * 生产企业 + */ + private String manufactory; } diff --git a/src/main/java/com/glxp/api/service/purchase/PurOrderDetailService.java b/src/main/java/com/glxp/api/service/purchase/PurOrderDetailService.java index 55da67817..6463f8023 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurOrderDetailService.java @@ -1,12 +1,9 @@ package com.glxp.api.service.purchase; - import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.purchase.PurOrderDetailEntity; -import com.glxp.api.entity.purchase.PurPlanDetailEntity; import com.glxp.api.req.purchase.PurOrderDetailRequest; -import com.glxp.api.req.purchase.PurPlanDetailRequest; import com.glxp.api.res.purchase.PurOrderDetailResponse; import java.util.List; @@ -34,4 +31,5 @@ public interface PurOrderDetailService { BasicProductsEntity selectIoOrderDetailBiz(long id); + List getDetailList(PurOrderDetailRequest purOrderDetailRequest); } diff --git a/src/main/java/com/glxp/api/service/purchase/PurPlanDetailService.java b/src/main/java/com/glxp/api/service/purchase/PurPlanDetailService.java index 9055e563c..4020566e8 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurPlanDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurPlanDetailService.java @@ -1,13 +1,10 @@ package com.glxp.api.service.purchase; - import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.purchase.PurPlanDetailEntity; import com.glxp.api.req.purchase.PurPlanDetailRequest; import com.glxp.api.res.purchase.PurOrderDetailResponse; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -34,4 +31,5 @@ public interface PurPlanDetailService { BasicProductsEntity selectIoOrderDetailBiz(long id); + List getDetailList(PurPlanDetailRequest purPlanDetailRequest); } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java index c1368bff8..868e91a0e 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java @@ -2,15 +2,11 @@ package com.glxp.api.service.purchase.impl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.PurOrderDetailDao; -import com.glxp.api.dao.purchase.PurPlanDetailDao; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.purchase.PurOrderDetailEntity; -import com.glxp.api.entity.purchase.PurPlanDetailEntity; import com.glxp.api.req.purchase.PurOrderDetailRequest; -import com.glxp.api.req.purchase.PurPlanDetailRequest; import com.glxp.api.res.purchase.PurOrderDetailResponse; import com.glxp.api.service.purchase.PurOrderDetailService; -import com.glxp.api.service.purchase.PurPlanDetailService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -92,4 +88,15 @@ public class PurOrderDetailServiceImpl implements PurOrderDetailService { public BasicProductsEntity selectIoOrderDetailBiz(long id) { return purOrderDetailDao.selectIoOrderDetailBiz(id); } + + @Override + public List getDetailList(PurOrderDetailRequest purOrderDetailRequest) { + if (null == purOrderDetailRequest) { + return Collections.emptyList(); + } + if (null != purOrderDetailRequest.getPage() && null != purOrderDetailRequest.getLimit()) { + PageHelper.offsetPage((purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit(), purOrderDetailRequest.getLimit()); + } + return purOrderDetailDao.selectDetailList(purOrderDetailRequest); + } } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java index 5cb25b734..5988bb2ef 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java @@ -3,7 +3,6 @@ package com.glxp.api.service.purchase.impl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.PurPlanDetailDao; import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.purchase.PurPlanDetailEntity; import com.glxp.api.req.purchase.PurPlanDetailRequest; import com.glxp.api.res.purchase.PurOrderDetailResponse; @@ -89,4 +88,16 @@ public class PurPlanDetailServiceImpl implements PurPlanDetailService { public BasicProductsEntity selectIoOrderDetailBiz(long id) { return purPlanDetailDao.selectIoOrderDetailBiz(id); } + + @Override + public List getDetailList(PurPlanDetailRequest purPlanDetailRequest) { + if (null == purPlanDetailRequest) { + return Collections.emptyList(); + } + if (null != purPlanDetailRequest.getPage() && null != purPlanDetailRequest.getLimit()) { + PageHelper.offsetPage((purPlanDetailRequest.getPage() - 1) * purPlanDetailRequest.getLimit(), purPlanDetailRequest.getLimit()); + } + return purPlanDetailDao.seletDetaiList(purPlanDetailRequest); + } + } diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml index 4bc2e3d03..2d1c59dee 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml @@ -130,4 +130,46 @@ GROUP BY uuid + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml index c2595b84f..5c0a6b2dc 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml @@ -130,4 +130,46 @@ GROUP BY uuid + \ No newline at end of file