From 12734d20fc78a4232cb41adecf82d6660bda3a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A3=AE=E5=B1=BF=E6=B5=B7=E5=B7=B7?= <15711450175@163.com>
Date: Fri, 24 Sep 2021 16:52:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=AE=8C=E6=88=90=20=20=20?=
 =?UTF-8?q?=20=E5=BA=93=E4=BD=8D=E4=BF=A1=E6=81=AF=E4=B8=AD=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/basic/BaseLocationInfoController.java  | 1 +
 .../system/baselocationinfo/baselocationinfo.html         | 8 ++++++++
 .../resources/mapper/system/BaseLocationInfoMapper.xml    | 1 +
 3 files changed, 10 insertions(+)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java
index 20c0c64..5e64336 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java
@@ -67,6 +67,7 @@ public class BaseLocationInfoController extends BaseController
     public TableDataInfo list(BaseLocationInfo baseLocationInfo)
     {
         startPage();
+
         List<BaseLocationInfo> list = baseLocationInfoService.selectBaseLocationInfoList(baseLocationInfo);
         return getDataTable(list);
     }
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 b9360cd..17be929 100644
--- a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html
+++ b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html
@@ -30,6 +30,14 @@
                                 <label>所处层：</label>
                                 <input type="text" name="locationTier"/>
                             </li>
+                            <li>
+                                <label>所属仓库：</label>
+                                <select name="storeCode" th:with="type=${@baseStoreInfoService.selectBaseStoreInfoList(null)}">
+                                    <option value="">所有</option>
+                                    <option th:each="baseStoreInfos: ${type}" th:text="${baseStoreInfos.storeName}" th:value="${baseStoreInfos.storeCode}"></option>
+                                </select>
+
+                            </li>
                             <li>
                                 <label>库位状态：</label>
                                 <select name="locationStatus" th:with="type=${@dict.getType('location_status')}">
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml
index d2bf674..2108bd5 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml
@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="locationStatus != null "> and location_status = #{locationStatus}</if>
 
             <if test="locationArea != null  and locationArea != ''"> and location_area = #{locationArea}</if>
+            <if test="storeCode != null  and storeCode != ''"> and store_code = #{storeCode}</if>
 
              and delete_flag = '1'
         </where>