diff --git a/ruoyi-admin/src/main/resources/templates/system/basematerialstore/add.html b/ruoyi-admin/src/main/resources/templates/system/basematerialstore/add.html
index 0674ebf..f8a852c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/basematerialstore/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/basematerialstore/add.html
@@ -35,8 +35,13 @@
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">库位区域：</label>
-                <div class="col-sm-8">
+               <!-- <div class="col-sm-8">
                     <input name="locationArea" class="form-control" type="text">
+                </div>-->
+                <div class="col-sm-8">
+                    <select name="locationArea" class="form-control m-b" th:with="type=${@dict.getType('location_info')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
                 </div>
             </div>
             <div class="form-group">    
diff --git a/ruoyi-admin/src/main/resources/templates/system/basematerialstore/basematerialstore.html b/ruoyi-admin/src/main/resources/templates/system/basematerialstore/basematerialstore.html
index 3534274..dfe6a60 100644
--- a/ruoyi-admin/src/main/resources/templates/system/basematerialstore/basematerialstore.html
+++ b/ruoyi-admin/src/main/resources/templates/system/basematerialstore/basematerialstore.html
@@ -18,6 +18,20 @@
                                 <label>物料类型：</label>
                                 <input type="text" name="materialType"/>
                             </li>
+                            <li>
+                                <label>库位状态：</label>
+                                <select name="locationStatus" th:with="type=${@dict.getType('location_status')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>库位区域：</label>
+                                <select name="locationArea" th:with="type=${@dict.getType('location_info')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -51,6 +65,7 @@
         var editFlag = [[${@permission.hasPermi('system:basematerialstore:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:basematerialstore:remove')}]];
         var locationStatusDatas = [[${@dict.getType('location_status')}]];
+        var locationInfo = [[${@dict.getType('location_info')}]];
         var prefix = ctx + "system/basematerialstore";
 
         $(function() {
@@ -90,7 +105,10 @@
                 },
                 {
                     field: 'locationArea',
-                    title: '库位区域'
+                    title: '库位区域',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(locationInfo, value);
+                    }
                 },
                 {
                     field: 'recordTime',
diff --git a/ruoyi-admin/src/main/resources/templates/system/basematerialstore/edit.html b/ruoyi-admin/src/main/resources/templates/system/basematerialstore/edit.html
index 23d26ad..149c1e2 100644
--- a/ruoyi-admin/src/main/resources/templates/system/basematerialstore/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/basematerialstore/edit.html
@@ -37,7 +37,10 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">库位区域：</label>
                 <div class="col-sm-8">
-                    <input name="locationArea" th:field="*{locationArea}" class="form-control" type="text">
+
+                    <select name="locationArea" class="form-control m-b" th:with="type=${@dict.getType('location_info')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{locationArea}"></option>
+                    </select>
                 </div>
             </div>
             <div class="form-group">    
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseMaterialStoreMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseMaterialStoreMapper.xml
index 4168168..d998453 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseMaterialStoreMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseMaterialStoreMapper.xml
@@ -24,6 +24,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="materialCode != null  and materialCode != ''"> and material_code like concat(concat('%', #{materialCode}), '%')</if>
             <if test="materialType != null  and materialType != ''"> and material_type like concat(concat('%', #{materialType}), '%')</if>
+
+            <if test="locationStatus != null"> and location_status = #{locationStatus} </if>
+            <if test="locationArea != null  and locationArea != ''"> and location_area = #{locationArea} </if>
             and delete_flag = '1'
         </where>
     </select>