菜单调整

LN
Commit bdd3cf59 由 LN 编写于 2023-12-01 16:24:00 +0800
src/main/java/com/neotel/smfcore/common/init/MenuInit.java
src/main/java/com/neotel/smfcore/custom/micron1053/Micron1053Menu.java
--- a/src/main/java/com/neotel/smfcore/common/init/MenuInit.java
查看文件 @bdd3cf5
+++ b/src/main/java/com/neotel/smfcore/common/init/MenuInit.java
查看文件 @bdd3cf5
@@ -119,7 +119,7 @@ public class MenuInit {
        addDefaultFunctionMenu(2,null,"设备互联","equipmentView", "neolight/equipmentView/index","equipmentView");
        //物料管理：工单出库，查找出库（UID出库，PN出库），物料标签，料盒操作，出库策略，工单设置
-        Menu poutOut = Menu.CreatePMenu("物料管理", 1, "order", "workOrder", null);
+        Menu poutOut = Menu.CreatePMenu("物料管理", 3, "order", "workOrder", null);
        Menu out = Menu.CreatePMenu("查找出库", 11, "searchOut", "findOut",poutOut);
        addDefaultFunctionMenu(1,out,"UID出库", "singleOuput", "neolight/singleOuput/index","export1",DEFAULT_SHOW_MENU);
@@ -136,17 +136,30 @@ public class MenuInit {
        addDefaultFunctionMenu(7, poutOut, "转储入库", "dumpWarehousing", "system/dumpWarehousing/index", "headIcon");
        addDefaultFunctionMenu(8, poutOut, "单盘入库", "singleDiskWarehousing", "system/singleDiskWarehousing/index", "headIcon");
-        addDefaultFunctionMenu(9, poutOut, "呆滞物料", "sluggishMaterials", "system/sluggishMaterials/index",  "sMaterial");
+//        addDefaultFunctionMenu(9, poutOut, "呆滞物料", "sluggishMaterials", "system/sluggishMaterials/index",  "sMaterial");
        addDefaultFunctionMenu(10,poutOut, "安全库存", "safetyInventory", "system/safetyInventory/index", "safeInventory");
-        addDefaultFunctionMenu(11, poutOut,"过期物料", "expireMaterials", "system/expireMaterials/index",  "sMaterial");
+//        addDefaultFunctionMenu(11, poutOut,"过期物料", "expireMaterials", "system/expireMaterials/index",  "sMaterial");
-        addDefaultFunctionMenu(12, poutOut,"生成工单", "createOrder", "system/createOrder/index",  "createOrder");
+        addDefaultFunctionMenu(12, poutOut,"生成工单", "createOrder", "system/createOrder/index",  "createOrder",DEFAULT_SHOW_MENU);
+        addDefaultFunctionMenu(70, poutOut, "锁定物料", "lockMaterials", "system/lockMaterials/index",  "lockMaterials",DEFAULT_SHOW_MENU);
+        //日志管理：物料日志
+        Menu pMenuLog = Menu.CreatePMenu("日志管理", 4, "log","log",null);
+        addDefaultFunctionMenu(61, pMenuLog, "物料日志", "taskLog", "neolight/taskLog/index", "education",DEFAULT_SHOW_MENU);
+        addDefaultFunctionMenu(62, pMenuLog, "消息查询", "message", "neolight/message/index", "messagefind",DEFAULT_SHOW_MENU);
+        addDefaultFunctionMenu(63, pMenuLog, "接口异常", "interfaceException", "neolight/interfaceException/index", "messagefind");
-        //MSD管理：MSD库存.MSD追溯性.MSD设置
-        Menu msd = Menu.CreatePMenu("MSD管理", 2, "msd", "MSD",null);
+        //报表：出入库、库存
-        addDefaultFunctionMenu(21, msd, "MSD库存", "msdManage", "neolight/msdManage/index", "MSDManager");
+        Menu pMenuReport = Menu.CreatePMenu("报表", 5, "report","inOutData",null);
-        addDefaultFunctionMenu(22, msd, "MSD追溯性", "msdData", "neolight/msdData/index", "MSDData");
+        addDefaultFunctionMenu(9, pMenuReport, "呆滞物料", "sluggishMaterials", "system/sluggishMaterials/index",  "sMaterial",DEFAULT_SHOW_MENU);
-        addDefaultFunctionMenu(23, msd, "MSD设置", "msdSetting", "neolight/msdSetting/index",  "MSDSet");
+        addDefaultFunctionMenu(11, pMenuReport,"过期物料", "expireMaterials", "system/expireMaterials/index",  "sMaterial",DEFAULT_SHOW_MENU);
+        addDefaultFunctionMenu(71, pMenuReport, "出入库", "inOutData", "neolight/inOutData/index", "outPut",DEFAULT_SHOW_MENU);
+        addDefaultFunctionMenu(72, pMenuReport,"库存", "inventory", "neolight/inventory/index", "inventory",DEFAULT_SHOW_MENU);
+        addDefaultFunctionMenu(73, pMenuReport,"温湿度", "humiture", "humiture/humitureReport/index", "humiture",DEFAULT_SHOW_MENU);
+        //物联网：共享文件夹
+        Menu pMenuWulian = Menu.CreatePMenu("物联网", 6, "internet", "interMenu",null);
+        addDefaultFunctionMenu(91,pMenuWulian, "共享文件夹", "orderSetting", "system/orderSetting/index", "sysSet",DEFAULT_SHOW_MENU);
        //锡膏管理:设备概览.库存.追溯性.设置
@@ -157,61 +170,53 @@ public class MenuInit {
        addDefaultFunctionMenu(34,solderPaste, "设置", "solderPasteSetting", "neolight/solderPasteSetting/index","system",SP_SHOW_MENU);
-        //档案管理：元器件
-        Menu pMenuWl = Menu.CreatePMenu("档案管理", 4, "materiel ", "BOM",null);
-        addDefaultFunctionMenu(41, pMenuWl,"元器件","componentParts", "parts/component/index","server",DEFAULT_SHOW_MENU);
        //条形码:条码管理,条码设置
-        Menu pMenuBarcode = Menu.CreatePMenu("条形码", 5, "barcodes ", "barcodeMenu",null);
+        Menu pMenuBarcode = Menu.CreatePMenu("条形码", 200, "barcodes ", "barcodeMenu",null);
        addDefaultFunctionMenu(51,pMenuBarcode, "条码管理", "barcode", "barcode/barcode/index","chart",DEFAULT_SHOW_MENU);
        addDefaultFunctionMenu(52, pMenuBarcode, "条码设置","barcodeSetting", "system/barcodeSetting/index", "barcode",DEFAULT_SHOW_MENU);
-        //日志管理：物料日志
-        Menu pMenuLog = Menu.CreatePMenu("日志管理", 6, "log","log",null);
-        addDefaultFunctionMenu(61, pMenuLog, "物料日志", "taskLog", "neolight/taskLog/index", "education",DEFAULT_SHOW_MENU);
-        addDefaultFunctionMenu(62, pMenuLog, "消息查询", "message", "neolight/message/index", "messagefind");
-        addDefaultFunctionMenu(63, pMenuLog, "接口异常", "interfaceException", "neolight/interfaceException/index", "messagefind");
-        //报表：出入库、库存
+        //档案管理：元器件
-        Menu pMenuReport = Menu.CreatePMenu("报表", 7, "report","inOutData",null);
+        Menu pMenuWl = Menu.CreatePMenu("档案管理", 201, "materiel ", "BOM",null);
-        addDefaultFunctionMenu(70, pMenuReport, "锁定物料", "lockMaterials", "system/lockMaterials/index",  "lockMaterials");
+        addDefaultFunctionMenu(41, pMenuWl,"元器件","componentParts", "parts/component/index","server",DEFAULT_SHOW_MENU);
-        addDefaultFunctionMenu(71, pMenuReport, "出入库", "inOutData", "neolight/inOutData/index", "outPut");
-        addDefaultFunctionMenu(72, pMenuReport,"库存", "inventory", "neolight/inventory/index", "inventory");
-        addDefaultFunctionMenu(73, pMenuReport,"温湿度", "humiture", "humiture/humitureReport/index", "humiture");
        //可观测性：物料追踪
-        Menu guanceMenu = Menu.CreatePMenu("可观测性", 8, "observability", "scanKey",null);
+        Menu guanceMenu = Menu.CreatePMenu("可观测性", 202, "observability", "scanKey",null);
        addDefaultFunctionMenu(81,guanceMenu, "物料追踪", "materialChart", "neolight/materialChart/index", "maChart");
-        //物联网：共享文件夹
-        Menu pMenuWulian = Menu.CreatePMenu("物联网", 9, "internet", "interMenu",null);
-        addDefaultFunctionMenu(91,pMenuWulian, "共享文件夹", "orderSetting", "system/orderSetting/index", "sysSet");
        //设置：料仓管理，菜单管理
-        Menu poutSet = Menu.CreatePMenu("设置", 10, "system","system",null);
+        Menu poutSet = Menu.CreatePMenu("设置", 203, "system","system",null);
        addDefaultFunctionMenu(101, poutSet, "设备管理", "bunker", "storage/storage/index", "database",DEFAULT_SHOW_MENU);
        addDefaultFunctionMenu(102,poutSet, "库位管理", "storagePos", "storagePos/storagePos/index", "tree-table",DEFAULT_SHOW_MENU);
        addDefaultFunctionMenu(103, poutSet, "菜单管理", "menu", "system/menu/index", "menu");
 //        Menu sysSetting = new Menu(, "barcode", "条码设置", "barcodeSetting", "system/barcodeSetting/index", "database");
 //        Menu outSet = new Menu(, "outSetting", "出库策略", "outSetting", "system/outSetting/index", "outSet");
-        addDefaultFunctionMenu(104,poutSet, "系统设置", "sysSetting", "system/sysSetting/index", "sysSet");
+        addDefaultFunctionMenu(104,poutSet, "系统设置", "sysSetting", "system/sysSetting/index", "sysSet",DEFAULT_SHOW_MENU);
        addDefaultFunctionMenu(105,poutSet, "资源翻译", "translation", "system/translation/index", "translation");
 //        Menu orderSet = new Menu(, "orderSetting", "工单设置", "orderSetting", "system/orderSetting/index", "sysSet");
        addDefaultFunctionMenu(106,poutSet, "料架设置", "shelfSetting", "system/shelfSetting/index", "translation");
+        //MSD管理：MSD库存.MSD追溯性.MSD设置
+        Menu msd = Menu.CreatePMenu("MSD管理", 204, "msd", "MSD",null);
+        addDefaultFunctionMenu(21, msd, "MSD库存", "msdManage", "neolight/msdManage/index", "MSDManager");
+        addDefaultFunctionMenu(22, msd, "MSD追溯性", "msdData", "neolight/msdData/index", "MSDData");
+        addDefaultFunctionMenu(23, msd, "MSD设置", "msdSetting", "neolight/msdSetting/index",  "MSDSet",DEFAULT_SHOW_MENU);
        //用户管理：用户管理，角色管理
-        Menu pMenuUser = Menu.CreatePMenu("用户管理", 11, "userManager", "Steve-Jobs", null);
+        Menu pMenuUser = Menu.CreatePMenu("用户管理", 205, "userManager", "Steve-Jobs", null);
        addDefaultFunctionMenu(111, pMenuUser,"用户管理", "peoples", "system/user/index", "peoples",DEFAULT_SHOW_MENU);
        addDefaultFunctionMenu(112, pMenuUser,"角色管理", "role", "system/role/index", "role",DEFAULT_SHOW_MENU);
        //条形码:条码管理,条码设置
-        Menu selfAudit = Menu.CreatePMenu("盘点管理", 12, "selfAuditManagerment", "selfAudit",null);
+        Menu selfAudit = Menu.CreatePMenu("盘点管理", 206, "selfAuditManagerment", "selfAudit",null);
        addDefaultFunctionMenu(121,selfAudit, "盘点", "selfAudit", "system/selfAudit/index","selfAudit");
        addDefaultFunctionMenu(122, selfAudit, "盘点记录","selfAuditLog", "system/selfAuditLog/index", "selfAuditLog");
        Menu helpAbout = Menu.CreatePMenu("帮助", 9999, "help", "help",null);
        addDefaultFunctionMenu(99991, helpAbout, "说明书", "instruction", "system/instruction/index","aboutBook");
-        addDefaultFunctionMenu(99992, helpAbout, "关于","about", "system/about/index","message",DEFAULT_SHOW_MENU);
+        addDefaultFunctionMenu(99992, helpAbout, "关于","about", "system/about/index","message");
        return allMenuMap;
    }

--- a/src/main/java/com/neotel/smfcore/custom/micron1053/Micron1053Menu.java
查看文件 @bdd3cf5
+++ b/src/main/java/com/neotel/smfcore/custom/micron1053/Micron1053Menu.java
查看文件 @bdd3cf5
@@ -27,13 +27,15 @@ public class Micron1053Menu {
        String menuLabel = "1053";
+        //Status
+        MenuInit.addMenu(menuLabel,null,2,  "Status","status", "state/state/index","state");
        //ML5
        Menu mL5 = Menu.CreatePMenu("ML5", 13, "mlFive", "miFive",null);
+        MenuInit.addMenu(menuLabel,mL5,130, "ML5","miFive", "mlFive/miFive/index","miFive");
        MenuInit.addMenu(menuLabel,mL5, 131, "ML5 DISPATCH SELECTION", "ML5DispatchSelect", "mlFive/dispatchSelect/index","dispatchSelection");
        MenuInit.addMenu(menuLabel,mL5,132, "ML5 LOADING SELECTION","ML5Loading", "mlFive/LoadingSelect/index","loadingSelection");
        MenuInit.addMenu(menuLabel,mL5,133, "DISPATCH STATUS", "dispatchStatus", "mlFive/dispatchStatus/index","dispatchStatus");
        MenuInit.addMenu(menuLabel,mL5,134,"LOADING STATUS","loadingStatus", "mlFive/loadingStatus/index","loadingStatus");
-        MenuInit.addMenu(menuLabel,mL5,135, "ML5","miFive", "mlFive/miFive/index","miFive");
        //status菜单
 //        Menu status = Menu.CreatePMenu("Status", 14, "status1053", "state",null);
@@ -56,16 +58,12 @@ public class Micron1053Menu {
        MenuInit.addMenu(menuLabel,null,162,  "MI1","ml", "miOne/miOne/index","miOne");
        //MI2
        MenuInit.addMenu(menuLabel,null,163,  "MI2","ml2", "miOne/miOne/index","miOne");
-        //Status
+        MenuInit.addMenu(menuLabel,null,130, "Shelf Life Mgmt","expSetting", "system/expirationSetting/index","expireSetting");
-        MenuInit.addMenu(menuLabel,null,128,  "Status","status", "state/state/index","state");
 //        //Report
 //        MenuInit.addMenu(menuLabel,null,128,  "Report","reports", "report/reports/index","report");
        //设置管理
        Menu poutSet = Menu.CreatePMenu("设置", 10, "system", "system",null);
-        MenuInit.addMenu(menuLabel,null,166, "Diagnosis","diagnosis", "system/diagnosis/index","diagnosis");
+        MenuInit.addMenu(menuLabel,poutSet,166, "Diagnosis","diagnosis", "system/diagnosis/index","diagnosis");
-        //Help
-        MenuInit.addMenu(menuLabel,null,167, "Help","helps", "help/helps/index","help");
-        MenuInit.addMenu(menuLabel,null,168, "Shelf Life Mgmt","expSetting", "system/expirationSetting/index","expireSetting");
        //报表：出入库、库存
        Menu pMenuReport = Menu.CreatePMenu("报表", 7, "report","inOutData",null);
        MenuInit.addMenu(menuLabel,pMenuReport,201, "料盘日志","trayLog", "report/trayLog/index","trayLog");
@@ -74,6 +72,8 @@ public class Micron1053Menu {
        MenuInit.addMenu(menuLabel,pMenuReport,204, "ErrorReport","errorReport", "report/errorReport/index","errorReport");
        MenuInit.addMenu(menuLabel,pMenuReport,205, "EventLog","eventLog", "report/eventLog/index","eventlog");
+        //Help
+        MenuInit.addMenu(menuLabel,null,999, "Help","helps", "help/helps/index","help");
        String apiName = smfApi.getApiName();
        if(Strings.isNotBlank(apiName) && apiName.equals(menuLabel)){
            menuInit.showMenu(apiName);