feat(wms,oms)：出库排名统计改造为聚合排名——商品按物料合并/线路按线路+物料合并，按出库数量降序

- 商品tab：一行=一个货品(跨出库单汇总)，返回货号/货名/件数/毛重(吨)/体积(CBM)/退保总额(占位null)，忽略线路筛选参数 - 线路tab：一行=线路×货品(按线路+物料编码合并)，额外返回线路编码/线路，仅统计带线路的单(排除line_code为空的历史单)；商品/线路筛选参数均生效 - 单据级字段(种类/仓单编号/入库单号/客户编号/收货人/出仓日期)合并后无单值可对应，不再返回 - 件数=SUM(CHECK_QUANTITY)复核确认的实际出库量(与入库排名实际上架量SHELVES_QUANTITY对称)，按件数降序，编码次之 - 合计行：件数/毛重吨/体积全量合计；商品tab含totalOrderCount(去重出库单数)，线路tab含totalOrderCount+totalLineCount(去重线路数) - 数据源不变：WMS查本库出库表，OMS跨库查NGWL_TEST_WMS同名表，两边数字一致；接口路径/传参不变
2026-09-03 16:01:17 +08:00
parent c9c3062789
commit 7a3021f82a
22 changed files with 615 additions and 368 deletions
@@ -1,13 +1,14 @@
 package com.mhd.oms.domain.outboundRank.repository.facade;

-import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundDetailRankPO;
 import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundDetailRankTotalPO;
+import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundLineRankPO;
+import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundMaterialRankPO;
 import com.mhd.oms.domain.outboundRank.repository.todo.ExecutionOutboundRankDO;

 import java.util.List;

 /**
- * 出库排名统计（明细）Service接口
+ * 出库排名统计Service接口
 *
 * @author rcx
 * @date 2026-08-31
@@ -15,12 +16,22 @@ import java.util.List;
 public interface IExecutionOutboundRankService {

    /**
-     * 出库明细列表
+     * 商品出库排名列表（货品聚合）
     */
-    List<ExecutionOutboundDetailRankPO> queryDetailList(ExecutionOutboundRankDO executionOutboundRankDO);
+    List<ExecutionOutboundMaterialRankPO> queryMaterialRankList(ExecutionOutboundRankDO executionOutboundRankDO);

    /**
-     * 出库明细合计（不分页）
+     * 商品出库排名合计（不分页）
     */
-    ExecutionOutboundDetailRankTotalPO queryDetailTotal(ExecutionOutboundRankDO executionOutboundRankDO);
+    ExecutionOutboundDetailRankTotalPO queryMaterialRankTotal(ExecutionOutboundRankDO executionOutboundRankDO);
+
+    /**
+     * 线路出库排名列表（线路×货品聚合）
+     */
+    List<ExecutionOutboundLineRankPO> queryLineRankList(ExecutionOutboundRankDO executionOutboundRankDO);
+
+    /**
+     * 线路出库排名合计（不分页）
+     */
+    ExecutionOutboundDetailRankTotalPO queryLineRankTotal(ExecutionOutboundRankDO executionOutboundRankDO);
 }
@@ -1,13 +1,14 @@
 package com.mhd.oms.domain.outboundRank.repository.mapper;

-import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundDetailRankPO;
 import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundDetailRankTotalPO;
+import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundLineRankPO;
+import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundMaterialRankPO;
 import com.mhd.oms.domain.outboundRank.repository.todo.ExecutionOutboundRankDO;

 import java.util.List;

 /**
- * 出库排名统计（明细）Mapper接口
+ * 出库排名统计Mapper接口
 *
 * @author rcx
 * @date 2026-08-31
@@ -15,12 +16,22 @@ import java.util.List;
 public interface ExecutionOutboundRankMapper {

    /**
-     * 出库明细列表（一行=仓单×货品，按件数倒序）
+     * 商品出库排名列表（一行=一个货品，跨单汇总，按实际出库量降序）
     */
-    List<ExecutionOutboundDetailRankPO> queryDetailList(ExecutionOutboundRankDO executionOutboundRankDO);
+    List<ExecutionOutboundMaterialRankPO> queryMaterialRankList(ExecutionOutboundRankDO executionOutboundRankDO);

    /**
-     * 出库明细合计（不分页，当前筛选条件全量合计）
+     * 商品出库排名合计（不分页，当前筛选条件全量合计）
     */
-    ExecutionOutboundDetailRankTotalPO queryDetailTotal(ExecutionOutboundRankDO executionOutboundRankDO);
+    ExecutionOutboundDetailRankTotalPO queryMaterialRankTotal(ExecutionOutboundRankDO executionOutboundRankDO);
+
+    /**
+     * 线路出库排名列表（一行=线路×货品，按实际出库量降序，仅统计带线路的单）
+     */
+    List<ExecutionOutboundLineRankPO> queryLineRankList(ExecutionOutboundRankDO executionOutboundRankDO);
+
+    /**
+     * 线路出库排名合计（不分页，当前筛选条件全量合计）
+     */
+    ExecutionOutboundDetailRankTotalPO queryLineRankTotal(ExecutionOutboundRankDO executionOutboundRankDO);
 }
@@ -2,8 +2,9 @@ package com.mhd.oms.domain.outboundRank.repository.persistence;

 import com.mhd.oms.domain.outboundRank.repository.facade.IExecutionOutboundRankService;
 import com.mhd.oms.domain.outboundRank.repository.mapper.ExecutionOutboundRankMapper;
-import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundDetailRankPO;
 import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundDetailRankTotalPO;
+import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundLineRankPO;
+import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundMaterialRankPO;
 import com.mhd.oms.domain.outboundRank.repository.todo.ExecutionOutboundRankDO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,7 +12,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;

 /**
- * 出库排名统计（明细）Service业务层处理
+ * 出库排名统计Service业务层处理
 *
 * @author rcx
 * @date 2026-08-31
@@ -23,12 +24,22 @@ public class ExecutionOutboundRankImpl implements IExecutionOutboundRankService
    private ExecutionOutboundRankMapper executionOutboundRankMapper;

    @Override
-    public List<ExecutionOutboundDetailRankPO> queryDetailList(ExecutionOutboundRankDO executionOutboundRankDO) {
-        return executionOutboundRankMapper.queryDetailList(executionOutboundRankDO);
+    public List<ExecutionOutboundMaterialRankPO> queryMaterialRankList(ExecutionOutboundRankDO executionOutboundRankDO) {
+        return executionOutboundRankMapper.queryMaterialRankList(executionOutboundRankDO);
    }

    @Override
-    public ExecutionOutboundDetailRankTotalPO queryDetailTotal(ExecutionOutboundRankDO executionOutboundRankDO) {
-        return executionOutboundRankMapper.queryDetailTotal(executionOutboundRankDO);
+    public ExecutionOutboundDetailRankTotalPO queryMaterialRankTotal(ExecutionOutboundRankDO executionOutboundRankDO) {
+        return executionOutboundRankMapper.queryMaterialRankTotal(executionOutboundRankDO);
+    }
+
+    @Override
+    public List<ExecutionOutboundLineRankPO> queryLineRankList(ExecutionOutboundRankDO executionOutboundRankDO) {
+        return executionOutboundRankMapper.queryLineRankList(executionOutboundRankDO);
+    }
+
+    @Override
+    public ExecutionOutboundDetailRankTotalPO queryLineRankTotal(ExecutionOutboundRankDO executionOutboundRankDO) {
+        return executionOutboundRankMapper.queryLineRankTotal(executionOutboundRankDO);
    }
 }
@@ -1,85 +0,0 @@
-package com.mhd.oms.domain.outboundRank.repository.po;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mhd.common.core.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 出库排名统计（明细）PO（一行 = 仓单×货品，件数/毛重/体积按行汇总）
- *
- * <p>字段口径：种类=出库单据类型；仓单编号=出库单号；收货人=出库单 TO 栏(为空取联系人)；
- * 毛重(吨)=明细总毛重KG/1000；出仓日期=出仓日期(为空依次兜底完成时间/创建时间)；
- * 退保总额为占位字段，后端暂无对应数据来源，恒为 null（候选：货品档案保额 insure_amount，确认后可补）</p>
- *
- * @author rcx
- * @date 2026-08-31
- */
-@Data
-@ApiModel(value = "出库排名统计明细对象", description = "出库排名统计明细响应对象")
-public class ExecutionOutboundDetailRankPO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("种类（出库单据类型）")
-    @Excel(name = "种类")
-    private String orderTypeName;
-
-    @ApiModelProperty("仓单编号（出库单号）")
-    @Excel(name = "仓单编号")
-    private String outOrderNumber;
-
-    @ApiModelProperty("入库单号")
-    @Excel(name = "入库单号")
-    private String inOrderNumber;
-
-    @ApiModelProperty("客户编号")
-    @Excel(name = "客户编号")
-    private String customerCode;
-
-    @ApiModelProperty("收货人（出库单 TO 栏，为空取联系人）")
-    @Excel(name = "收货人")
-    private String receiver;
-
-    @ApiModelProperty("商品货号（辅助字段，不导出）")
-    private String materialCode;
-
-    @ApiModelProperty("货名")
-    @Excel(name = "货名")
-    private String materialName;
-
-    @ApiModelProperty("线路编码（辅助字段，不导出）")
-    private String lineCode;
-
-    @ApiModelProperty("线路")
-    @Excel(name = "线路")
-    private String lineName;
-
-    @ApiModelProperty("件数（复核确认的实际出库量合计，与入库排名的实际上架量对称）")
-    @Excel(name = "件数")
-    private BigDecimal pieceCount;
-
-    @ApiModelProperty("毛重(吨)")
-    @Excel(name = "毛重(吨)")
-    private BigDecimal grossWeightTon;
-
-    @ApiModelProperty("体积(CBM)")
-    @Excel(name = "体积(CBM)")
-    private BigDecimal totalVolume;
-
-    @ApiModelProperty("退保总额（占位字段，后端暂无数据来源，恒为 null）")
-    @Excel(name = "退保总额")
-    private BigDecimal depositRefundAmount;
-
-    @ApiModelProperty("出仓日期（出仓日期为空时依次兜底完成时间/创建时间）")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date outboundDate;
-}
@@ -8,16 +8,16 @@ import java.io.Serializable;
 import java.math.BigDecimal;

 /**
- * 出库排名统计（明细）合计PO
+ * 出库排名统计合计PO
 *
 * <p>当前筛选条件下不分页的全量合计，随分页列表一起返回
- * （totalPieceCount/totalGrossWeightTon/totalVolume/totalOrderCount）</p>
+ * （totalPieceCount/totalGrossWeightTon/totalVolume/totalOrderCount/totalLineCount）</p>
 *
 * @author rcx
 * @date 2026-08-31
 */
@Data
-@ApiModel(value = "出库排名统计明细合计对象", description = "出库排名统计明细合计响应对象")
+@ApiModel(value = "出库排名统计合计对象", description = "出库排名统计合计响应对象")
 public class ExecutionOutboundDetailRankTotalPO implements Serializable {

    private static final long serialVersionUID = 1L;
@@ -33,4 +33,7 @@ public class ExecutionOutboundDetailRankTotalPO implements Serializable {

    @ApiModelProperty("仓单数合计（去重出库单数）")
    private Long totalOrderCount;
+
+    @ApiModelProperty("线路数合计（去重线路数，线路排名使用）")
+    private Long totalLineCount;
 }
@@ -0,0 +1,59 @@
+package com.mhd.oms.domain.outboundRank.repository.po;
+
+import com.mhd.common.core.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 线路出库排名PO（一行 = 线路×货品，日期区间内汇总）
+ *
+ * <p>按线路+物料编码合并：多张出库单合并为一行，单据级字段（种类/仓单编号/入库单号/客户编号/收货人/出仓日期）不提供；
+ * 仅统计带线路的出库单（line_code 为 2026-08-20 新增冗余字段，历史单为空，不参与线路排名）；
+ * 件数 = SUM(CHECK_QUANTITY) 复核确认的实际出库量（与入库排名的实际上架量对称）；
+ * 退保总额为占位字段，后端暂无对应数据来源，恒为 null</p>
+ *
+ * @author rcx
+ * @date 2026-08-31
+ */
+@Data
+@ApiModel(value = "线路出库排名对象", description = "线路出库排名响应对象")
+public class ExecutionOutboundLineRankPO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("线路编码")
+    @Excel(name = "线路编码")
+    private String lineCode;
+
+    @ApiModelProperty("线路")
+    @Excel(name = "线路")
+    private String lineName;
+
+    @ApiModelProperty("商品货号")
+    @Excel(name = "商品货号")
+    private String materialCode;
+
+    @ApiModelProperty("货名")
+    @Excel(name = "货名")
+    private String materialName;
+
+    @ApiModelProperty("件数（复核确认的实际出库量合计，与入库排名的实际上架量对称）")
+    @Excel(name = "件数")
+    private BigDecimal pieceCount;
+
+    @ApiModelProperty("毛重(吨)")
+    @Excel(name = "毛重(吨)")
+    private BigDecimal grossWeightTon;
+
+    @ApiModelProperty("体积(CBM)")
+    @Excel(name = "体积(CBM)")
+    private BigDecimal totalVolume;
+
+    @ApiModelProperty("退保总额（占位字段，后端暂无数据来源，恒为 null）")
+    @Excel(name = "退保总额")
+    private BigDecimal depositRefundAmount;
+}
@@ -0,0 +1,50 @@
+package com.mhd.oms.domain.outboundRank.repository.po;
+
+import com.mhd.common.core.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 商品出库排名PO（一行 = 一个货品，日期区间内跨出库单汇总）
+ *
+ * <p>按物料编码合并：一个货品会走多条线路/多张单，单据级字段（种类/仓单编号/入库单号/客户编号/收货人/出仓日期）与
+ * 线路字段均无单值可返，不提供；件数 = SUM(CHECK_QUANTITY) 复核确认的实际出库量（与入库排名的实际上架量对称）；
+ * 退保总额为占位字段，后端暂无对应数据来源，恒为 null</p>
+ *
+ * @author rcx
+ * @date 2026-08-31
+ */
+@Data
+@ApiModel(value = "商品出库排名对象", description = "商品出库排名响应对象")
+public class ExecutionOutboundMaterialRankPO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("商品货号")
+    @Excel(name = "商品货号")
+    private String materialCode;
+
+    @ApiModelProperty("货名")
+    @Excel(name = "货名")
+    private String materialName;
+
+    @ApiModelProperty("件数（复核确认的实际出库量合计，与入库排名的实际上架量对称）")
+    @Excel(name = "件数")
+    private BigDecimal pieceCount;
+
+    @ApiModelProperty("毛重(吨)")
+    @Excel(name = "毛重(吨)")
+    private BigDecimal grossWeightTon;
+
+    @ApiModelProperty("体积(CBM)")
+    @Excel(name = "体积(CBM)")
+    private BigDecimal totalVolume;
+
+    @ApiModelProperty("退保总额（占位字段，后端暂无数据来源，恒为 null）")
+    @Excel(name = "退保总额")
+    private BigDecimal depositRefundAmount;
+}
@@ -4,8 +4,9 @@ import com.mhd.common.core.exception.ServiceException;
 import com.mhd.common.core.utils.StringUtils;
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.system.api.model.LoginUser;
-import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundDetailRankPO;
 import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundDetailRankTotalPO;
+import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundLineRankPO;
+import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundMaterialRankPO;
 import com.mhd.oms.domain.outboundRank.repository.todo.ExecutionOutboundRankDO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +15,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;

 /**
- * 出库排名统计（明细）应用服务
+ * 出库排名统计应用服务
 *
 * <p>负责登录用户组织隔离注入、日期区间校验，查询逻辑在 ExecutionOutboundRankDomainService → ExecutionOutboundRankMapper.xml（跨库取 WMS 出库数据）</p>
 *
@@ -29,26 +30,49 @@ public class ExecutionOutboundRankApplicationService {
    private ExecutionOutboundRankDomainService executionOutboundRankDomainService;

    /**
-     * 分页查询出库明细列表
+     * 分页查询商品出库排名列表（货品聚合）
     */
-    public List<ExecutionOutboundDetailRankPO> queryDetailList(ExecutionOutboundRankDO executionOutboundRankDO) {
+    public List<ExecutionOutboundMaterialRankPO> queryMaterialRankList(ExecutionOutboundRankDO executionOutboundRankDO) {
        fillLoginContext(executionOutboundRankDO);
-        return executionOutboundRankDomainService.queryDetailList(executionOutboundRankDO);
+        return executionOutboundRankDomainService.queryMaterialRankList(executionOutboundRankDO);
    }

    /**
-     * 出库明细合计（当前筛选条件全量，不分页）
+     * 商品出库排名合计（当前筛选条件全量，不分页）
     */
-    public ExecutionOutboundDetailRankTotalPO queryDetailTotal(ExecutionOutboundRankDO executionOutboundRankDO) {
-        return executionOutboundRankDomainService.queryDetailTotal(executionOutboundRankDO);
+    public ExecutionOutboundDetailRankTotalPO queryMaterialRankTotal(ExecutionOutboundRankDO executionOutboundRankDO) {
+        return executionOutboundRankDomainService.queryMaterialRankTotal(executionOutboundRankDO);
    }

    /**
-     * 导出出库明细（不分页全量）
+     * 导出商品出库排名（不分页全量）
     */
-    public List<ExecutionOutboundDetailRankPO> exportDetailList(ExecutionOutboundRankDO executionOutboundRankDO) {
+    public List<ExecutionOutboundMaterialRankPO> exportMaterialRankList(ExecutionOutboundRankDO executionOutboundRankDO) {
        fillLoginContext(executionOutboundRankDO);
-        return executionOutboundRankDomainService.queryDetailList(executionOutboundRankDO);
+        return executionOutboundRankDomainService.queryMaterialRankList(executionOutboundRankDO);
+    }
+
+    /**
+     * 分页查询线路出库排名列表（线路×货品聚合）
+     */
+    public List<ExecutionOutboundLineRankPO> queryLineRankList(ExecutionOutboundRankDO executionOutboundRankDO) {
+        fillLoginContext(executionOutboundRankDO);
+        return executionOutboundRankDomainService.queryLineRankList(executionOutboundRankDO);
+    }
+
+    /**
+     * 线路出库排名合计（当前筛选条件全量，不分页）
+     */
+    public ExecutionOutboundDetailRankTotalPO queryLineRankTotal(ExecutionOutboundRankDO executionOutboundRankDO) {
+        return executionOutboundRankDomainService.queryLineRankTotal(executionOutboundRankDO);
+    }
+
+    /**
+     * 导出线路出库排名（不分页全量）
+     */
+    public List<ExecutionOutboundLineRankPO> exportLineRankList(ExecutionOutboundRankDO executionOutboundRankDO) {
+        fillLoginContext(executionOutboundRankDO);
+        return executionOutboundRankDomainService.queryLineRankList(executionOutboundRankDO);
    }

    /**
@@ -1,8 +1,9 @@
 package com.mhd.oms.domain.outboundRank.service;

 import com.mhd.oms.domain.outboundRank.repository.facade.IExecutionOutboundRankService;
-import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundDetailRankPO;
 import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundDetailRankTotalPO;
+import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundLineRankPO;
+import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundMaterialRankPO;
 import com.mhd.oms.domain.outboundRank.repository.todo.ExecutionOutboundRankDO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,7 +12,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;

 /**
- * 出库排名统计（明细）领域服务
+ * 出库排名统计领域服务
 *
 * @author rcx
 * @date 2026-08-31
@@ -24,16 +25,30 @@ public class ExecutionOutboundRankDomainService {
    private IExecutionOutboundRankService executionOutboundRankService;

    /**
-     * 出库明细列表
+     * 商品出库排名列表（货品聚合）
     */
-    public List<ExecutionOutboundDetailRankPO> queryDetailList(ExecutionOutboundRankDO executionOutboundRankDO) {
-        return executionOutboundRankService.queryDetailList(executionOutboundRankDO);
+    public List<ExecutionOutboundMaterialRankPO> queryMaterialRankList(ExecutionOutboundRankDO executionOutboundRankDO) {
+        return executionOutboundRankService.queryMaterialRankList(executionOutboundRankDO);
    }

    /**
-     * 出库明细合计（不分页）
+     * 商品出库排名合计（不分页）
     */
-    public ExecutionOutboundDetailRankTotalPO queryDetailTotal(ExecutionOutboundRankDO executionOutboundRankDO) {
-        return executionOutboundRankService.queryDetailTotal(executionOutboundRankDO);
+    public ExecutionOutboundDetailRankTotalPO queryMaterialRankTotal(ExecutionOutboundRankDO executionOutboundRankDO) {
+        return executionOutboundRankService.queryMaterialRankTotal(executionOutboundRankDO);
+    }
+
+    /**
+     * 线路出库排名列表（线路×货品聚合）
+     */
+    public List<ExecutionOutboundLineRankPO> queryLineRankList(ExecutionOutboundRankDO executionOutboundRankDO) {
+        return executionOutboundRankService.queryLineRankList(executionOutboundRankDO);
+    }
+
+    /**
+     * 线路出库排名合计（不分页）
+     */
+    public ExecutionOutboundDetailRankTotalPO queryLineRankTotal(ExecutionOutboundRankDO executionOutboundRankDO) {
+        return executionOutboundRankService.queryLineRankTotal(executionOutboundRankDO);
    }
 }