From bd47b90d948c7275bd50ee616772db8bdd243c60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Tue, 14 Jan 2025 17:41:58 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E5=85=A5=E5=BA=93=E5=8D=95=20=E4=BF=AE=E6=94=B9=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=96=99=E5=8F=B7=E5=92=8C=E7=89=A9=E6=96=99=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=AD=97=E6=AE=B5=EF=BC=9B=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=96=99=E5=8F=B7=E5=92=8C=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=90=8D=E7=A7=B0=E6=90=9C=E7=B4=A2=E6=A1=86=EF=BC=9B?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E5=8D=95mapper=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E5=AD=90=E8=A1=A8=E6=96=99?=
 =?UTF-8?q?=E5=8F=B7=E5=92=8C=E7=89=A9=E6=96=99=E5=90=8D=E7=A7=B0=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=85=A5=E5=BA=93=E5=8D=95=E8=AF=AD=E5=8F=A5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/WarehouseStorageOrder.java         | 24 ++++++++++++++++++-
 .../warehouse/WarehouseStorageOrderMapper.xml |  8 +++++++
 .../warehouse/storageOrder/storageOrder.html  |  9 ++++++-
 3 files changed, 39 insertions(+), 2 deletions(-)

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"/>