feat(wms): 重构发货报表统计功能

- 修改发货报表返回结构,支持汇总和按类型统计
- 新增WmsDeliveryReportResultVo用于封装报表结果
- 新增WmsDeliveryReportSummaryVo用于汇总统计
- 新增WmsDeliveryReportByTypeVo用于按类型统计
- 调整Mapper层SQL查询逻辑,分离汇总与明细查询
- 更新Controller层接口返回类型
- 优化Service层实现,组装新的报表数据结构
This commit is contained in:
2025-11-27 11:05:01 +08:00
parent e7d050326f
commit f7a441906f
8 changed files with 181 additions and 12 deletions

View File

@@ -6,6 +6,7 @@ import java.util.Arrays;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.klp.domain.vo.WmsDeliveryPlanStatisticsVo;
import com.klp.domain.vo.WmsDeliveryReportResultVo;
import com.klp.domain.vo.WmsDeliveryReportVo;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
@@ -122,10 +123,10 @@ public class WmsDeliveryPlanController extends BaseController {
* @param endTime 结束时间
*/
@GetMapping("/report")
public R<List<WmsDeliveryReportVo>> getDeliveryReport(
public R<WmsDeliveryReportResultVo> getDeliveryReport(
@RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
@RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime) {
List<WmsDeliveryReportVo> report = iWmsDeliveryPlanService.getDeliveryReport(startTime, endTime);
WmsDeliveryReportResultVo report = iWmsDeliveryPlanService.getDeliveryReport(startTime, endTime);
return R.ok(report);
}
}