菜单调整，菜单文字修改

LN
Commit 4bf3e266 由 LN 编写于 2022-01-05 09:47:12 +0800
src/main/java/com/neotel/smfcore/common/init/DataInitManager.java
src/main/java/com/neotel/smfcore/core/language/util/MessageService.java
src/main/resources/messages.properties
src/main/resources/messages_en_US.properties
src/main/resources/messages_ja_JP.properties
src/main/resources/messages_zh_CN.properties
src/main/resources/messages_zh_TW.properties
--- a/src/main/java/com/neotel/smfcore/common/init/DataInitManager.java
查看文件 @4bf3e26
+++ b/src/main/java/com/neotel/smfcore/common/init/DataInitManager.java
查看文件 @4bf3e26
@@ -135,14 +135,32 @@ public class DataInitManager {
            for (Menu subm : subMenus
            ) {
+                List<Menu> childMenus=new ArrayList<>();
+                if(subm.getChildren()!=null)
+                {
+                    childMenus=new ArrayList<>(subm.getChildren()) ;
+                }
                i++;
                int subSort = sortValue * 10 + i;
                subm.setMenuSort(subSort);
-                subm.setSubCount(0);
+                subm.setSubCount(childMenus.size());
                subm.setPid(pMenu.getId());
+                subm.setChildren(new ArrayList<>());
                subm=menuManager.saveMenu(subm);
                list.add(subm);
 //                list.addAll(createSubPerMenus(subm));
+                for (Menu childMenu :childMenus){
+                    i++;
+                      subSort = sortValue * 10 + i;
+                    childMenu.setMenuSort(subSort);
+                    childMenu.setSubCount(0);
+                    childMenu.setPid(subm.getId());
+                    childMenu.setChildren(new ArrayList<>());
+                    childMenu=menuManager.saveMenu(childMenu);
+                    list.add(childMenu);
+                }
            }
        }
        return list;
@@ -182,29 +200,38 @@ public class DataInitManager {
    private Set<String> MenuInitNew() {
        List<Menu> menus = new ArrayList<Menu>();
-        //料架分组
+        //设备看板
        Menu menukanban = new Menu(new ArrayList<Menu>(), 1, "boxkanban", "设备看板", 1, "lockMaterial", "lockMaterial/material/index", "", 0, "kanban");
-//        menukanban.setHidden(true);
        menus.addAll(createMenus(menukanban));
        //料架分组
        Menu menuShelf = new Menu(new ArrayList<Menu>(), 1, "sensorShelf", "料架分组", 1, "lightGroup", "neolight/lightGroup/index", "", 0, "neo1");
        menuShelf.setHidden(true);
        menus.addAll(createMenus(menuShelf));
-        //出库：工单，查找出库
+        //物料管理：工单出库，查找出库（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 menuOut = new Menu(new ArrayList<Menu>(), 1, "checkOut", "查找出库", 1, "singleOuput", "neolight/singleOuput/index", "", 0, "export1");
-        Menu celueOut = new Menu(new ArrayList<Menu>(), 1, "tacticsOuput", "策略出库", 1, "tacticsOuput", "neolight/tacticsOuput/index", "", 0, "workOrder");
+        Menu out = Menu.CreatePMenu("查找出库", 20, "searchOut", 2, "export1");
-        Menu groupOut = new Menu(new ArrayList<Menu>(), 1, "labelOuput", "物料分组", 1, "labelOuput", "neolight/labelOuput/index", "", 0, "export1");
+        Menu menuOut = new Menu(new ArrayList<Menu>(), 1, "checkOut", "UID出库", 1, "singleOuput", "neolight/singleOuput/index", "", 0, "export1");
-        Menu manualOut = new Menu(new ArrayList<Menu>(), 1, "manualOut", "手动出库", 1, "manualOut", "neolight/manualOut/index", "", 0, "export1");
+        Menu celueOut = new Menu(new ArrayList<Menu>(), 1, "tacticsOuput", "PN出库", 1, "tacticsOuput", "neolight/tacticsOuput/index", "", 0, "workOrder");
+        out.setChildren(Arrays.asList((new Menu[]{menuOut,celueOut})));
+        Menu groupOut = new Menu(new ArrayList<Menu>(), 1, "labelOuput", "物料标签", 1, "labelOuput", "neolight/labelOuput/index", "", 0, "mgroup");
+//        Menu manualOut = new Menu(new ArrayList<Menu>(), 1, "manualOut", "手动出库", 1, "manualOut", "neolight/manualOut/index", "", 0, "export1");
        Menu materialBox = new Menu(new ArrayList<Menu>(), 1, "materialBox", "料盒操作", 1, "materialBox", "neolight/materialBox/index", "", 0, "mIbox");
+        Menu outSet = new Menu(new ArrayList<Menu>(), 1, "outSetting", "出库策略", 1, "outSetting", "system/outSetting/index", "", 0, "outSet");
+        Menu orderSet = new Menu(new ArrayList<Menu>(), 1, "orderSetting", "工单设置", 1, "orderSetting", "system/orderSetting/index", "", 0, "sysSet");
        celueOut.setHidden(true);
        groupOut.setHidden(true);
-        manualOut.setHidden(true);
        materialBox.setHidden(true);
-        menus.addAll(createMenus(poutOut, menuOrder, menuOut,celueOut,groupOut,manualOut,materialBox));
+        outSet.setHidden(true);
+        orderSet.setHidden(true);
+        menus.addAll(createMenus(poutOut, menuOrder, out,groupOut,materialBox,outSet,orderSet));
+        //MSD管理：MSD库存.MSD追溯性.MSD设置
        Menu msd = Menu.CreatePMenu("MSD管理", 20, "msd", 2, "MSD");
        Menu msdManage = new Menu(new ArrayList<Menu>(), 1, "msdManage", "MSD库存", 1, "msdManage", "neolight/msdManage/index", "", 0, "MSDManager");
        Menu msdData = new Menu(new ArrayList<Menu>(), 1, "msdData", "MSD追溯性", 1, "msdData", "neolight/msdData/index", "", 0, "MSDData");
@@ -212,7 +239,7 @@ public class DataInitManager {
        msd.setHidden(true);
        menus.addAll(createMenus(msd,msdManage,msdData,msdSetting));
+        //锡膏管理:设备概览.库存.追溯性.设置
        Menu solderPaste = Menu.CreatePMenu("锡膏管理", 20, "solderPaste", 2, "sMana");
        Menu solderPasteKanban = new Menu(new ArrayList<Menu>(), 1, "solderPasteKanban", "设备概览", 1, "solderPasteKanban", "neolight/solderPasteKanban/index", "", 0, "sKanban");
        Menu solderPasteManage = new Menu(new ArrayList<Menu>(), 1, "solderPasteManage", "库存", 1, "solderPasteManage", "neolight/solderPasteManage/index", "", 0, "solder");
@@ -221,36 +248,48 @@ public class DataInitManager {
        solderPaste.setHidden(true);
        menus.addAll(createMenus(solderPaste,solderPasteKanban,solderPasteManage,solderPasteData,solderPasteSetting));
-        //物料管理：元器件管理，条形码管理
+        //物料管理：元器件，条形码,条码设置
        Menu pMenuWl = Menu.CreatePMenu("档案管理", 30, "materiel ", 2, "BOM");
        Menu menucom = new Menu(new ArrayList<Menu>(), 1, "component:list", "元器件", 1, "componentParts", "parts/component/index", "", 0, "server");
        Menu menubarcode = new Menu(new ArrayList<Menu>(), 1, "barcode:list", "条形码", 1, "barcode", "barcode/barcode/index", "", 0, "chart");
-        menus.addAll(createMenus(pMenuWl, menucom, menubarcode));
+        Menu sysSetting = new Menu(new ArrayList<Menu>(), 1, "barcode", "条码设置", 1, "barcodeSetting", "system/barcodeSetting/index", "", 0, "barcode");
+        menus.addAll(createMenus(pMenuWl, menucom, menubarcode,sysSetting));
        //日志管理：物料日志
        Menu pMenuLog = Menu.CreatePMenu("日志管理", 30, "log", 2, "log");
        Menu menuLog = new Menu(new ArrayList<Menu>(), 1, "taskLog", "物料日志", 1, "taskLog", "neolight/taskLog/index", "", 0, "education");
        menus.addAll(createMenus(pMenuLog, menuLog));
+        //报表：出入库、库存
+        Menu pMenuReport = Menu.CreatePMenu("报表", 30, "report", 2, "inOutData");
+        Menu inOutMenu = new Menu(new ArrayList<Menu>(), 1, "inOutData", "出入库", 1, "inOutData", "neolight/inOutData/index", "", 0, "outPut");
+        Menu inventoryMenu = new Menu(new ArrayList<Menu>(), 1, "inventory", "库存", 1, "inventory", "neolight/inventory/index", "", 0, "inventory");
+        menus.addAll(createMenus(pMenuReport, inOutMenu,inventoryMenu));
+        //可观测性：物料追踪
+        Menu guanceMenu = Menu.CreatePMenu("可观测性", 30, "observability", 2, "scanKey");
+        Menu zuizongMenu = new Menu(new ArrayList<Menu>(), 1, "materialChart", "物料追踪", 1, "materialChart", "neolight/materialChart/index", "", 0, "maChart");
+        guanceMenu.setHidden(true);
+        menus.addAll(createMenus(guanceMenu, zuizongMenu));
        //设置：料仓管理，菜单管理
        Menu poutSet = Menu.CreatePMenu("设置", 30, "system", 2, "system");
        Menu menuStorage = new Menu(new ArrayList<Menu>(), 1, "storage:list", "设备管理", 1, "bunker", "storage/storage/index", "", 0, "database");
        Menu menuStoragePos = new Menu(new ArrayList<Menu>(), 1, "storagePos:list", "库位管理", 1, "storagePos", "storagePos/storagePos/index", "", 0, "tree-table");
        Menu menuMenu = new Menu(new ArrayList<Menu>(), 1, "menu:list", "菜单管理", 1, "menu", "system/menu/index", "", 0, "menu");
-        Menu sysSetting = new Menu(new ArrayList<Menu>(), 1, "barcode", "条码设置", 1, "barcodeSetting", "system/barcodeSetting/index", "", 0, "database");
+//        Menu sysSetting = new Menu(new ArrayList<Menu>(), 1, "barcode", "条码设置", 1, "barcodeSetting", "system/barcodeSetting/index", "", 0, "database");
-        Menu outSet = new Menu(new ArrayList<Menu>(), 1, "outSetting", "出库策略", 1, "outSetting", "system/outSetting/index", "", 0, "outSet");
+//        Menu outSet = new Menu(new ArrayList<Menu>(), 1, "outSetting", "出库策略", 1, "outSetting", "system/outSetting/index", "", 0, "outSet");
        Menu sysSet = new Menu(new ArrayList<Menu>(), 1, "sysSetting", "系统设置", 1, "sysSetting", "system/sysSetting/index", "", 0, "sysSet");
        Menu translationSet = new Menu(new ArrayList<Menu>(), 1, "translation", "资源翻译", 1, "translation", "system/translation/index", "", 0, "translation");
-        Menu orderSet = new Menu(new ArrayList<Menu>(), 1, "orderSetting", "工单设置", 1, "orderSetting", "system/orderSetting/index", "", 0, "sysSet");
+//        Menu orderSet = new Menu(new ArrayList<Menu>(), 1, "orderSetting", "工单设置", 1, "orderSetting", "system/orderSetting/index", "", 0, "sysSet");
+//        outSet.setHidden(true);
+//        orderSet.setHidden(true);
         menuMenu.setHidden(true);
-        outSet.setHidden(true);
        translationSet.setHidden(true);
-        orderSet.setHidden(true);
+        menus.addAll(createMenus(poutSet, menuStorage, menuStoragePos, menuMenu,sysSet,translationSet));
-        //        menuMenu.setHidden(true);
-//        sysSetting.setHidden(true);
-        menus.addAll(createMenus(poutSet, menuStorage, menuStoragePos, menuMenu, sysSetting,outSet,sysSet,translationSet,orderSet));
        //用户管理：用户管理，角色管理

--- a/src/main/java/com/neotel/smfcore/core/language/util/MessageService.java
查看文件 @4bf3e26
+++ b/src/main/java/com/neotel/smfcore/core/language/util/MessageService.java
查看文件 @4bf3e26
@@ -28,14 +28,14 @@ public class MessageService {
    public MessageService(MyMessageSource messageSource) {
        this.messageSource = messageSource;
-        if(messageSource instanceof ResourceBundleMessageSource){
+//        if(messageSource instanceof ResourceBundleMessageSource){
+//
-            Map<String,String> map1=messageSource.getMessageMap(Locale.SIMPLIFIED_CHINESE);
+//            Map<String,String> map1=messageSource.getMessageMap(Locale.SIMPLIFIED_CHINESE);
-            Map<String,String> map2=messageSource.getMessageMap(Locale.US);
+//            Map<String,String> map2=messageSource.getMessageMap(Locale.US);
-            Map<String,String> map3=messageSource.getMessageMap(Locale.JAPAN);
+//            Map<String,String> map3=messageSource.getMessageMap(Locale.JAPAN);
-            Map<String,String> map4=messageSource.getMessageMap(new Locale("zh","TW"));
+//            Map<String,String> map4=messageSource.getMessageMap(new Locale("zh","TW"));
-            Map<String,String> map5=messageSource.getMessageMap(new Locale(""));
+//            Map<String,String> map5=messageSource.getMessageMap(new Locale(""));
-        }
+//        }
    }
    public Map<String,Map<String, LanguageMsg>> loadMsgMap() {

--- a/src/main/resources/messages.properties
查看文件 @4bf3e26
+++ b/src/main/resources/messages.properties
查看文件 @4bf3e26
@@ -64,7 +64,8 @@ smfcore.lockMaterial=\u8BBE\u5907\u770B\u677F
 smfcore.lightGroup=\u6599\u67B6\u5206\u7EC4
 smfcore.order=\u7269\u6599\u7BA1\u7406
 smfcore.workOrder=\u5DE5\u5355\u51FA\u5E93
-smfcore.singleOuput=\u67E5\u627E\u51FA\u5E93
+smfcore.searchOut=\u67E5\u627E\u51FA\u5E93
+smfcore.singleOuput=UID\u51FA\u5E93
 smfcore.system=\u8BBE\u7F6E
 smfcore.bunker=\u8BBE\u5907\u7BA1\u7406
 smfcore.storagePos=\u5E93\u4F4D\u7BA1\u7406
@@ -91,8 +92,8 @@ smfcore.sysSetting=\u7CFB\u7EDF\u8BBE\u7F6E
 smfcore.help=\u5E2E\u52A9
 smfcore.instruction=\u8BF4\u660E\u4E66
 smfcore.about=\u5173\u4E8E
-smfcore.tacticsOuput=\u7B56\u7565\u51FA\u5E93
+smfcore.tacticsOuput=PN\u51FA\u5E93
-smfcore.labelOuput=\u7269\u6599\u5206\u7EC4
+smfcore.labelOuput=\u7269\u6599\u6807\u7B7E
 smfcore.order.out.executing=\u5DE5\u5355\u6B63\u5728\u6267\u884C
 smfcore.order.out.notFound=\u5DE5\u5355\u672A\u627E\u5230
 smfcore.order.out.maxOrder=\u5DF2\u8FBE\u5230\u6700\u5927\u53EF\u6267\u884C\u5DE5\u5355\u6570
@@ -159,3 +160,6 @@ smfcore.cancelOutTask.taskHasEnd=\u5BA2\u6237\u7AEF\u53D6\u6D88\u51FA\u5E93\u4EF
 smfcore.cancelOutTask.fail=\u5BA2\u6237\u7AEF\u53D6\u6D88\u51FA\u5E93\u4EFB\u52A1[{0}]\u5931\u8D25:{1}
 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
--- a/src/main/resources/messages_en_US.properties
查看文件 @4bf3e26
+++ b/src/main/resources/messages_en_US.properties
查看文件 @4bf3e26
@@ -64,7 +64,8 @@ smfcore.lockMaterial=Equipment Performance Monitor
 smfcore.lightGroup=Neo Light Grouping
 smfcore.order=Material Management
 smfcore.workOrder=Work Order
-smfcore.singleOuput=Search
+smfcore.searchOut=Search
+smfcore.singleOuput=UID Search
 smfcore.system=System
 smfcore.bunker=Equipment
 smfcore.storagePos=Storage Location
@@ -91,7 +92,7 @@ smfcore.sysSetting=System Setting
 smfcore.help=Help
 smfcore.instruction=Instruction manual
 smfcore.about=About
-smfcore.tacticsOuput=Retrieval Method
+smfcore.tacticsOuput=PN Search
 smfcore.labelOuput=Grouping
 smfcore.order.out.executing=Work orders are being executed
 smfcore.order.out.notFound=Work order not found
@@ -159,3 +160,6 @@ smfcore.cancelOutTask.taskHasEnd=Client cancelled outgoing task [{0}] failed:Tas
 smfcore.cancelOutTask.fail=Client cancelled outgoing task [{0}] failed:{1}
 smfcore.observability=Observability 
 smfcore.materialChart=Material Tracking
+smfcore.report=Report
+smfcore.inOutData=Records
+smfcore.inventory=Inventory
\ No newline at end of file
--- a/src/main/resources/messages_ja_JP.properties
查看文件 @4bf3e26
+++ b/src/main/resources/messages_ja_JP.properties
查看文件 @4bf3e26
@@ -64,6 +64,7 @@ smfcore.lockMaterial=\u8A2D\u5099\u304B\u3093\u3070\u3093
 smfcore.lightGroup=\u30E9\u30C3\u30AF\u306E\u30B0\u30EB\u30FC\u30D4\u30F3\u30B0
 smfcore.order=\u30DE\u30C6\u30EA\u30A2\u30EB\u30DE\u30CD\u30B8\u30E1\u30F3\u30C8
 smfcore.workOrder=\u30EF\u30FC\u30AF\u30AA\u30FC\u30C0\u30FC\u30A2\u30A6\u30C8
+smfcore.searchOut=\u8ABF\u3079\u308B
 smfcore.singleOuput=\u8ABF\u3079\u308B
 smfcore.system=\u8A2D\u5B9A
 smfcore.bunker=\u8A2D\u5099\u7BA1\u7406
@@ -91,7 +92,7 @@ smfcore.sysSetting=\u30B7\u30B9\u30C6\u30E0\u8A2D\u5B9A
 smfcore.help=\u30D8\u30EB\u30D7
 smfcore.instruction=\u53D6\u6271\u8AAC\u660E\u66F8
 smfcore.about=\u306B\u3064\u3044\u3066
-smfcore.tacticsOuput=\u30B9\u30C8\u30E9\u30C6\u30B8\u30FC\u306F\u5728\u5EAB\u5207\u308C\u3067\u3059
+smfcore.tacticsOuput=PN\u30A2\u30A6\u30C8\u30D0\u30A6\u30F3\u30C9
 smfcore.labelOuput=\u6750\u6599\u306E\u30B0\u30EB\u30FC\u30D7\u5316
 smfcore.order.out.executing=\u4F5C\u696D\u6307\u793A\u304C\u5B9F\u884C\u3055\u308C\u3066\u3044\u308B
 smfcore.order.out.notFound=\u4F5C\u696D\u6307\u793A\u66F8\u304C\u898B\u3064\u304B\u3089\u306A\u3044
@@ -159,3 +160,6 @@ smfcore.cancelOutTask.taskHasEnd=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u304C\u900
 smfcore.cancelOutTask.fail=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u304C\u767A\u4FE1\u30BF\u30B9\u30AF[{0}]\u3092\u30AD\u30E3\u30F3\u30BB\u30EB\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:{1}
 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
--- a/src/main/resources/messages_zh_CN.properties
查看文件 @4bf3e26
+++ b/src/main/resources/messages_zh_CN.properties
查看文件 @4bf3e26
@@ -64,7 +64,8 @@ smfcore.lockMaterial=\u8BBE\u5907\u770B\u677F
 smfcore.lightGroup=\u6599\u67B6\u5206\u7EC4
 smfcore.order=\u7269\u6599\u7BA1\u7406
 smfcore.workOrder=\u5DE5\u5355\u51FA\u5E93
-smfcore.singleOuput=\u67E5\u627E\u51FA\u5E93
+smfcore.searchOut=\u67E5\u627E\u51FA\u5E93
+smfcore.singleOuput=UID\u51FA\u5E93
 smfcore.system=\u8BBE\u7F6E
 smfcore.bunker=\u8BBE\u5907\u7BA1\u7406
 smfcore.storagePos=\u5E93\u4F4D\u7BA1\u7406
@@ -91,8 +92,8 @@ smfcore.sysSetting=\u7CFB\u7EDF\u8BBE\u7F6E
 smfcore.help=\u5E2E\u52A9
 smfcore.instruction=\u8BF4\u660E\u4E66
 smfcore.about=\u5173\u4E8E
-smfcore.tacticsOuput=\u7B56\u7565\u51FA\u5E93
+smfcore.tacticsOuput=PN\u51FA\u5E93
-smfcore.labelOuput=\u7269\u6599\u5206\u7EC4
+smfcore.labelOuput=\u7269\u6599\u6807\u7B7E
 smfcore.order.out.executing=\u5DE5\u5355\u6B63\u5728\u6267\u884C
 smfcore.order.out.notFound=\u5DE5\u5355\u672A\u627E\u5230
 smfcore.order.out.maxOrder=\u5DF2\u8FBE\u6700\u5927\u53EF\u6267\u884C\u5DE5\u5355\u6570
@@ -159,3 +160,6 @@ smfcore.cancelOutTask.taskHasEnd=\u5BA2\u6237\u7AEF\u53D6\u6D88\u51FA\u5E93\u4EF
 smfcore.cancelOutTask.fail=\u5BA2\u6237\u7AEF\u53D6\u6D88\u51FA\u5E93\u4EFB\u52A1[{0}]\u5931\u8D25:{1}
 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
--- a/src/main/resources/messages_zh_TW.properties
查看文件 @4bf3e26
+++ b/src/main/resources/messages_zh_TW.properties
查看文件 @4bf3e26
@@ -64,7 +64,8 @@ smfcore.lockMaterial=\u8A2D\u5099\u770B\u677F
 smfcore.lightGroup=\u6599\u67B6\u5206\u7D44
 smfcore.order=\u7269\u6599\u7BA1\u7406
 smfcore.workOrder=\u5DE5\u55AE\u51FA\u5EAB
-smfcore.singleOuput=\u67E5\u627E\u51FA\u5EAB
+smfcore.searchOut=\u67E5\u627E\u51FA\u5EAB
+smfcore.singleOuput=UID\u51FA\u5EAB
 smfcore.system=\u8A2D\u7F6E
 smfcore.bunker=\u8A2D\u5099\u7BA1\u7406
 smfcore.storagePos=\u5EAB\u4F4D\u7BA1\u7406
@@ -91,8 +92,8 @@ smfcore.sysSetting=\u7CFB\u7D71\u8A2D\u7F6E
 smfcore.help=\u5E6B\u52A9
 smfcore.instruction=\u8AAA\u660E\u66F8
 smfcore.about=\u95DC\u65BC
-smfcore.tacticsOuput=\u7B56\u7565\u51FA\u5EAB
+smfcore.tacticsOuput=PN\u51FA\u5EAB
-smfcore.labelOuput=\u7269\u6599\u5206\u7D44
+smfcore.labelOuput=\u7269\u6599\u6A19\u7C64
 smfcore.order.out.executing=\u5DE5\u55AE\u6B63\u5728\u57F7\u884C
 smfcore.order.out.notFound=\u5DE5\u55AE\u672A\u627E\u5230
 smfcore.order.out.maxOrder=\u5DF2\u9054\u5230\u6700\u5927\u53EF\u57F7\u884C\u5DE5\u55AE\u6578
@@ -159,3 +160,6 @@ smfcore.cancelOutTask.taskHasEnd=\u5BA2\u6236\u7AEF\u53D6\u6D88\u51FA\u5EAB\u4EF
 smfcore.cancelOutTask.fail=\u5BA2\u6236\u7AEF\u53D6\u6D88\u51FA\u5EAB\u4EFB\u52D9[{0}]\u5931\u6557:{1}
 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