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 @@
- +
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 @@
- + +