已经完成

库位信息中库位区域的维护

ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UUIDTool.java

@@ -10,6 +10,13 @@ import java.util.UUID;
 
 public class UUIDTool {
 
+    public static void main(String[] args) {
+        for (int i=0;i<=320;i++){
+            System.out.println(generate());
+        }
+
+    }
+
     public static String generate(){
         return String.valueOf(UUID.randomUUID());
     }

ruoyi-admin/src/main/resources/templates/system/baselocationinfo/add.html

@@ -34,7 +34,9 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">库位区域：</label>
                 <div class="col-sm-8">
-                    <input name="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}"></option>
+                    </select>
                 </div>
             </div>
             <div class="form-group">    

ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html

@@ -60,6 +60,7 @@
 
 
         var locationStatusDatas = [[${@dict.getType('location_status')}]];
+        var locationinfo = [[${@dict.getType('location_info')}]];
 
         var efficiencyDatas = [[${@baseEfficiencyLevelService.selectBaseEfficiencyLevelList(null)}]];
 
@@ -99,7 +100,10 @@
                 },
                 {
                     field: 'locationArea',
-                    title: '库位区域'
+                    title: '库位区域',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(locationinfo, value);
+                    }
                 },
                 {
                     field: 'locationRow',

ruoyi-admin/src/main/resources/templates/system/baselocationinfo/edit.html

@@ -35,7 +35,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">