From 6781ae135db5ddaf39d3d5a741844cca3ca1fa69 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Wed, 26 Nov 2025 09:38:22 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=96=B0=E5=A2=9E=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E6=8A=A5=E8=A1=A8=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在IWmsDeliveryPlanService接口中新增getDeliveryReport方法 - 在WmsDeliveryPlanController中添加/report接口用于获取发货报表 - 在WmsDeliveryPlanMapper中新增selectDeliveryReport方法 - 在WmsDeliveryPlanMapper.xml中编写发货报表查询SQL - 在WmsDeliveryPlanServiceImpl中实现发货报表统计逻辑 - 新增WmsDeliveryReportVo类用于封装发货报表数据 --- .../controller/WmsDeliveryPlanController.java | 17 ++++++ .../klp/domain/vo/WmsDeliveryReportVo.java | 57 +++++++++++++++++++ .../com/klp/mapper/WmsDeliveryPlanMapper.java | 4 ++ .../klp/service/IWmsDeliveryPlanService.java | 4 ++ .../impl/WmsDeliveryPlanServiceImpl.java | 17 ++++-- .../mapper/klp/WmsDeliveryPlanMapper.xml | 34 +++++++++++ 6 files changed, 129 insertions(+), 4 deletions(-) create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryReportVo.java diff --git a/klp-wms/src/main/java/com/klp/controller/WmsDeliveryPlanController.java b/klp-wms/src/main/java/com/klp/controller/WmsDeliveryPlanController.java index 427c2298..9181cdeb 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsDeliveryPlanController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsDeliveryPlanController.java @@ -1,9 +1,11 @@ package com.klp.controller; +import java.util.Date; import java.util.List; import java.util.Arrays; import com.klp.domain.vo.WmsDeliveryPlanStatisticsVo; +import com.klp.domain.vo.WmsDeliveryReportVo; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; @@ -108,4 +110,19 @@ public class WmsDeliveryPlanController extends BaseController { List statistics = iWmsDeliveryPlanService.getDeliveryPlanStatistics(planId); return R.ok(statistics); } + + + /** + * 获取发货报表统计信息 + * + * @param startTime 开始时间 + * @param endTime 结束时间 + */ + @GetMapping("/report") + public R> getDeliveryReport( + @RequestParam(required = false) Date startTime, + @RequestParam(required = false) Date endTime) { + List report = iWmsDeliveryPlanService.getDeliveryReport(startTime, endTime); + return R.ok(report); + } } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryReportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryReportVo.java new file mode 100644 index 00000000..ccb71116 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryReportVo.java @@ -0,0 +1,57 @@ +package com.klp.domain.vo; + + +import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 发货报表统计VO + */ +@Data +public class WmsDeliveryReportVo { + /** + * 钢卷类型（品名） + */ + private String productName; + + /** + * 发货单数量 + */ + private Integer waybillCount = 0; + + /** + * 钢卷数量 + */ + private Integer coilCount = 0; + + /** + * 总重量（吨） + */ + private BigDecimal totalWeight = BigDecimal.ZERO; + + /** + * 日均发货单数量 + */ + private BigDecimal dailyWaybillCount = BigDecimal.ZERO; + + /** + * 日均钢卷数量 + */ + private BigDecimal dailyCoilCount = BigDecimal.ZERO; + + /** + * 日均重量（吨） + */ + private BigDecimal dailyWeight = BigDecimal.ZERO; + + /** + * 统计开始时间 + */ + private Date startTime; + + /** + * 统计结束时间 + */ + private Date endTime; +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsDeliveryPlanMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsDeliveryPlanMapper.java index 9ba52ad2..c3eae15d 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsDeliveryPlanMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsDeliveryPlanMapper.java @@ -4,7 +4,9 @@ import com.klp.domain.WmsDeliveryPlan; import com.klp.domain.vo.WmsDeliveryPlanStatisticsVo; import com.klp.domain.vo.WmsDeliveryPlanVo; import com.klp.common.core.mapper.BaseMapperPlus; +import com.klp.domain.vo.WmsDeliveryReportVo; +import java.util.Date; import java.util.List; /** @@ -16,4 +18,6 @@ import java.util.List; public interface WmsDeliveryPlanMapper extends BaseMapperPlus { List selectDeliveryPlanStatistics(Long planId); + + List selectDeliveryReport(Date startTime, Date endTime); } diff --git a/klp-wms/src/main/java/com/klp/service/IWmsDeliveryPlanService.java b/klp-wms/src/main/java/com/klp/service/IWmsDeliveryPlanService.java index 0b8ff7e2..26ef80a2 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsDeliveryPlanService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsDeliveryPlanService.java @@ -6,8 +6,10 @@ import com.klp.domain.vo.WmsDeliveryPlanVo; import com.klp.domain.bo.WmsDeliveryPlanBo; import com.klp.common.core.page.TableDataInfo; import com.klp.common.core.domain.PageQuery; +import com.klp.domain.vo.WmsDeliveryReportVo; import java.util.Collection; +import java.util.Date; import java.util.List; /** @@ -49,4 +51,6 @@ public interface IWmsDeliveryPlanService { Boolean deleteWithValidByIds(Collection ids, Boolean isValid); List getDeliveryPlanStatistics(Long planId); + + List getDeliveryReport(Date startTime, Date endTime); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java index a3d15177..c2227461 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.klp.common.utils.StringUtils; import com.klp.domain.vo.WmsDeliveryPlanStatisticsVo; +import com.klp.domain.vo.WmsDeliveryReportVo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.klp.domain.bo.WmsDeliveryPlanBo; @@ -16,10 +17,7 @@ import com.klp.domain.WmsDeliveryPlan; import com.klp.mapper.WmsDeliveryPlanMapper; import com.klp.service.IWmsDeliveryPlanService; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Collection; +import java.util.*; /** * 发货计划Service业务层处理 @@ -120,4 +118,15 @@ public class WmsDeliveryPlanServiceImpl implements IWmsDeliveryPlanService { public List getDeliveryPlanStatistics(Long planId) { return baseMapper.selectDeliveryPlanStatistics(planId); } + + /** + * 获取发货报表统计信息 + * + * @param startTime 开始时间 + * @param endTime 结束时间 + * @return 报表统计信息列表 + */ + public List getDeliveryReport(Date startTime, Date endTime) { + return baseMapper.selectDeliveryReport(startTime, endTime); + } } diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml index ed6a8267..28300e9d 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml @@ -56,6 +56,40 @@ ORDER BY dp.create_time DESC + +