From bf44909686640607a7da5acbef17ca7a5c872cb9 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 25 Apr 2026 16:07:13 +0800 Subject: [PATCH] =?UTF-8?q?feat(WmsDeliveryWaybillDetailController):=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=B2=E5=8F=91=E8=B4=A7=E9=92=A2=E5=8D=B7?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 statistics 接口用于统计已发货绑定钢卷的汇总数据 - 支持按时间范围查询已绑定钢卷ID列表 - 实现毛重、净重、数量等指标的数据统计功能 - 添加 startTime 和 endTime 参数支持时间段筛选 - 集成 WmsMaterialCoilService 的 getStatistics 方法 - 返回 Map 结构的统计数据结果 --- .../WmsDeliveryWaybillDetailController.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java b/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java index 9b773d73..f44e089f 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java @@ -1,8 +1,11 @@ package com.klp.controller; +import java.util.HashMap; import java.util.List; import java.util.Arrays; import java.util.Date; +import java.util.stream.Collectors; + import org.springframework.format.annotation.DateTimeFormat; import com.klp.domain.vo.WmsMaterialCoilBindVo; @@ -147,4 +150,26 @@ public class WmsDeliveryWaybillDetailController extends BaseController { bo.setStatusFirst(true); // 未发货的排在前面 return iWmsMaterialCoilService.queryPageListWithBindInfo(bo, pageQuery); } + + /** + * 统计已发货绑定钢卷的汇总数据 + * 根据coilIds查询条件统计毛重、净重、数量等指标 + */ + @GetMapping("/statistics") + public R> getStatistics( + WmsMaterialCoilBo bo, + @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime, + @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime) { + List boundCoilIds; + if (startTime != null || endTime != null) { + boundCoilIds = iWmsDeliveryWaybillDetailService.getBoundCoilIdsByTimeRange(startTime, endTime); + } else { + boundCoilIds = iWmsDeliveryWaybillDetailService.getBoundCoilIds(); + } + if (boundCoilIds == null || boundCoilIds.isEmpty()) { + return R.ok(new HashMap<>()); + } + bo.setCoilIds(boundCoilIds.stream().map(String::valueOf).collect(Collectors.joining(","))); + return R.ok(iWmsMaterialCoilService.getStatistics(bo)); + } }