feat(wms,oms)：入库排名统计改为按物料编码合并(一行=一个物料在区间内全部已入库仓单的合计)：返回列裁剪为物料编码/货名/规格型号/单位/件数(实际上架量)/毛重(吨)/投保总额(货品档案保额取MAX不跨仓单累加)/体积；仓单编号/客户编号/存货人/入仓日期为单据级字段单值失真，移出返回列仅保留为查询条件；HAVING过滤0件行；合计行投保总额=各物料保额之和(每物料计一次)，totalOrderCount=涉及仓单数；OMS/WMS两端口径数字一致；查询参数与返回结构外层不变

mhd_oms/src/main/resources/mapper/inboundRank/ExecutionInboundRankMapper.xml

@@ -15,8 +15,8 @@
             口径与 WMS 端 /inboundRankApi 完全一致，两边数字一致；
       条件：b.status = 5已入库（排除已取消(6)/已关闭(7)及未完成单据）；
             日期筛选按入仓单入仓日期 b.warehouse_date（与列表"入仓日期"列同源，为空的历史单按建档时间兜底）；
-            一行 = 某仓单(b.in_order_number)内某货品(a.material_code)的合计，
-            按件数(实际上架量 SUM(a.SHELVES_QUANTITY))降序排名
+            一行 = 一个物料的合计（按物料编码合并，区间内全部已入库仓单），按件数(实际上架量 SUM(a.SHELVES_QUANTITY))降序排名，
+            件数为0的物料不返回(HAVING过滤)；仓单编号/客户编号/存货人/入仓日期为单据级字段仅作查询条件不返回
     -->
     <sql id="inboundRankConditions">
         a.del_flag = 1
@@ -57,14 +57,10 @@
         left join NGWL_TEST_WMS.material_base_info c on a.material_base_info_id = c.material_base_info_id
     </sql>
 
-    <!-- 商品入库排名列表（仓单+货品汇总，按件数=实际上架量降序） -->
+    <!-- 商品入库排名列表（按物料编码合并，按件数=实际上架量降序，过滤0件行） -->
     <select id="queryMaterialRankList" parameterType="com.mhd.oms.domain.inboundRank.repository.todo.ExecutionInboundRankDO"
             resultType="com.mhd.oms.domain.inboundRank.repository.po.ExecutionInboundMaterialRankPO">
         select
-            IFNULL(MAX(b.warehouse_date), MAX(b.create_time))              AS warehouseDate,
-            b.in_order_number                                            AS inOrderNumber,
-            MAX(b.shipper_code)                                          AS shipperCode,
-            MAX(b.shipper_name)                                          AS shipperName,
             a.material_code                                              AS materialCode,
             MAX(a.material_name)                                         AS materialName,
             MAX(a.SPECIFICATION_MODEL)                                   AS specificationModel,
@@ -77,11 +73,13 @@
         <where>
             <include refid="inboundRankConditions"/>
         </where>
-        GROUP BY b.in_order_number, a.material_code
-        order by pieceCount desc, warehouseDate desc, inOrderNumber desc
+        GROUP BY a.material_code
+        HAVING pieceCount > 0
+        order by pieceCount desc, materialCode
     </select>
 
-    <!-- 商品入库排名合计（当前筛选条件全量；外层对分组结果再汇总，保证投保总额合计=各行列值之和） -->
+    <!-- 商品入库排名合计（当前筛选条件全量；外层对物料分组结果再汇总，投保总额合计=各物料保额之和(每物料计一次)；
+         涉及仓单数按明细行去重统计仓单） -->
     <select id="queryMaterialRankTotal" parameterType="com.mhd.oms.domain.inboundRank.repository.todo.ExecutionInboundRankDO"
             resultType="com.mhd.oms.domain.inboundRank.repository.po.ExecutionInboundRankTotalPO">
         select
@@ -89,10 +87,14 @@
             ROUND(IFNULL(SUM(t.grossWeightKG), 0) / 1000, 3)             AS totalGrossWeightTon,
             IFNULL(SUM(t.insureAmount), 0)                               AS totalInsureAmount,
             IFNULL(SUM(t.totalVolume), 0)                                AS totalVolume,
-            COUNT(DISTINCT t.inOrderNumber)                              AS totalOrderCount
+            (select COUNT(DISTINCT b.in_order_number)
+             <include refid="inboundRankFrom"/>
+             <where>
+                 <include refid="inboundRankConditions"/>
+             </where>)                                                   AS totalOrderCount
         from (
             select
-                b.in_order_number                                        AS inOrderNumber,
+                a.material_code                                          AS materialCode,
                 IFNULL(SUM(a.SHELVES_QUANTITY), 0)                       AS pieceCount,
                 IFNULL(SUM(a.TOTAL_GROSS_WEIGHT), 0)                     AS grossWeightKG,
                 MAX(IFNULL(c.insure_amount, 0))                          AS insureAmount,
@@ -101,7 +103,7 @@
             <where>
                 <include refid="inboundRankConditions"/>
             </where>
-            GROUP BY b.in_order_number, a.material_code
+            GROUP BY a.material_code
         ) t
     </select>
 </mapper>