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 120b0dda..91635b48 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
@@ -129,6 +129,27 @@ public class WarehouseStorageOrder extends BaseEntity
     @Excel(name = "仓库详细地址")
     private String warehouseDetailAddress;
 
+    /** 供应商ID */
+    @Excel(name = "供应商ID")
+    private String supplierCode;
+
+    /** 供应商名称 */
+    @Excel(name = "供应商名称")
+    private String supplierName;
+
+    /** 联系人 */
+    @Excel(name = "联系人")
+    private String customerContact;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String contactNumber;
+
+    /** 公司地址 */
+    @Excel(name = "公司地址")
+    private String supplierAddress;
+
+
     /** 仓库入库单详情 */
     @Excel(name = "仓库名称")
     private List<WarehouseStorageOrderDetail> warehouseStorageOrderDetailList;
@@ -357,6 +378,47 @@ public class WarehouseStorageOrder extends BaseEntity
         this.warehouseDetailAddress = warehouseDetailAddress;
     }
 
+
+    public String getSupplierCode() {
+        return supplierCode;
+    }
+
+    public void setSupplierCode(String supplierCode) {
+        this.supplierCode = supplierCode;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public String getCustomerContact() {
+        return customerContact;
+    }
+
+    public void setCustomerContact(String customerContact) {
+        this.customerContact = customerContact;
+    }
+
+    public String getContactNumber() {
+        return contactNumber;
+    }
+
+    public void setContactNumber(String contactNumber) {
+        this.contactNumber = contactNumber;
+    }
+
+    public String getSupplierAddress() {
+        return supplierAddress;
+    }
+
+    public void setSupplierAddress(String supplierAddress) {
+        this.supplierAddress = supplierAddress;
+    }
+
     public List<WarehouseStorageOrderDetail> getWarehouseStorageOrderDetailList() {
         return warehouseStorageOrderDetailList;
     }
@@ -373,6 +435,7 @@ public class WarehouseStorageOrder extends BaseEntity
         this.qualityOrderCode = qualityOrderCode;
     }
 
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -401,6 +464,11 @@ public class WarehouseStorageOrder extends BaseEntity
             .append("warehouseCode", getWarehouseCode())
             .append("warehouseName", getWarehouseName())
             .append("warehouseDetailAddress",getWarehouseDetailAddress())
+            .append("supplierCode",getSupplierCode())
+            .append("supplierName",getSupplierName())
+            .append("customerContact",getCustomerContact())
+            .append("contactNumber",getContactNumber())
+            .append("supplierAddress",getSupplierAddress())
             .append("createTime", getCreateTime())
             .append("createBy", getCreateBy())
             .append("updateBy", getUpdateBy())
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java
index 788b1c0e..16e7abcb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java
@@ -31,14 +31,6 @@ public interface WarehouseStorageOrderMapper
 
 
 
-    /**
-     * 采购入库通知单查询仓库入库单列表
-     *
-     * @param warehouseStorageOrder 仓库入库单
-     * @return 仓库入库单集合
-     */
-    public List<WarehouseStorageOrder> selectPurchaseStorageList(WarehouseStorageOrder warehouseStorageOrder);
-
     /**
      * 新增仓库入库单
      * 
diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml
index 43228376..2896e5d3 100644
--- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml
@@ -31,6 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="warehouseCode"                    column="warehouse_code"    />
         <result property="warehouseName"                    column="warehouse_name"    />
         <result property="warehouseDetailAddress"           column="warehouse_detail_address"    />
+        <result property="supplierCode"                     column="supplier_code"    />
+        <result property="supplierName"                     column="supplier_name"    />
+        <result property="supplierAddress"                 column="supplier_address"    />
+        <result property="customerContact"                 column="customer_contact"    />
+        <result property="contactNumber"                    column="contact_number"    />
         <result property="createTime"                       column="create_time"    />
         <result property="createBy"                         column="create_by"    />
         <result property="updateBy"                         column="update_by"    />
@@ -43,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                notify_arrived_num, actual_arrived_num, temporary_qualified_num, temporary_unqualified_num,
                quality_qualified_num, quality_unqualified_num ,storage_num, arrived_time, temporary_time,
                delivery_inspection_time, quality_time, storage_time, warehouse_employee, warehouse_code,
-               warehouse_name, warehouse_detail_address ,create_time, create_by, update_by, update_time,
+               warehouse_name, warehouse_detail_address,  supplier_code, supplier_name, supplier_address, customer_contact, contact_number, create_time, create_by, update_by, update_time,
                make_in_total_price, quality_order_code
         from warehouse_storage_order
     </sql>
@@ -66,21 +71,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
-    <select id="selectPurchaseStorageList" parameterType="WarehouseStorageOrder" resultMap="WarehouseStorageOrderResult">
-        <include refid="selectWarehouseStorageOrderVo"/>
-        <where>
-            <if test="warehouseStorageCode != null  and warehouseStorageCode != ''"> and warehouse_storage_code = #{warehouseStorageCode}</if>
-            <if test="relatedOrderCode != null  and relatedOrderCode != ''"> and related_order_code = #{relatedOrderCode}</if>
-            <if test="warehouseStorageStatus != null  and warehouseStorageStatus != ''"> and warehouse_storage_status = #{warehouseStorageStatus}</if>
-            <if test="warehouseQualityStatus != null  and warehouseQualityStatus != ''"> and warehouse_quality_status = #{warehouseQualityStatus}</if>
-            <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 create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
-           and warehouse_order_type = '0'
-        </where>
-         order by create_time desc
-    </select>
-
     <select id="selectWarehouseStorageOrderById" parameterType="Long" resultMap="WarehouseStorageOrderResult">
         <include refid="selectWarehouseStorageOrderVo"/>
         where warehouse_storage_id = #{warehouseStorageId}
@@ -114,6 +104,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseCode != null">warehouse_code,</if>
             <if test="warehouseName != null">warehouse_name,</if>
             <if test="warehouseDetailAddress != null">warehouse_detail_address,</if>
+            <if test="supplierCode != null">supplier_code,</if>
+            <if test="supplierName != null">supplier_name,</if>
+            <if test="supplierAddress != null">supplier_address,</if>
+            <if test="customerContact != null">customer_contact,</if>
+            <if test="contactNumber != null">contact_number,</if>
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
@@ -145,6 +140,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseCode != null">#{warehouseCode},</if>
             <if test="warehouseName != null">#{warehouseName},</if>
             <if test="warehouseDetailAddress != null">#{warehouseDetailAddress},</if>
+            <if test="supplierCode != null">#{supplierCode},</if>
+            <if test="supplierName != null">#{supplierName},</if>
+            <if test="supplierAddress != null">#{supplierAddress},</if>
+            <if test="customerContact != null">#{customerContact},</if>
+            <if test="contactNumber != null">#{contactNumber},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -180,6 +180,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseCode != null">warehouse_code = #{warehouseCode},</if>
             <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
             <if test="warehouseDetailAddress != null">warehouse_detail_address = #{warehouseDetailAddress},</if>
+            <if test="supplierCode != null">supplier_code = #{supplierCode},</if>
+            <if test="supplierName != null">supplier_name = #{supplierName},</if>
+            <if test="supplierAddress != null">supplier_address = #{supplierAddress},</if>
+            <if test="customerContact != null">customer_contact = #{customerContact},</if>
+            <if test="contactNumber != null">contact_number = #{contactNumber},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
@@ -217,6 +222,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseCode != null">warehouse_code = #{warehouseCode},</if>
             <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
             <if test="warehouseDetailAddress != null">warehouse_detail_address = #{warehouseDetailAddress},</if>
+            <if test="supplierCode != null">supplier_code = #{supplierCode},</if>
+            <if test="supplierName != null">supplier_name = #{supplierName},</if>
+            <if test="supplierAddress != null">supplier_address = #{supplierAddress},</if>
+            <if test="customerContact != null">customer_contact = #{customerContact},</if>
+            <if test="contactNumber != null">contact_number = #{contactNumber},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>