feat(wms,oms)：出库排名统计改造为仓单×货品明细列表，按出库数量降序排名

- 字段：种类/仓单编号/入库单号/客户编号/收货人/货名/线路/件数/毛重(吨)/体积(CBM)/退保总额(占位null,数据来源待确认)/出仓日期 - 商品/线路各一套接口，路径名不变；商品接口忽略线路筛选参数，线路接口忽略商品筛选参数；含合计行(件数/毛重吨/体积/仓单数)与Excel导出 - 统计口径不变：出库单创建时间区间+已出库状态(9,12,13)+明细level=1主行；排序按出库数量(销售量)降序，件数/出仓日期/单号次之 - 数据源：WMS查本库出库表；OMS跨库查NGWL_TEST_WMS同名表(OMS库出库单状态不流转，跨库与WMS端数字一致) - 删除原按商品/线路聚合的排名接口(销售量/交易数/金额字段)
2026-09-02 15:25:51 +08:00
parent e821619a96
commit 3af78d5d7b
28 changed files with 554 additions and 684 deletions
@@ -6,9 +6,8 @@ import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.system.api.domain.cache.AssociationWarehouseCacheDO;
 import com.mhd.system.api.domain.cache.SystemServiceCacheUtil;
 import com.mhd.system.api.model.LoginUser;
-import com.mhd.wms.domain.outboundRank.repository.po.OutboundLineRankPO;
-import com.mhd.wms.domain.outboundRank.repository.po.OutboundMaterialRankPO;
-import com.mhd.wms.domain.outboundRank.repository.po.OutboundRankTotalPO;
+import com.mhd.wms.domain.outboundRank.repository.po.OutboundDetailRankPO;
+import com.mhd.wms.domain.outboundRank.repository.po.OutboundDetailRankTotalPO;
 import com.mhd.wms.domain.outboundRank.repository.todo.OutboundRankDO;
 import com.mhd.wms.domain.outboundRank.service.OutboundRankDomainService;
 import lombok.extern.slf4j.Slf4j;
@@ -18,9 +17,9 @@ import org.springframework.stereotype.Service;
 import java.util.List;

 /**
- * 出库排名统计应用服务
+ * 出库排名统计（明细）应用服务
 *
- * <p>负责登录用户组织隔离注入、日期区间校验，统计逻辑在 OutboundRankDomainService → OutboundRankMapper.xml</p>
+ * <p>负责登录用户组织隔离注入、日期区间校验，查询逻辑在 OutboundRankDomainService → OutboundRankMapper.xml</p>
 *
 * @author rcx
 * @date 2026-08-31
@@ -33,49 +32,26 @@ public class OutboundRankApplicationService {
    private OutboundRankDomainService outboundRankDomainService;

    /**
-     * 分页查询商品出库排名列表
+     * 分页查询出库明细列表
     */
-    public List<OutboundMaterialRankPO> queryMaterialRankList(OutboundRankDO outboundRankDO) {
+    public List<OutboundDetailRankPO> queryDetailList(OutboundRankDO outboundRankDO) {
        fillLoginContext(outboundRankDO);
-        return outboundRankDomainService.queryMaterialRankList(outboundRankDO);
+        return outboundRankDomainService.queryDetailList(outboundRankDO);
    }

    /**
-     * 分页查询线路出库排名列表
+     * 出库明细合计（当前筛选条件全量，不分页）
     */
-    public List<OutboundLineRankPO> queryLineRankList(OutboundRankDO outboundRankDO) {
+    public OutboundDetailRankTotalPO queryDetailTotal(OutboundRankDO outboundRankDO) {
+        return outboundRankDomainService.queryDetailTotal(outboundRankDO);
+    }
+
+    /**
+     * 导出出库明细（不分页全量）
+     */
+    public List<OutboundDetailRankPO> exportDetailList(OutboundRankDO outboundRankDO) {
        fillLoginContext(outboundRankDO);
-        return outboundRankDomainService.queryLineRankList(outboundRankDO);
-    }
-
-    /**
-     * 商品出库排名合计（当前筛选条件全量，不分页）
-     */
-    public OutboundRankTotalPO queryMaterialRankTotal(OutboundRankDO outboundRankDO) {
-        return outboundRankDomainService.queryMaterialRankTotal(outboundRankDO);
-    }
-
-    /**
-     * 线路出库排名合计（当前筛选条件全量，不分页）
-     */
-    public OutboundRankTotalPO queryLineRankTotal(OutboundRankDO outboundRankDO) {
-        return outboundRankDomainService.queryLineRankTotal(outboundRankDO);
-    }
-
-    /**
-     * 导出商品出库排名（不分页全量）
-     */
-    public List<OutboundMaterialRankPO> exportMaterialRankList(OutboundRankDO outboundRankDO) {
-        fillLoginContext(outboundRankDO);
-        return outboundRankDomainService.queryMaterialRankList(outboundRankDO);
-    }
-
-    /**
-     * 导出线路出库排名（不分页全量）
-     */
-    public List<OutboundLineRankPO> exportLineRankList(OutboundRankDO outboundRankDO) {
-        fillLoginContext(outboundRankDO);
-        return outboundRankDomainService.queryLineRankList(outboundRankDO);
+        return outboundRankDomainService.queryDetailList(outboundRankDO);
    }

    /**
@@ -1,14 +1,13 @@
 package com.mhd.wms.domain.outboundRank.repository.facade;

-import com.mhd.wms.domain.outboundRank.repository.po.OutboundLineRankPO;
-import com.mhd.wms.domain.outboundRank.repository.po.OutboundMaterialRankPO;
-import com.mhd.wms.domain.outboundRank.repository.po.OutboundRankTotalPO;
+import com.mhd.wms.domain.outboundRank.repository.po.OutboundDetailRankPO;
+import com.mhd.wms.domain.outboundRank.repository.po.OutboundDetailRankTotalPO;
 import com.mhd.wms.domain.outboundRank.repository.todo.OutboundRankDO;

 import java.util.List;

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

    /**
-     * 商品出库排名列表
+     * 出库明细列表
     */
-    List<OutboundMaterialRankPO> queryMaterialRankList(OutboundRankDO outboundRankDO);
+    List<OutboundDetailRankPO> queryDetailList(OutboundRankDO outboundRankDO);

    /**
-     * 线路出库排名列表
+     * 出库明细合计（不分页）
     */
-    List<OutboundLineRankPO> queryLineRankList(OutboundRankDO outboundRankDO);
-
-    /**
-     * 商品出库排名合计（不分页）
-     */
-    OutboundRankTotalPO queryMaterialRankTotal(OutboundRankDO outboundRankDO);
-
-    /**
-     * 线路出库排名合计（不分页）
-     */
-    OutboundRankTotalPO queryLineRankTotal(OutboundRankDO outboundRankDO);
+    OutboundDetailRankTotalPO queryDetailTotal(OutboundRankDO outboundRankDO);
 }
@@ -1,14 +1,13 @@
 package com.mhd.wms.domain.outboundRank.repository.mapper;

-import com.mhd.wms.domain.outboundRank.repository.po.OutboundLineRankPO;
-import com.mhd.wms.domain.outboundRank.repository.po.OutboundMaterialRankPO;
-import com.mhd.wms.domain.outboundRank.repository.po.OutboundRankTotalPO;
+import com.mhd.wms.domain.outboundRank.repository.po.OutboundDetailRankPO;
+import com.mhd.wms.domain.outboundRank.repository.po.OutboundDetailRankTotalPO;
 import com.mhd.wms.domain.outboundRank.repository.todo.OutboundRankDO;

 import java.util.List;

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

    /**
-     * 商品出库排名列表（按销售量倒序）
+     * 出库明细列表（一行=仓单×货品，按件数倒序）
     */
-    List<OutboundMaterialRankPO> queryMaterialRankList(OutboundRankDO outboundRankDO);
+    List<OutboundDetailRankPO> queryDetailList(OutboundRankDO outboundRankDO);

    /**
-     * 线路出库排名列表（按销售量倒序）
+     * 出库明细合计（不分页，当前筛选条件全量合计）
     */
-    List<OutboundLineRankPO> queryLineRankList(OutboundRankDO outboundRankDO);
-
-    /**
-     * 商品出库排名合计（不分页，当前筛选条件全量合计）
-     */
-    OutboundRankTotalPO queryMaterialRankTotal(OutboundRankDO outboundRankDO);
-
-    /**
-     * 线路出库排名合计（不分页，当前筛选条件全量合计）
-     */
-    OutboundRankTotalPO queryLineRankTotal(OutboundRankDO outboundRankDO);
+    OutboundDetailRankTotalPO queryDetailTotal(OutboundRankDO outboundRankDO);
 }
@@ -2,9 +2,8 @@ package com.mhd.wms.domain.outboundRank.repository.persistence;

 import com.mhd.wms.domain.outboundRank.repository.facade.IOutboundRankService;
 import com.mhd.wms.domain.outboundRank.repository.mapper.OutboundRankMapper;
-import com.mhd.wms.domain.outboundRank.repository.po.OutboundLineRankPO;
-import com.mhd.wms.domain.outboundRank.repository.po.OutboundMaterialRankPO;
-import com.mhd.wms.domain.outboundRank.repository.po.OutboundRankTotalPO;
+import com.mhd.wms.domain.outboundRank.repository.po.OutboundDetailRankPO;
+import com.mhd.wms.domain.outboundRank.repository.po.OutboundDetailRankTotalPO;
 import com.mhd.wms.domain.outboundRank.repository.todo.OutboundRankDO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -12,7 +11,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;

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

    @Override
-    public List<OutboundMaterialRankPO> queryMaterialRankList(OutboundRankDO outboundRankDO) {
-        return outboundRankMapper.queryMaterialRankList(outboundRankDO);
+    public List<OutboundDetailRankPO> queryDetailList(OutboundRankDO outboundRankDO) {
+        return outboundRankMapper.queryDetailList(outboundRankDO);
    }

    @Override
-    public List<OutboundLineRankPO> queryLineRankList(OutboundRankDO outboundRankDO) {
-        return outboundRankMapper.queryLineRankList(outboundRankDO);
-    }
-
-    @Override
-    public OutboundRankTotalPO queryMaterialRankTotal(OutboundRankDO outboundRankDO) {
-        return outboundRankMapper.queryMaterialRankTotal(outboundRankDO);
-    }
-
-    @Override
-    public OutboundRankTotalPO queryLineRankTotal(OutboundRankDO outboundRankDO) {
-        return outboundRankMapper.queryLineRankTotal(outboundRankDO);
+    public OutboundDetailRankTotalPO queryDetailTotal(OutboundRankDO outboundRankDO) {
+        return outboundRankMapper.queryDetailTotal(outboundRankDO);
    }
 }
@@ -0,0 +1,85 @@
+package com.mhd.wms.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 OutboundDetailRankPO 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;
+}
@@ -0,0 +1,36 @@
+package com.mhd.wms.domain.outboundRank.repository.po;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 出库排名统计（明细）合计PO
+ *
+ * <p>当前筛选条件下不分页的全量合计，随分页列表一起返回
+ * （totalPieceCount/totalGrossWeightTon/totalVolume/totalOrderCount）</p>
+ *
+ * @author rcx
+ * @date 2026-08-31
+ */
+@Data
+@ApiModel(value = "出库排名统计明细合计对象", description = "出库排名统计明细合计响应对象")
+public class OutboundDetailRankTotalPO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("件数合计")
+    private BigDecimal totalPieceCount;
+
+    @ApiModelProperty("毛重(吨)合计")
+    private BigDecimal totalGrossWeightTon;
+
+    @ApiModelProperty("体积(CBM)合计")
+    private BigDecimal totalVolume;
+
+    @ApiModelProperty("仓单数合计（去重出库单数）")
+    private Long totalOrderCount;
+}
@@ -1,45 +0,0 @@
-package com.mhd.wms.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(出库数量)，交易数=COUNT(DISTINCT 出库单号)，金额=SUM(明细总价)；
- * 仅统计带线路的出库单（line_code 为 2026-08-20 新增冗余字段，历史单为空）</p>
- *
- * @author rcx
- * @date 2026-08-31
- */
-@Data
-@ApiModel(value = "线路出库排名对象", description = "线路出库排名响应对象")
-public class OutboundLineRankPO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("线路编码")
-    @Excel(name = "线路编码")
-    private String lineCode;
-
-    @ApiModelProperty("线路名称")
-    @Excel(name = "线路名称")
-    private String lineName;
-
-    @ApiModelProperty("销售量（出库数量合计）")
-    @Excel(name = "销售量")
-    private BigDecimal salesQuantity;
-
-    @ApiModelProperty("交易数（出库单据数）")
-    @Excel(name = "交易数")
-    private Long tradeCount;
-
-    @ApiModelProperty("金额")
-    @Excel(name = "金额")
-    private BigDecimal amount;
-}
@@ -1,52 +0,0 @@
-package com.mhd.wms.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(出库数量)，交易数=COUNT(DISTINCT 出库单号)，金额=SUM(明细总价)</p>
- *
- * @author rcx
- * @date 2026-08-31
- */
-@Data
-@ApiModel(value = "商品出库排名对象", description = "商品出库排名响应对象")
-public class OutboundMaterialRankPO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("商品货号")
-    @Excel(name = "商品货号")
-    private String materialCode;
-
-    @ApiModelProperty("商品名称")
-    @Excel(name = "商品名称")
-    private String materialName;
-
-    @ApiModelProperty("规格")
-    @Excel(name = "规格")
-    private String specificationModel;
-
-    @ApiModelProperty("单位")
-    @Excel(name = "单位")
-    private String unitName;
-
-    @ApiModelProperty("销售量（出库数量合计）")
-    @Excel(name = "销售量")
-    private BigDecimal salesQuantity;
-
-    @ApiModelProperty("交易数（出库单据数）")
-    @Excel(name = "交易数")
-    private Long tradeCount;
-
-    @ApiModelProperty("金额")
-    @Excel(name = "金额")
-    private BigDecimal amount;
-}
@@ -1,32 +0,0 @@
-package com.mhd.wms.domain.outboundRank.repository.po;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * 出库排名合计PO
- *
- * <p>当前筛选条件下不分页的全量合计，随分页列表一起返回（totalSalesQuantity/totalTradeCount/totalAmount）</p>
- *
- * @author rcx
- * @date 2026-08-31
- */
-@Data
-@ApiModel(value = "出库排名合计对象", description = "出库排名合计响应对象")
-public class OutboundRankTotalPO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("销售量合计")
-    private BigDecimal totalSalesQuantity;
-
-    @ApiModelProperty("交易数合计（去重出库单数）")
-    private Long totalTradeCount;
-
-    @ApiModelProperty("金额合计")
-    private BigDecimal totalAmount;
-}
@@ -6,7 +6,7 @@ import lombok.Data;
 import java.io.Serializable;

 /**
- * 出库排名统计查询DO
+ * 出库排名统计（明细）查询DO
 *
 * <p>topOrganizationId / warehouseId 由服务端按登录用户注入，前端不传</p>
 *
@@ -24,10 +24,16 @@ public class OutboundRankDO implements Serializable {
    @ApiModelProperty("出库日期-结束 yyyy-MM-dd（必填）")
    private String createTimeEnd;

+    @ApiModelProperty("仓单编号/出库单号（模糊）")
+    private String outOrderNumber;
+
+    @ApiModelProperty("入库单号（模糊）")
+    private String inOrderNumber;
+
    @ApiModelProperty("商品货号（模糊）")
    private String materialCode;

-    @ApiModelProperty("商品名称（模糊）")
+    @ApiModelProperty("货名/商品名称（模糊）")
    private String materialName;

    @ApiModelProperty("线路编码（模糊）")
@@ -1,9 +1,8 @@
 package com.mhd.wms.domain.outboundRank.service;

 import com.mhd.wms.domain.outboundRank.repository.facade.IOutboundRankService;
-import com.mhd.wms.domain.outboundRank.repository.po.OutboundLineRankPO;
-import com.mhd.wms.domain.outboundRank.repository.po.OutboundMaterialRankPO;
-import com.mhd.wms.domain.outboundRank.repository.po.OutboundRankTotalPO;
+import com.mhd.wms.domain.outboundRank.repository.po.OutboundDetailRankPO;
+import com.mhd.wms.domain.outboundRank.repository.po.OutboundDetailRankTotalPO;
 import com.mhd.wms.domain.outboundRank.repository.todo.OutboundRankDO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +11,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;

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

    /**
-     * 商品出库排名列表
+     * 出库明细列表
     */
-    public List<OutboundMaterialRankPO> queryMaterialRankList(OutboundRankDO outboundRankDO) {
-        return outboundRankService.queryMaterialRankList(outboundRankDO);
+    public List<OutboundDetailRankPO> queryDetailList(OutboundRankDO outboundRankDO) {
+        return outboundRankService.queryDetailList(outboundRankDO);
    }

    /**
-     * 线路出库排名列表
+     * 出库明细合计（不分页）
     */
-    public List<OutboundLineRankPO> queryLineRankList(OutboundRankDO outboundRankDO) {
-        return outboundRankService.queryLineRankList(outboundRankDO);
-    }
-
-    /**
-     * 商品出库排名合计（不分页）
-     */
-    public OutboundRankTotalPO queryMaterialRankTotal(OutboundRankDO outboundRankDO) {
-        return outboundRankService.queryMaterialRankTotal(outboundRankDO);
-    }
-
-    /**
-     * 线路出库排名合计（不分页）
-     */
-    public OutboundRankTotalPO queryLineRankTotal(OutboundRankDO outboundRankDO) {
-        return outboundRankService.queryLineRankTotal(outboundRankDO);
+    public OutboundDetailRankTotalPO queryDetailTotal(OutboundRankDO outboundRankDO) {
+        return outboundRankService.queryDetailTotal(outboundRankDO);
    }
 }
@@ -3,27 +3,38 @@ package com.mhd.wms.interfaces.dto.outboundRank;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+import java.io.Serializable;
+
 /**
- * 出库排名统计入参DTO
+ * 出库排名统计（明细）入参DTO
 *
- * <p>按日期区间统计商品/线路出库量排名，统计口径：出库单创建时间 + 已出库及之后状态(9,12,13)</p>
+ * <p>按日期区间筛选出库明细列表，一行 = 仓单×货品（件数/毛重/体积按行汇总，件数降序），
+ * 统计口径：出库单创建时间 + 已出库及之后状态(9,12,13) + 明细仅取 level=1 主行</p>
 *
 * @author rcx
 * @date 2026-08-31
 */
@Data
-public class OutboundRankDTO {
+public class OutboundRankDTO implements Serializable {

-    @ApiModelProperty("出库日期-开始 yyyy-MM-dd（必填，按出库单创建时间统计）")
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("出库日期-开始 yyyy-MM-dd（必填，按出库单创建时间筛选）")
    private String createTimeStart;

-    @ApiModelProperty("出库日期-结束 yyyy-MM-dd（必填，按出库单创建时间统计）")
+    @ApiModelProperty("出库日期-结束 yyyy-MM-dd（必填，按出库单创建时间筛选）")
    private String createTimeEnd;

+    @ApiModelProperty("仓单编号/出库单号（模糊）")
+    private String outOrderNumber;
+
+    @ApiModelProperty("入库单号（模糊）")
+    private String inOrderNumber;
+
    @ApiModelProperty("商品货号（模糊）")
    private String materialCode;

-    @ApiModelProperty("商品名称（模糊）")
+    @ApiModelProperty("货名/商品名称（模糊）")
    private String materialName;

    @ApiModelProperty("线路编码（模糊）")
@@ -5,9 +5,8 @@ import com.mhd.common.core.constant.HttpStatus;
 import com.mhd.common.core.utils.PageUtils;
 import com.mhd.common.core.utils.poi.ExcelUtil;
 import com.mhd.wms.application.service.outboundRank.OutboundRankApplicationService;
-import com.mhd.wms.domain.outboundRank.repository.po.OutboundLineRankPO;
-import com.mhd.wms.domain.outboundRank.repository.po.OutboundMaterialRankPO;
-import com.mhd.wms.domain.outboundRank.repository.po.OutboundRankTotalPO;
+import com.mhd.wms.domain.outboundRank.repository.po.OutboundDetailRankPO;
+import com.mhd.wms.domain.outboundRank.repository.po.OutboundDetailRankTotalPO;
 import com.mhd.wms.domain.outboundRank.repository.todo.OutboundRankDO;
 import com.mhd.wms.interfaces.assember.outboundRank.OutboundRankAssembler;
 import com.mhd.wms.interfaces.dto.outboundRank.OutboundRankDTO;
@@ -26,8 +25,10 @@ import java.util.List;
 /**
 * 出库排名统计Api
 *
- * <p>按日期区间筛选，统计商品/线路出库量排名。统计口径：出库单创建时间 + 已出库及之后状态(9,12,13)，
- * 明细仅取 level=1 主行；销售量=SUM(出库数量)、交易数=COUNT(DISTINCT 出库单号)、金额=SUM(明细总价)</p>
+ * <p>按日期区间筛选出库明细列表（一行 = 仓单×货品，件数/毛重/体积按行汇总，按出库数量(销售量)降序，件数/出仓日期/单号次之）。
+ * 统计口径：出库单创建时间 + 已出库及之后状态(9,12,13)，明细仅取 level=1 主行。
+ * 商品/线路两个 tab 各自独立接口，内部为同一份明细查询：商品接口忽略线路筛选参数，线路接口忽略商品筛选参数。
+ * 字段：种类/仓单编号/入库单号/客户编号/收货人/货名/线路/件数/毛重(吨)/体积(CBM)/退保总额(占位null)/出仓日期</p>
 *
 * @author rcx
 * @date 2026-08-31
@@ -43,84 +44,97 @@ public class OutboundRankApi {
    private OutboundRankApplicationService outboundRankApplicationService;

    /**
-     * 分页查询商品出库排名列表（含合计行）
+     * 分页查询商品出库排名列表（含合计行，商品tab；忽略线路筛选参数）
     */
    @ApiOperation("分页查询商品出库排名列表")
    @GetMapping("/queryMaterialRankList")
    public HashMap<String, Object> queryMaterialRankList(OutboundRankDTO outboundRankDTO) {
        //转换实体
        OutboundRankDO outboundRankDO = outboundRankAssembler.toDO(outboundRankDTO);
+        //商品tab：忽略线路筛选参数
+        outboundRankDO.setLineCode(null);
+        outboundRankDO.setLineName(null);
        startPage();
-        List<OutboundMaterialRankPO> list = outboundRankApplicationService.queryMaterialRankList(outboundRankDO);
-        OutboundRankTotalPO total = outboundRankApplicationService.queryMaterialRankTotal(outboundRankDO);
+        List<OutboundDetailRankPO> list = outboundRankApplicationService.queryDetailList(outboundRankDO);
+        OutboundDetailRankTotalPO total = outboundRankApplicationService.queryDetailTotal(outboundRankDO);
        return getDataTableWithTotal(list, total);
    }

    /**
-     * 分页查询线路出库排名列表（含合计行）
+     * 分页查询线路出库排名列表（含合计行，线路tab；忽略商品筛选参数）
     */
    @ApiOperation("分页查询线路出库排名列表")
    @GetMapping("/queryLineRankList")
    public HashMap<String, Object> queryLineRankList(OutboundRankDTO outboundRankDTO) {
        //转换实体
        OutboundRankDO outboundRankDO = outboundRankAssembler.toDO(outboundRankDTO);
+        //线路tab：忽略商品筛选参数
+        outboundRankDO.setMaterialCode(null);
+        outboundRankDO.setMaterialName(null);
        startPage();
-        List<OutboundLineRankPO> list = outboundRankApplicationService.queryLineRankList(outboundRankDO);
-        OutboundRankTotalPO total = outboundRankApplicationService.queryLineRankTotal(outboundRankDO);
+        List<OutboundDetailRankPO> list = outboundRankApplicationService.queryDetailList(outboundRankDO);
+        OutboundDetailRankTotalPO total = outboundRankApplicationService.queryDetailTotal(outboundRankDO);
        return getDataTableWithTotal(list, total);
    }

    /**
-     * 导出商品出库排名Excel
+     * 导出商品出库排名Excel（商品tab；忽略线路筛选参数）
     */
    @ApiOperation("导出商品出库排名Excel")
    @GetMapping("/exportMaterialRank")
    public void exportMaterialRank(HttpServletResponse response, OutboundRankDTO outboundRankDTO) throws Exception {
        //转换实体（不分页，导出全量）
        OutboundRankDO outboundRankDO = outboundRankAssembler.toDO(outboundRankDTO);
-        List<OutboundMaterialRankPO> list = outboundRankApplicationService.exportMaterialRankList(outboundRankDO);
+        //商品tab：忽略线路筛选参数
+        outboundRankDO.setLineCode(null);
+        outboundRankDO.setLineName(null);
+        List<OutboundDetailRankPO> list = outboundRankApplicationService.exportDetailList(outboundRankDO);

        String fileName = URLEncoder.encode("商品出库排名", "UTF-8").replaceAll("\\+", "%20");
        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
        response.setCharacterEncoding("utf-8");
        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");

-        ExcelUtil<OutboundMaterialRankPO> util = new ExcelUtil<>(OutboundMaterialRankPO.class);
+        ExcelUtil<OutboundDetailRankPO> util = new ExcelUtil<>(OutboundDetailRankPO.class);
        util.exportExcel(response, list, "商品出库排名");
    }

    /**
-     * 导出线路出库排名Excel
+     * 导出线路出库排名Excel（线路tab；忽略商品筛选参数）
     */
    @ApiOperation("导出线路出库排名Excel")
    @GetMapping("/exportLineRank")
    public void exportLineRank(HttpServletResponse response, OutboundRankDTO outboundRankDTO) throws Exception {
        //转换实体（不分页，导出全量）
        OutboundRankDO outboundRankDO = outboundRankAssembler.toDO(outboundRankDTO);
-        List<OutboundLineRankPO> list = outboundRankApplicationService.exportLineRankList(outboundRankDO);
+        //线路tab：忽略商品筛选参数
+        outboundRankDO.setMaterialCode(null);
+        outboundRankDO.setMaterialName(null);
+        List<OutboundDetailRankPO> list = outboundRankApplicationService.exportDetailList(outboundRankDO);

        String fileName = URLEncoder.encode("线路出库排名", "UTF-8").replaceAll("\\+", "%20");
        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
        response.setCharacterEncoding("utf-8");
        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");

-        ExcelUtil<OutboundLineRankPO> util = new ExcelUtil<>(OutboundLineRankPO.class);
+        ExcelUtil<OutboundDetailRankPO> util = new ExcelUtil<>(OutboundDetailRankPO.class);
        util.exportExcel(response, list, "线路出库排名");
    }

    /**
-     * 分页结果 + 合计行：data/total/code/msg 之外追加 totalSalesQuantity/totalTradeCount/totalAmount
+     * 分页结果 + 合计行：data/total/code/msg 之外追加 totalPieceCount/totalGrossWeightTon/totalVolume/totalOrderCount
     */
-    private HashMap<String, Object> getDataTableWithTotal(List<?> list, OutboundRankTotalPO total) {
+    private HashMap<String, Object> getDataTableWithTotal(List<?> list, OutboundDetailRankTotalPO total) {
        HashMap<String, Object> result = new HashMap<>();
        result.put("data", list);
        result.put("total", new PageInfo<>(list).getTotal());
        result.put("code", HttpStatus.SUCCESS);
        result.put("msg", "查询成功");
        if (total != null) {
-            result.put("totalSalesQuantity", total.getTotalSalesQuantity());
-            result.put("totalTradeCount", total.getTotalTradeCount());
-            result.put("totalAmount", total.getTotalAmount());
+            result.put("totalPieceCount", total.getTotalPieceCount());
+            result.put("totalGrossWeightTon", total.getTotalGrossWeightTon());
+            result.put("totalVolume", total.getTotalVolume());
+            result.put("totalOrderCount", total.getTotalOrderCount());
        }
        return result;
    }