diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/todo/ReserveStockInOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/todo/ReserveStockInOrderDO.java
index 39fef8510..6346fc9d7 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/todo/ReserveStockInOrderDO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/todo/ReserveStockInOrderDO.java
@@ -446,4 +446,10 @@ public class ReserveStockInOrderDO extends BaseVOEntity {
     @ApiModelProperty("客户名称")
     @Excel(name = "客户名称")
     private String customerName;
+
+    @ApiModelProperty("出入库方向（inAndOutList查询条件）: in-入库 out-出库 all/空-全部")
+    private String inOrOut;
+
+    @ApiModelProperty("出入库单号（inAndOutList查询条件，模糊匹配，出库out_order_number/入库in_order_number）")
+    private String orderNumber;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/todo/ReserveStockInOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/todo/ReserveStockInOrderDTO.java
index 8e24361b6..92b59c131 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/todo/ReserveStockInOrderDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/todo/ReserveStockInOrderDTO.java
@@ -443,4 +443,10 @@ public class ReserveStockInOrderDTO extends ReserveStockInOrderBaseDTO {
     @ApiModelProperty("客户名称")
     @Excel(name = "客户名称")
     private String customerName;
+
+    @ApiModelProperty("出入库方向（inAndOutList查询条件）: in-入库 out-出库 all/空-全部")
+    private String inOrOut;
+
+    @ApiModelProperty("出入库单号（inAndOutList查询条件，模糊匹配，出库out_order_number/入库in_order_number）")
+    private String orderNumber;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml
index c7f95902f..ce164c569 100644
--- a/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml
@@ -558,7 +558,7 @@
     </resultMap>
 
     <select id="detailsList" parameterType="com.mhd.oms.domain.reserveStockInOrder.repository.todo.ReserveStockInOrderDO" resultMap="MaterialDetailResult">
-        select b.*
+        select b.*, a.status, a.issue_status
         from reserve_stock_in_order a left join reserve_in_material_detail b on a.IN_ORDER_NUMBER = b.IN_ORDER_NUMBER
         <where>
             <include refid="selectStockInOrderPo1"/>
@@ -671,14 +671,17 @@
         <if test="customerId != null">
             and a."customerId" = #{customerId}
         </if>
-        <if test="inOrOut != null">
+        <if test="inOrOut != null and inOrOut != '' and inOrOut != 'all'">
             and a."inOrOut" = #{inOrOut}
         </if>
+        <if test="status != null">
+            and a."status" = #{status}
+        </if>
         <if test="issueStatus != null">
             and a."issueStatus" = #{issueStatus}
         </if>
-        <if test="orderNumber != null">
-            and a."orderNumber" = #{orderNumber}
+        <if test="orderNumber != null and orderNumber != ''">
+            and a."orderNumber" like concat('%', #{orderNumber}, '%')
         </if>
         <if test="createTimeStart != null and createTimeStart != ''">
             and date_format(a."createTime",'%Y-%m-%d') &gt;= #{createTimeStart}