From ee338a88d9c087a94e312c554868afb65d6e1327 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: Tue, 14 Sep 2021 14:49:37 +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=20=20=20=E5=BA=93=E4=BD=8D=E4=BF=A1=E6=81=AF=E4=B8=AD?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D=E5=8C=BA=E5=9F=9F=E7=9A=84=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/web/controller/tool/UUIDTool.java  | 7 +++++++
 .../resources/templates/system/baselocationinfo/add.html   | 4 +++-
 .../system/baselocationinfo/baselocationinfo.html          | 6 +++++-
 .../resources/templates/system/baselocationinfo/edit.html  | 5 ++++-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UUIDTool.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UUIDTool.java
index 9a92743..b18b7c1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UUIDTool.java
+++ b/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());
     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/add.html b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/add.html
index be588b9..7c10bdd 100644
--- a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/add.html
+++ b/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">    
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 7385120..b0a8e45 100644
--- a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html
+++ b/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',
diff --git a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/edit.html b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/edit.html
index 44f421a..dc02945 100644
--- a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/edit.html
+++ b/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">