From 155dcb3f6bda45df9da10f3fe76fb65758a6541c Mon Sep 17 00:00:00 2001
From: chardon55 <charlesdong_2000@outlook.com>
Date: Tue, 19 Oct 2021 10:27:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/baselocationinfo/baselocationinfo.html   | 4 ++++
 .../main/resources/mapper/system/BaseLocationInfoMapper.xml   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html
index 4aef9b1..0757a37 100644
--- a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html
+++ b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html
@@ -18,6 +18,10 @@
                                 <label>库位名称：</label>
                                 <input type="text" name="locationName"/>
                             </li>
+                            <li>
+                                <label>物料类别：</label>
+                                <input type="text" name="materialType"/>
+                            </li>
                             <li>
                                 <label>所处排：</label>
                                 <input type="text" name="locationRow"/>
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml
index 4bce8a7..f9df5a8 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml
@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="locationCode != null  and locationCode != ''"> and location_code like concat(concat('%', #{locationCode}), '%')</if>
             <if test="locationName != null  and locationName != ''"> and location_name like concat(concat('%', #{locationName}), '%')</if>
+            <if test="materialType != null  and materialType != ''"> and material_type like concat(concat('%', #{materialType}), '%')</if>
 
             <if test="locationRow != null  and locationRow != ''"> and location_row = #{locationRow} </if>
             <if test="locationLine != null  and locationLine != ''"> and location_line =  #{locationLine} </if>