diff --git a/mhd_oms/src/main/resources/mapper/reservationMaterialInventory/MaterialInventoryMapper.xml b/mhd_oms/src/main/resources/mapper/reservationMaterialInventory/MaterialInventoryMapper.xml
index 15765223e..62803f7e7 100644
--- a/mhd_oms/src/main/resources/mapper/reservationMaterialInventory/MaterialInventoryMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationMaterialInventory/MaterialInventoryMapper.xml
@@ -270,11 +270,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="boxPalletNo != null  and boxPalletNo != ''">
             and a.BOX_PALLET_NO like concat('%', #{boxPalletNo}, '%')
         </if>
-        <if test="expiryDate != null and expiryDate != ''">
-            AND TO_CHAR(a.expiry_date, 'yyyy-MM-dd') = #{expiryDate}
+        <if test="expiryDateStr != null and expiryDateStr != ''">
+            AND TO_CHAR(a.expiry_date, 'yyyy-MM-dd') = #{expiryDateStr}
         </if>
-        <if test="productionDate != null and productionDate != ''">
-            AND TO_CHAR(a.production_date, 'yyyy-MM-dd') = #{productionDate}
+        <if test="productionDateStr != null and productionDateStr != ''">
+            AND TO_CHAR(a.production_date, 'yyyy-MM-dd') = #{productionDateStr}
         </if>
     </sql>
 
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java
index 835bda0ab..3b8432240 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java
@@ -247,4 +247,6 @@ public class MaterialInventoryDO extends MaterialBaseDO {
 
     /** 为 true 时 SQL 排除库存数量为 0（含 null 视为 0） */
     private Boolean excludeZeroInventoryQuantity;
+    private String expiryDateStr;
+    private String productionDateStr;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java
index 28b534be9..ef6240425 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java
@@ -188,5 +188,7 @@ public class MaterialInventoryDTO extends MaterialBaseDTO {
     /** 为 true 时排除库存数量为 0 的行（出库分配选库存用）；库存查询页不传或 false */
     @ApiModelProperty(value = "是否排除库存数量为0", example = "false")
     private Boolean excludeZeroInventoryQuantity;
+    private String expiryDate;
+    private String productionDate;
 
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java
index 94370ff6e..8d1c18a11 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java
@@ -81,6 +81,8 @@ public class MaterialInventoryApi extends BaseController {
 
         //转换实体
         MaterialInventoryDO materialInventoryDO = materialInventoryAssembler.toDO(materialInventoryDTO);
+        materialInventoryDO.setExpiryDateStr(materialInventoryDTO.getExpiryDate());
+        materialInventoryDO.setProductionDateStr(materialInventoryDTO.getProductionDate());
         startPage();
         // 使用带批次属性的查询方法，批次属性值从库存表中获取
         List<MaterialInventoryPO> list = materialInventoryApplicationService.queryListWithBatchAttributes(materialInventoryDO);
@@ -220,4 +222,4 @@ public class MaterialInventoryApi extends BaseController {
         return AjaxResult.success(materialInventoryApplicationService.sumInventoryQuantity(materialInventoryDO));
     }
 
-}
+}
\ No newline at end of file
diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
index 0cf5d975e..a6ec0dc36 100644
--- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
@@ -232,6 +232,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="boxPalletNo != null  and boxPalletNo != ''">
             and a.BOX_PALLET_NO like concat('%', #{boxPalletNo}, '%')
         </if>
+        <if test="expiryDateStr != null and expiryDateStr != ''">
+            AND TO_CHAR(b.expiry_date, 'yyyy-MM-dd') = #{expiryDateStr}
+        </if>
+        <if test="productionDateStr != null and productionDateStr != ''">
+            AND TO_CHAR(b.production_date, 'yyyy-MM-dd') = #{productionDateStr}
+        </if>
     </sql>
 
     <!-- 与 selectMaterialInventoryPo1 相同条件，表别名为 mi（用于 queryListByWl 最新明细子查询） -->