diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrder.java
index 4e35a0a6..306ade6f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrder.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrder.java
@@ -150,9 +150,15 @@ public class WarehouseStorageOrder extends BaseEntity
     private String supplierAddress;
 
     /** 是否退回供应商 */
-    @Excel(name = "是否退回供应商")
+
     private String isReturnedToSupplier;
 
+    /** 料号*/
+    private String materialNo;
+
+    /** 物料名称*/
+    private String materialName;
+
     /** 仓库入库单详情 */
     @Excel(name = "仓库名称")
     private List<WarehouseStorageOrderDetail> warehouseStorageOrderDetailList;
@@ -447,6 +453,22 @@ public class WarehouseStorageOrder extends BaseEntity
         this.isReturnedToSupplier = isReturnedToSupplier;
     }
 
+    public String getMaterialNo() {
+        return materialNo;
+    }
+
+    public void setMaterialNo(String materialNo) {
+        this.materialNo = materialNo;
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml
index d7724f45..52eb277b 100644
--- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml
@@ -41,6 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createBy"                         column="create_by"    />
         <result property="updateBy"                         column="update_by"    />
         <result property="updateTime"                       column="update_time"    />
+        <result property="materialNo"                       column="material_no"    />
+        <result property="materialName"                       column="material_name"    />
     </resultMap>
 
     <sql id="selectWarehouseStorageOrderVo">
@@ -66,6 +68,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseDeptType != null  and warehouseDeptType != ''"> and warehouse_dept_type = #{warehouseDeptType}</if>
             <if test="warehouseEmployee != null  and warehouseEmployee != ''"> and warehouse_employee = #{warehouseEmployee}</if>
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and Date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+            <if test="materialNo != null and materialNo != ''">
+                and  warehouse_storage_code in ( select warehouse_storage_code from warehouse_storage_order_detail where material_no like concat('%', #{materialNo}, '%'))
+            </if>
+            <if test="materialName != null and materialName != ''">
+                and  warehouse_storage_code in ( select warehouse_storage_code from warehouse_storage_order_detail where material_name like concat('%', #{materialName}, '%'))
+            </if>
         </where>
         order by create_time desc
     </select>
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html
index ed8cc170..0344f76f 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html
@@ -39,7 +39,14 @@
                                 <label>关联订单号：</label>
                                 <input type="text" name="relatedOrderCode"/>
                             </li>
-
+                            <li>
+                                <label>料号：</label>
+                                <input type="text" name="materialNo"/>
+                            </li>
+                            <li>
+                                <label>物料名称：</label>
+                                <input type="text" name="materialName"/>
+                            </li>
                             <li>
                                 <label>仓库员：</label>
                                 <input type="text" name="warehouseEmployee"/>