菜单文本修改

src/main/java/com/neotel/smfcore/common/init/DataInitManager.java

@@ -21,6 +21,7 @@ import com.neotel.smfcore.security.service.po.Role;
 import com.neotel.smfcore.security.service.po.User;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Component;
@@ -53,10 +54,16 @@ public class DataInitManager {
     @Autowired
     OrderFileWatch orderFileWatch;
 
+    /**
+     * 当前版本
+     */
+    @Value("${app.version}")
+    private String version;
+
     @PostConstruct
     public  void DataInit() {
         try {
-            log.info("初始化环境...");
+            log.info("smfcore版本号：["+version+"]。初始化环境...");
             //查询admin的用户是否存在
             String userName = Constants.SUPER_USERNAME;
             User admin = userManager.findByUserName(userName);
@@ -212,11 +219,11 @@ public class DataInitManager {
 
         //物料管理：工单出库，查找出库（UID出库，PN出库），物料标签，料盒操作，出库策略，工单设置
         Menu poutOut = Menu.CreatePMenu("物料管理", 20, "order", 2, "workOrder");
-        Menu menuOrder = new Menu(new ArrayList<Menu>(), 1, "workOrder", "工单出库", 1, "workOrder", "neolight/workOrder/index", "", 0, "workOrder");
+        Menu menuOrder = new Menu(new ArrayList<Menu>(), 1, "workOrder", "工单出库", 1, "workOrder", "neolight/workOrder/index", "", 0, "orderOut");
 
-        Menu out = Menu.CreatePMenu("查找出库", 20, "searchOut", 2, "export1");
+        Menu out = Menu.CreatePMenu("查找出库", 20, "searchOut", 2, "findOut");
         Menu menuOut = new Menu(new ArrayList<Menu>(), 1, "checkOut", "UID出库", 1, "singleOuput", "neolight/singleOuput/index", "", 0, "export1");
-        Menu celueOut = new Menu(new ArrayList<Menu>(), 1, "tacticsOuput", "PN出库", 1, "tacticsOuput", "neolight/tacticsOuput/index", "", 0, "workOrder");
+        Menu celueOut = new Menu(new ArrayList<Menu>(), 1, "tacticsOuput", "PN出库", 1, "tacticsOuput", "neolight/tacticsOuput/index", "", 0, "tacticsOuput");
         out.setChildren(Arrays.asList((new Menu[]{menuOut,celueOut})));
 
 

src/main/resources/config/application.yml

@@ -32,3 +32,8 @@ spring:
 rsa:
   private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
 
+
+app:
+  version: '@project.version@'
+  build:
+    time: '@build.time@'
\ No newline at end of file

src/main/resources/messages.properties

@@ -72,7 +72,7 @@ smfcore.storagePos=\u5E93\u4F4D\u7BA1\u7406
 smfcore.menu=\u83DC\u5355\u7BA1\u7406
 smfcore.materiel =\u6863\u6848\u7BA1\u7406
 smfcore.componentParts=\u5143\u5668\u4EF6
-smfcore.barcode=\u6761\u5F62\u7801
+smfcore.barcode=\u6761\u7801\u7BA1\u7406
 smfcore.log=\u65E5\u5FD7\u7BA1\u7406
 smfcore.taskLog=\u7269\u6599\u65E5\u5FD7
 smfcore.user=\u7528\u6237\u7BA1\u7406
@@ -149,7 +149,7 @@ smfcore.solderPasteKanban=\u8BBE\u5907\u6982\u89C8
 smfcore.solderPasteManage=\u5E93\u5B58
 smfcore.solderPasteData=\u8FFD\u6EAF\u6027
 smfcore.solderPasteSetting=\u8BBE\u7F6E
-smfcore.orderSetting=\u5DE5\u5355\u8BBE\u7F6E
+smfcore.orderSetting=\u5171\u4EAB\u6587\u4EF6\u5939
 smfcore.enterCorrectFolder=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u6587\u4EF6\u5939
 smfcore.taskHasEnd=\u4EFB\u52A1{0}\u5DF2\u53D6\u6D88\u6216\u5DF2\u7ED3\u675F
 smfcore.virtual.notFound=\u672A\u627E\u5230\u865A\u62DF\u4ED3
@@ -162,4 +162,7 @@ smfcore.observability=\u53EF\u89C2\u6D4B\u6027
 smfcore.materialChart=\u7269\u6599\u8FFD\u8E2A
 smfcore.report=\u62A5\u8868
 smfcore.inOutData=\u51FA\u5165\u5E93
-smfcore.inventory=\u5E93\u5B58
\ No newline at end of file
+smfcore.inventory=\u5E93\u5B58
+smfcore.barcodes=\u6761\u5F62\u7801
+smfcore.internet=\u7269\u8054\u7F51
+smfcore.materialBox.qtyError=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u6570\u91CF

src/main/resources/messages_en_US.properties

@@ -72,7 +72,7 @@ smfcore.storagePos=Storage Location
 smfcore.menu=Menu Manager
 smfcore.materiel =Product Info
 smfcore.componentParts=Component
-smfcore.barcode=Material ID
+smfcore.barcode=MA ID Manager
 smfcore.log=Big Data
 smfcore.taskLog=Material Log
 smfcore.user=Users
@@ -149,7 +149,7 @@ smfcore.solderPasteKanban=Equipment Overview
 smfcore.solderPasteManage=Inventory
 smfcore.solderPasteData=Traceability
 smfcore.solderPasteSetting=Setting
-smfcore.orderSetting=Order Setting
+smfcore.orderSetting=Shared Folder
 smfcore.enterCorrectFolder=Please enter the correct folder
 smfcore.taskHasEnd=Task {0} has been cancelled or has ended 
 smfcore.virtual.notFound=No virtual warehouse found
@@ -162,4 +162,6 @@ smfcore.observability=Observability
 smfcore.materialChart=Material Tracking
 smfcore.report=Report
 smfcore.inOutData=Records
-smfcore.inventory=Inventory
\ No newline at end of file
+smfcore.inventory=Inventory
+smfcore.barcodes=MA.ID
+smfcore.internet=Connectivity
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -72,7 +72,7 @@ smfcore.storagePos=\u30B9\u30C8\u30EC\u30FC\u30B8\u7BA1\u7406
 smfcore.menu=\u30E1\u30CB\u30E5\u30FC\u7BA1\u7406
 smfcore.materiel =\u30A2\u30FC\u30AB\u30A4\u30D6\u7BA1\u7406
 smfcore.componentParts=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8
-smfcore.barcode=\u30D0\u30FC\u30B3\u30FC\u30C9
+smfcore.barcode=\u30D0\u30FC\u30B3\u30FC\u30C9\u7BA1\u7406
 smfcore.log=\u30ED\u30B0\u7BA1\u7406
 smfcore.taskLog=\u30DE\u30C6\u30EA\u30A2\u30EB\u30ED\u30B0
 smfcore.user=\u30E6\u30FC\u30B6\u30FC\u7BA1\u7406
@@ -149,7 +149,7 @@ smfcore.solderPasteKanban=\u6A5F\u5668\u6982\u8981
 smfcore.solderPasteManage=\u30A4\u30F3\u30D9\u30F3\u30C8\u30EA\u30FC
 smfcore.solderPasteData=\u9061\u53CA
 smfcore.solderPasteSetting=\u8A2D\u5B9A
-smfcore.orderSetting=\u30EF\u30FC\u30AF\u30AA\u30FC\u30C0\u30FC\u306E\u8A2D\u5B9A
+smfcore.orderSetting=\u5171\u6709\u30D5\u30A9\u30EB\u30C0\u30FC
 smfcore.enterCorrectFolder=\u6B63\u3057\u3044\u30D5\u30A9\u30EB\u30C0\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044 
 smfcore.taskHasEnd=\u30BF\u30B9\u30AF{0}\u304C\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u305F\u304B\u7D42\u4E86\u3057\u305F 
 smfcore.virtual.notFound=\u30D0\u30FC\u30C1\u30E3\u30EB\u30A6\u30A8\u30A2\u30CF\u30A6\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
@@ -162,4 +162,6 @@ smfcore.observability=\u89B3\u6E2C\u53EF\u80FD\u6027
 smfcore.materialChart=\u30DE\u30C6\u30EA\u30A2\u30EB\u30C8\u30E9\u30C3\u30AD\u30F3\u30B0
 smfcore.report=\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8
 smfcore.inOutData=\u8A18\u9332
-smfcore.inventory=\u30A4\u30F3\u30D9\u30F3\u30C8\u30EA\u30FC
\ No newline at end of file
+smfcore.inventory=\u30A4\u30F3\u30D9\u30F3\u30C8\u30EA\u30FC
+smfcore.barcodes=\u30D0\u30FC\u30B3\u30FC\u30C9
+smfcore.internet=\u9023\u7D50\u6027
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -72,7 +72,7 @@ smfcore.storagePos=\u5E93\u4F4D\u7BA1\u7406
 smfcore.menu=\u83DC\u5355\u7BA1\u7406
 smfcore.materiel =\u6863\u6848\u7BA1\u7406
 smfcore.componentParts=\u5143\u5668\u4EF6
-smfcore.barcode=\u6761\u5F62\u7801
+smfcore.barcode=\u6761\u7801\u7BA1\u7406
 smfcore.log=\u65E5\u5FD7\u7BA1\u7406
 smfcore.taskLog=\u7269\u6599\u65E5\u5FD7
 smfcore.user=\u7528\u6237\u7BA1\u7406
@@ -149,7 +149,7 @@ smfcore.solderPasteKanban=\u8BBE\u5907\u6982\u89C8
 smfcore.solderPasteManage=\u5E93\u5B58
 smfcore.solderPasteData=\u8FFD\u6EAF\u6027
 smfcore.solderPasteSetting=\u8BBE\u7F6E
-smfcore.orderSetting=\u5DE5\u5355\u8BBE\u7F6E
+smfcore.orderSetting=\u5171\u4EAB\u6587\u4EF6\u5939
 smfcore.enterCorrectFolder=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u6587\u4EF6\u5939
 smfcore.taskHasEnd=\u4EFB\u52A1{0}\u5DF2\u53D6\u6D88\u6216\u5DF2\u7ED3\u675F
 smfcore.virtual.notFound=\u672A\u627E\u5230\u865A\u62DF\u4ED3
@@ -162,4 +162,6 @@ smfcore.observability=\u53EF\u89C2\u6D4B\u6027
 smfcore.materialChart=\u7269\u6599\u8FFD\u8E2A
 smfcore.report=\u62A5\u8868
 smfcore.inOutData=\u51FA\u5165\u5E93
-smfcore.inventory=\u5E93\u5B58
\ No newline at end of file
+smfcore.inventory=\u5E93\u5B58
+smfcore.barcodes=\u6761\u5F62\u7801
+smfcore.internet=\u7269\u8054\u7F51
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -72,7 +72,7 @@ smfcore.storagePos=\u5EAB\u4F4D\u7BA1\u7406
 smfcore.menu=\u83DC\u55AE\u7BA1\u7406
 smfcore.materiel =\u6A94\u6848\u7BA1\u7406
 smfcore.componentParts=\u5143\u5668\u4EF6
-smfcore.barcode=\u689D\u5F62\u78BC
+smfcore.barcode=\u689D\u78BC\u7BA1\u7406
 smfcore.log=\u65E5\u5FD7\u7BA1\u7406
 smfcore.taskLog=\u7269\u6599\u65E5\u5FD7
 smfcore.user=\u7528\u6236\u7BA1\u7406
@@ -149,7 +149,7 @@ smfcore.solderPasteKanban=\u8A2D\u5099\u6982\u89BD
 smfcore.solderPasteManage=\u5EAB\u5B58
 smfcore.solderPasteData=\u8FFD\u6EAF\u6027
 smfcore.solderPasteSetting=\u8A2D\u7F6E
-smfcore.orderSetting=\u5DE5\u5355\u8A2D\u7F6E
+smfcore.orderSetting=\u5171\u4EAB\u6587\u4EF6\u593E
 smfcore.enterCorrectFolder=\u8ACB\u8F38\u5165\u6B63\u78BA\u7684\u6587\u4EF6\u593E
 smfcore.taskHasEnd=\u4EFB\u52D9{0}\u5DF2\u53D6\u6D88\u6216\u5DF2\u7D50\u675F
 smfcore.virtual.notFound=\u672A\u627E\u5230\u865B\u64EC\u5009
@@ -162,4 +162,6 @@ smfcore.observability=\u53EF\u89C0\u6E2C\u6027
 smfcore.materialChart=\u7269\u6599\u8FFD\u8E64
 smfcore.report=\u5831\u8868
 smfcore.inOutData=\u51FA\u5165\u5EAB
-smfcore.inventory=\u5EAB\u5B58
\ No newline at end of file
+smfcore.inventory=\u5EAB\u5B58
+smfcore.barcodes=\u689D\u5F62\u78BC
+smfcore.internet=\u7269\u806F\u7DB2
\ No newline at end of file