diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/ReservationMaterialInventoryDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/ReservationMaterialInventoryDO.java
index 8c9ffe847..ef2ee27a7 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/ReservationMaterialInventoryDO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/ReservationMaterialInventoryDO.java
@@ -251,4 +251,6 @@ public class ReservationMaterialInventoryDO extends MaterialBaseDO {
     @ApiModelProperty("入库时间 ")
     @Excel(name = "入库时间 ")
     private String createTimeEnd;
+    private String expiryDateStr;
+    private String productionDateStr;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/ReservationMaterialInventoryDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/ReservationMaterialInventoryDTO.java
index 7f152c98b..22b75d6b7 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/ReservationMaterialInventoryDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/ReservationMaterialInventoryDTO.java
@@ -191,5 +191,7 @@ public class ReservationMaterialInventoryDTO extends MaterialBaseDTO {
     @ApiModelProperty("入库时间 ")
     @Excel(name = "入库时间 ")
     private String createTimeEnd;
+    private String expiryDate;
+    private String productionDate;
 
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationMaterialInventory/ReservationMaterialInventoryApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationMaterialInventory/ReservationMaterialInventoryApi.java
index fc199db06..440a71724 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationMaterialInventory/ReservationMaterialInventoryApi.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationMaterialInventory/ReservationMaterialInventoryApi.java
@@ -76,6 +76,8 @@ public class ReservationMaterialInventoryApi extends BaseController {
 
         //转换实体
         ReservationMaterialInventoryDO materialInventoryDO = materialInventoryAssembler.toDO(materialInventoryDTO);
+        materialInventoryDO.setExpiryDateStr(materialInventoryDTO.getExpiryDate());
+        materialInventoryDO.setProductionDateStr(materialInventoryDTO.getProductionDate());
         startPage();
         // 使用带批次属性的查询方法，批次属性值从库存表中获取
         List<ReservationMaterialInventoryPO> list = materialInventoryApplicationService.queryListWithBatchAttributes(materialInventoryDO);
diff --git a/mhd_oms/src/main/resources/mapper/reservationMaterialInventory/MaterialInventoryMapper.xml b/mhd_oms/src/main/resources/mapper/reservationMaterialInventory/MaterialInventoryMapper.xml
index 562e9462a..15765223e 100644
--- a/mhd_oms/src/main/resources/mapper/reservationMaterialInventory/MaterialInventoryMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationMaterialInventory/MaterialInventoryMapper.xml
@@ -270,6 +270,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="expiryDate != null and expiryDate != ''">
+            AND TO_CHAR(a.expiry_date, 'yyyy-MM-dd') = #{expiryDate}
+        </if>
+        <if test="productionDate != null and productionDate != ''">
+            AND TO_CHAR(a.production_date, 'yyyy-MM-dd') = #{productionDate}
+        </if>
     </sql>
 
     <select id="queryList" parameterType="com.mhd.oms.domain.reservationMaterialInventory.repository.todo.ReservationMaterialInventoryDO" resultMap="MaterialInventoryResult">