From 028af3dd2fb18bfa4306ee01f412ab938ba0a45b Mon Sep 17 00:00:00 2001
From: rcx <3084692334@qq.com>
Date: Wed, 2 Sep 2026 15:41:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms,oms)=EF=BC=9A=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E6=8E=92=E5=90=8D=E4=BB=B6=E6=95=B0=E6=94=B9=E4=B8=BA=E5=A4=8D?=
 =?UTF-8?q?=E6=A0=B8=E7=A1=AE=E8=AE=A4=E7=9A=84=E5=AE=9E=E9=99=85=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E9=87=8F(CHECK=5FQUANTITY)=EF=BC=8C=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 件数取数由明细 PIECE_COUNT(计划/申报件数)改为 SUM(CHECK_QUANTITY) 复核确认的实际出库量，与入库排名的实际上架量 SHELVES_QUANTITY 取数逻辑对称（已验证现有已出库数据 222/222 全覆盖）

- 排序第一键由出库数量(outbound_quantity，下发时的计划复制值)改为件数(实际出库量)降序，出仓日期/单号次之

- 接口路径/传参/返回字段结构均不变，前端无感；其余为注释同步
---
 .../repository/po/ExecutionOutboundDetailRankPO.java  |  2 +-
 .../facade/outboundRank/ExecutionOutboundRankApi.java |  2 +-
 .../outboundRank/ExecutionOutboundRankMapper.xml      | 11 ++++++-----
 .../repository/po/OutboundDetailRankPO.java           |  2 +-
 .../facadeApi/outboundRank/OutboundRankApi.java       |  2 +-
 .../mapper/outboundRank/OutboundRankMapper.xml        | 11 ++++++-----
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/repository/po/ExecutionOutboundDetailRankPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/repository/po/ExecutionOutboundDetailRankPO.java
index f894c05d8..2c37d7725 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/repository/po/ExecutionOutboundDetailRankPO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/repository/po/ExecutionOutboundDetailRankPO.java
@@ -61,7 +61,7 @@ public class ExecutionOutboundDetailRankPO implements Serializable {
     @Excel(name = "线路")
     private String lineName;
 
-    @ApiModelProperty("件数")
+    @ApiModelProperty("件数（复核确认的实际出库量合计，与入库排名的实际上架量对称）")
     @Excel(name = "件数")
     private BigDecimal pieceCount;
 
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/outboundRank/ExecutionOutboundRankApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/outboundRank/ExecutionOutboundRankApi.java
index 87e70bbf7..81ae1b67a 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/outboundRank/ExecutionOutboundRankApi.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/outboundRank/ExecutionOutboundRankApi.java
@@ -26,7 +26,7 @@ import java.util.List;
 /**
  * 出库排名统计Api
  *
- * <p>按日期区间筛选出库明细列表（一行 = 仓单×货品，件数/毛重/体积按行汇总，按出库数量(销售量)降序，件数/出仓日期/单号次之）。
+ * <p>按日期区间筛选出库明细列表（一行 = 仓单×货品，件数/毛重/体积按行汇总，按件数(实际复核出库量)降序，出仓日期/单号次之）。
  * OMS 库出库单状态不流转（无"已出库"数据），数据源跨库取 WMS 库出库表（NGWL_TEST_WMS.stock_out_order / out_material_detail），
  * 口径与 WMS 端 /outboundRankApi 完全一致，两边数字一致；统计条件：出库单创建时间 + 已出库及之后状态(9,12,13)，明细仅取 level=1 主行。
  * 商品/线路两个 tab 各自独立接口，内部为同一份明细查询：商品接口忽略线路筛选参数，线路接口忽略商品筛选参数。
diff --git a/mhd_oms/src/main/resources/mapper/outboundRank/ExecutionOutboundRankMapper.xml b/mhd_oms/src/main/resources/mapper/outboundRank/ExecutionOutboundRankMapper.xml
index 9dae37f3f..62df4931f 100644
--- a/mhd_oms/src/main/resources/mapper/outboundRank/ExecutionOutboundRankMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/outboundRank/ExecutionOutboundRankMapper.xml
@@ -12,7 +12,8 @@
             故跨库取数（与 OMS 库存查询跨库 join NGWL_TEST_WMS.material_base_info 同一模式），
             口径与 WMS 端 /outboundRankApi 完全一致，两边数字一致；
       条件：b.status in (9已出库,12已复核,13已交接)，排除已取消(10)/已关闭(11)；
-            日期按出库单创建时间 b.create_time；一行 = 某仓单内某货品的合计，按出库数量(销售量)降序，件数/出仓日期/单号次之
+            日期按出库单创建时间 b.create_time；一行 = 某仓单内某货品的合计；
+            件数 = SUM(a.CHECK_QUANTITY) 复核确认的实际出库量（与入库排名的实际上架量 SHELVES_QUANTITY 对称），按件数降序排名
     -->
     <sql id="outboundRankConditions">
         a.del_flag = 1
@@ -61,7 +62,7 @@
         join NGWL_TEST_WMS.stock_out_order b on a.out_order_number = b.out_order_number and b.del_flag = 1
     </sql>
 
-    <!-- 出库明细列表（仓单+货品汇总，按出库数量(销售量)降序；退保总额暂无后端字段不提供） -->
+    <!-- 出库明细列表（仓单+货品汇总，按件数(实际复核出库量)降序；退保总额暂无后端字段不提供） -->
     <select id="queryDetailList" parameterType="com.mhd.oms.domain.outboundRank.repository.todo.ExecutionOutboundRankDO"
             resultType="com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundDetailRankPO">
         select
@@ -74,7 +75,7 @@
             MAX(a.material_name)                                                  AS materialName,
             MAX(b.line_code)                                                      AS lineCode,
             MAX(b.line_name)                                                      AS lineName,
-            IFNULL(SUM(a.PIECE_COUNT), 0)                                         AS pieceCount,
+            IFNULL(SUM(a.CHECK_QUANTITY), 0)                                      AS pieceCount,
             ROUND(IFNULL(SUM(a.TOTAL_GROSS_WEIGHT), 0) / 1000, 3)                 AS grossWeightTon,
             IFNULL(SUM(a.TOTAL_VOLUME), 0)                                        AS totalVolume,
             MAX(IFNULL(b.OUTBOUND_DATE, IFNULL(b.COMPLETE_TIME, b.create_time)))  AS outboundDate
@@ -83,7 +84,7 @@
             <include refid="outboundRankConditions"/>
         </where>
         GROUP BY b.out_order_number, a.material_code
-        order by IFNULL(SUM(a.outbound_quantity), 0) desc, pieceCount desc, outboundDate desc, outOrderNumber desc
+        order by pieceCount desc, outboundDate desc, outOrderNumber desc
     </select>
 
     <!-- 出库明细合计（当前筛选条件全量；外层对分组结果再汇总，与入库排名同模板） -->
@@ -97,7 +98,7 @@
         from (
             select
                 b.out_order_number                                                AS outOrderNumber,
-                IFNULL(SUM(a.PIECE_COUNT), 0)                                     AS pieceCount,
+                IFNULL(SUM(a.CHECK_QUANTITY), 0)                                  AS pieceCount,
                 IFNULL(SUM(a.TOTAL_GROSS_WEIGHT), 0)                              AS grossWeightKG,
                 IFNULL(SUM(a.TOTAL_VOLUME), 0)                                    AS totalVolume
             <include refid="outboundRankFrom"/>
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outboundRank/repository/po/OutboundDetailRankPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outboundRank/repository/po/OutboundDetailRankPO.java
index 107dc9b0e..4be88b6a7 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/outboundRank/repository/po/OutboundDetailRankPO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outboundRank/repository/po/OutboundDetailRankPO.java
@@ -61,7 +61,7 @@ public class OutboundDetailRankPO implements Serializable {
     @Excel(name = "线路")
     private String lineName;
 
-    @ApiModelProperty("件数")
+    @ApiModelProperty("件数（复核确认的实际出库量合计，与入库排名的实际上架量对称）")
     @Excel(name = "件数")
     private BigDecimal pieceCount;
 
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/outboundRank/OutboundRankApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/outboundRank/OutboundRankApi.java
index 8856a01a5..a7cccda65 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/outboundRank/OutboundRankApi.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/outboundRank/OutboundRankApi.java
@@ -25,7 +25,7 @@ import java.util.List;
 /**
  * 出库排名统计Api
  *
- * <p>按日期区间筛选出库明细列表（一行 = 仓单×货品，件数/毛重/体积按行汇总，按出库数量(销售量)降序，件数/出仓日期/单号次之）。
+ * <p>按日期区间筛选出库明细列表（一行 = 仓单×货品，件数/毛重/体积按行汇总，按件数(实际复核出库量)降序，出仓日期/单号次之）。
  * 统计口径：出库单创建时间 + 已出库及之后状态(9,12,13)，明细仅取 level=1 主行。
  * 商品/线路两个 tab 各自独立接口，内部为同一份明细查询：商品接口忽略线路筛选参数，线路接口忽略商品筛选参数。
  * 字段：种类/仓单编号/入库单号/客户编号/收货人/货名/线路/件数/毛重(吨)/体积(CBM)/退保总额(占位null)/出仓日期</p>
diff --git a/mhd_wms/src/main/resources/mapper/outboundRank/OutboundRankMapper.xml b/mhd_wms/src/main/resources/mapper/outboundRank/OutboundRankMapper.xml
index af1abf512..095d5eba0 100644
--- a/mhd_wms/src/main/resources/mapper/outboundRank/OutboundRankMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/outboundRank/OutboundRankMapper.xml
@@ -9,7 +9,8 @@
       数据源：出库明细 out_material_detail(a，仅 level=1 主行防重复) join 出库单 stock_out_order(b)
       口径：b.status in (9已出库,12已复核,13已交接)，排除已取消(10)/已关闭(11)；
             日期按出库单创建时间 b.create_time（与出库单列表日期筛选一致）；
-            一行 = 某仓单(b.out_order_number)内某货品(a.material_code)的合计，按出库数量(销售量)降序，件数/出仓日期/单号次之
+            一行 = 某仓单(b.out_order_number)内某货品(a.material_code)的合计；
+            件数 = SUM(a.CHECK_QUANTITY) 复核确认的实际出库量（与入库排名的实际上架量 SHELVES_QUANTITY 对称），按件数降序排名
     -->
     <sql id="outboundRankConditions">
         a.del_flag = 1
@@ -61,7 +62,7 @@
         join stock_out_order b on a.out_order_number = b.out_order_number and b.del_flag = 1
     </sql>
 
-    <!-- 出库明细列表（仓单+货品汇总，按出库数量(销售量)降序；退保总额暂无后端字段不提供） -->
+    <!-- 出库明细列表（仓单+货品汇总，按件数(实际复核出库量)降序；退保总额暂无后端字段不提供） -->
     <select id="queryDetailList" parameterType="com.mhd.wms.domain.outboundRank.repository.todo.OutboundRankDO"
             resultType="com.mhd.wms.domain.outboundRank.repository.po.OutboundDetailRankPO">
         select
@@ -74,7 +75,7 @@
             MAX(a.material_name)                                                  AS materialName,
             MAX(b.line_code)                                                      AS lineCode,
             MAX(b.line_name)                                                      AS lineName,
-            IFNULL(SUM(a.PIECE_COUNT), 0)                                         AS pieceCount,
+            IFNULL(SUM(a.CHECK_QUANTITY), 0)                                      AS pieceCount,
             ROUND(IFNULL(SUM(a.TOTAL_GROSS_WEIGHT), 0) / 1000, 3)                 AS grossWeightTon,
             IFNULL(SUM(a.TOTAL_VOLUME), 0)                                        AS totalVolume,
             MAX(IFNULL(b.OUTBOUND_DATE, IFNULL(b.COMPLETE_TIME, b.create_time)))  AS outboundDate
@@ -83,7 +84,7 @@
             <include refid="outboundRankConditions"/>
         </where>
         GROUP BY b.out_order_number, a.material_code
-        order by IFNULL(SUM(a.outbound_quantity), 0) desc, pieceCount desc, outboundDate desc, outOrderNumber desc
+        order by pieceCount desc, outboundDate desc, outOrderNumber desc
     </select>
 
     <!-- 出库明细合计（当前筛选条件全量；外层对分组结果再汇总，与入库排名同模板） -->
@@ -97,7 +98,7 @@
         from (
             select
                 b.out_order_number                                                AS outOrderNumber,
-                IFNULL(SUM(a.PIECE_COUNT), 0)                                     AS pieceCount,
+                IFNULL(SUM(a.CHECK_QUANTITY), 0)                                  AS pieceCount,
                 IFNULL(SUM(a.TOTAL_GROSS_WEIGHT), 0)                              AS grossWeightKG,
                 IFNULL(SUM(a.TOTAL_VOLUME), 0)                                    AS totalVolume
             <include refid="outboundRankFrom"/>