diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/inboundRank/ExecutionInboundRankApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/inboundRank/ExecutionInboundRankApi.java
index 9ff29be10..b7cfd6391 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/inboundRank/ExecutionInboundRankApi.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/inboundRank/ExecutionInboundRankApi.java
@@ -26,8 +26,9 @@ import java.util.List;
 /**
  * 入库排名统计Api
  *
- * <p>按入仓日期区间筛选商品入库量统计排名。统计口径：入仓日期 + 仅已入库状态(5)，
- * 明细仅取 level=1 主行；一行 = 某仓单内某货品的合计，按件数降序排名。
+ * <p>按入仓日期区间筛选商品入库量统计排名。统计口径：入仓日期(为空的历史单按建档时间兜底)；
+ * OMS 执行入库单状态不回传(长期停留已创建)，不按"已入库"过滤，仅排除已取消(6)/已关闭(7)，
+ * 与入库明细查询页面口径一致；明细仅取 level=1 主行；一行 = 某仓单内某货品的合计，按件数降序排名。
  * 字段：入仓日期/仓单编号/客户编号/存货人/货名/件数/毛重(吨)/投保总额/体积(CBM)。
  * 与出库排名(/executionOutboundRankApi)配对，前端用 tab 页区分</p>
  *
diff --git a/mhd_oms/src/main/resources/mapper/inboundRank/ExecutionInboundRankMapper.xml b/mhd_oms/src/main/resources/mapper/inboundRank/ExecutionInboundRankMapper.xml
index 46c335671..0401cc603 100644
--- a/mhd_oms/src/main/resources/mapper/inboundRank/ExecutionInboundRankMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/inboundRank/ExecutionInboundRankMapper.xml
@@ -8,15 +8,16 @@
       入库排名统计公共查询条件（OMS 执行入库链路）
       数据源：执行入库明细 execution_in_material_detail(a，仅 level=1 主行防重复) join 执行入仓单 execution_stock_in_order(b)
              left join NGWL_TEST_WMS.material_base_info(c，跨库取货品档案保额作投保总额)
-      口径：b.status = 5已入库（OMS 入库状态枚举 1~7，排除已取消(6)/已关闭(7)及未完成单据）；
-            日期筛选按执行入仓单入仓日期 b.warehouse_date（与列表"入仓日期"列同源）；
+      口径：b.status not in (6已取消,7已关闭)（OMS 执行入库单状态不回传，实际数据长期停留 status=1已创建，
+            无法按"已入库5"过滤，与入库明细查询页面口径一致不按状态筛选，仅排除已取消/已关闭）；
+            日期筛选按执行入仓单入仓日期 b.warehouse_date（与列表"入仓日期"列同源，为空的历史单按建档时间兜底）；
             一行 = 某仓单(b.in_order_number)内某货品(a.material_code)的合计，按件数降序排名
     -->
     <sql id="inboundRankConditions">
         a.del_flag = 1
         and a.level = 1
         and b.del_flag = 1
-        and b.status = 5
+        and b.status not in (6, 7)
         <if test="topOrganizationId != null">
             and b.top_organization_id = #{topOrganizationId}
         </if>
@@ -39,10 +40,10 @@
             and a.material_name like concat('%', #{materialName}, '%')
         </if>
         <if test="warehouseDateStart != null and warehouseDateStart != ''">
-            and date_format(b.warehouse_date,'%Y-%m-%d') &gt;= #{warehouseDateStart}
+            and date_format(IFNULL(b.warehouse_date, b.create_time),'%Y-%m-%d') &gt;= #{warehouseDateStart}
         </if>
         <if test="warehouseDateEnd != null and warehouseDateEnd != ''">
-            and date_format(b.warehouse_date,'%Y-%m-%d') &lt;= #{warehouseDateEnd}
+            and date_format(IFNULL(b.warehouse_date, b.create_time),'%Y-%m-%d') &lt;= #{warehouseDateEnd}
         </if>
     </sql>
 
@@ -56,7 +57,7 @@
     <select id="queryMaterialRankList" parameterType="com.mhd.oms.domain.inboundRank.repository.todo.ExecutionInboundRankDO"
             resultType="com.mhd.oms.domain.inboundRank.repository.po.ExecutionInboundMaterialRankPO">
         select
-            MAX(b.warehouse_date)                                        AS warehouseDate,
+            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,
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/inboundRank/InboundRankApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/inboundRank/InboundRankApi.java
index b979e988b..15b0843ce 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/inboundRank/InboundRankApi.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/inboundRank/InboundRankApi.java
@@ -25,7 +25,7 @@ import java.util.List;
 /**
  * 入库排名统计Api
  *
- * <p>按入仓日期区间筛选商品入库量统计排名。统计口径：入仓日期 + 仅已入库状态(5)，
+ * <p>按入仓日期区间筛选商品入库量统计排名。统计口径：入仓日期(为空的历史单按建档时间兜底) + 仅已入库状态(5)，
  * 明细仅取 level=1 主行；一行 = 某仓单内某货品的合计，按件数降序排名。
  * 字段：入仓日期/仓单编号/客户编号/存货人/货名/件数/毛重(吨)/投保总额/体积(CBM)。
  * 与出库排名(/outboundRankApi)配对，前端用 tab 页区分</p>
diff --git a/mhd_wms/src/main/resources/mapper/inboundRank/InboundRankMapper.xml b/mhd_wms/src/main/resources/mapper/inboundRank/InboundRankMapper.xml
index fc1e6f238..45f454d58 100644
--- a/mhd_wms/src/main/resources/mapper/inboundRank/InboundRankMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/inboundRank/InboundRankMapper.xml
@@ -9,7 +9,7 @@
       数据源：入库明细 in_material_detail(a，仅 level=1 主行防重复) join 入仓单 stock_in_order(b)
              left join 货品档案 material_base_info(c，取保额作投保总额)
       口径：b.status = 5已入库（排除已取消(6)/已关闭(7)及未完成单据）；
-            日期筛选按入仓单入仓日期 b.warehouse_date（与列表"入仓日期"列同源）；
+            日期筛选按入仓单入仓日期 b.warehouse_date（与列表"入仓日期"列同源，为空的历史单按建档时间兜底）；
             一行 = 某仓单(b.in_order_number)内某货品(a.material_code)的合计，按件数降序排名
     -->
     <sql id="inboundRankConditions">
@@ -41,10 +41,10 @@
             and a.material_name like concat('%', #{materialName}, '%')
         </if>
         <if test="warehouseDateStart != null and warehouseDateStart != ''">
-            and date_format(b.warehouse_date,'%Y-%m-%d') &gt;= #{warehouseDateStart}
+            and date_format(IFNULL(b.warehouse_date, b.create_time),'%Y-%m-%d') &gt;= #{warehouseDateStart}
         </if>
         <if test="warehouseDateEnd != null and warehouseDateEnd != ''">
-            and date_format(b.warehouse_date,'%Y-%m-%d') &lt;= #{warehouseDateEnd}
+            and date_format(IFNULL(b.warehouse_date, b.create_time),'%Y-%m-%d') &lt;= #{warehouseDateEnd}
         </if>
     </sql>
 
@@ -58,7 +58,7 @@
     <select id="queryMaterialRankList" parameterType="com.mhd.wms.domain.inboundRank.repository.todo.InboundRankDO"
             resultType="com.mhd.wms.domain.inboundRank.repository.po.InboundMaterialRankPO">
         select
-            MAX(b.warehouse_date)                                        AS warehouseDate,
+            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,