1.菜单修改

2.uid出库,库位上没有料 跳过
3.资源翻译修改

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

@@ -118,10 +118,10 @@ public class MenuInit {
         //AGV看板
         //addDefaultFunctionMenu(1,null,"AGV看板","agvkanban", "agv/agvkanban/index","agv");
 
-        addDefaultFunctionMenu(-1,null,"Neo Ai","neoai","neoai/index","neoai");
+        //addDefaultFunctionMenu(-1,null,"Neo Ai","neoai","neoai/index","neoai");
 
         //Mimo看板
-        addDefaultFunctionMenu(0,null,"SMD BOX MIMO","SMDBOXMIMO", "smdBoxMimo/index","smdMimo");
+        //addDefaultFunctionMenu(0,null,"SMD BOX MIMO","SMDBOXMIMO", "smdBoxMimo/index","smdMimo");
 
         Menu boardMap = Menu.CreatePMenu("仪表盘", 0, "dashBoard", "kanban", null);
 
@@ -134,9 +134,13 @@ public class MenuInit {
         addDefaultFunctionMenu(0, boardMap, "SP仪表盘", "spkanban", "kanban/spkanban/index", "kanban");
 
         //设备看板
-        addDefaultFunctionMenu(1,null,"设备互联","lockMaterial", "lockMaterial/material/index","kanban",DEFAULT_SHOW_MENU);
+        addDefaultFunctionMenu(1,null,"设备互联","lockMaterial", "lockMaterial/material/index","sKanban",DEFAULT_SHOW_MENU);
+
+        Menu selfAudit = Menu.CreatePMenu("盘点管理", 2, "selfAuditManagerment", "selfAudit",null);
+        addDefaultFunctionMenu(121,selfAudit, "盘点", "selfAudit", "system/selfAudit/index","selfAudit");
+        addDefaultFunctionMenu(122, selfAudit, "盘点记录","selfAuditLog", "system/selfAuditLog/index", "selfAuditLog");
         //设备互联
-        addDefaultFunctionMenu(2,null,"设备互联","equipmentView", "neolight/equipmentView/index","sKanban");
+        //addDefaultFunctionMenu(2,null,"设备互联","equipmentView", "neolight/equipmentView/index","sKanban");
 
         //物料管理：工单出库，查找出库（UID出库，PN出库），物料标签，料盒操作，出库策略，工单设置
         Menu poutOut = Menu.CreatePMenu("物料管理", 3, "order", "workOrder", null);
@@ -158,9 +162,7 @@ public class MenuInit {
 //        addDefaultFunctionMenu(11, poutOut, "转储入库", "dumpWarehousing", "system/dumpWarehousing/index", "headIcon");
 //        addDefaultFunctionMenu(12, poutOut, "单盘入库", "singleDiskWarehousing", "system/singleDiskWarehousing/index", "headIcon");
         addDefaultFunctionMenu(13, poutOut, "呆滞物料", "sluggishMaterials", "system/sluggishMaterials/index",  "sMaterial");
-        addDefaultFunctionMenu(14,poutOut, "安全库存", "safetyInventory", "system/safetyInventory/index", "safeInventory");
-        addDefaultFunctionMenu(15, poutOut,"过期物料", "expireMaterials", "system/expireMaterials/index",  "sMaterial");
-        addDefaultFunctionMenu(16, poutOut,"生成工单", "createOrder", "system/createOrder/index",  "createOrder");
+        //addDefaultFunctionMenu(16, poutOut,"生成工单", "createOrder", "system/createOrder/index",  "createOrder");
         addDefaultFunctionMenu(91,poutOut, "共享文件夹", "orderSetting", "system/orderSetting/index", "sysSet",DEFAULT_SHOW_MENU);
 
 
@@ -204,17 +206,24 @@ public class MenuInit {
         addDefaultFunctionMenu(72, pMenuReport,"库存", "inventory", "neolight/inventory/index", "inventory");
         addDefaultFunctionMenu(73, pMenuReport,"温湿度", "humiture", "humiture/humitureReport/index", "humiture");
         addDefaultFunctionMenu(73, pMenuReport,"温湿度", "spHumiture", "humiture/spHumitureReport/index", "humiture");
-
+        addDefaultFunctionMenu(74,pMenuReport, "安全库存", "safetyInventory", "system/safetyInventory/index", "safeInventory");
+        addDefaultFunctionMenu(75, pMenuReport,"过期物料", "expireMaterials", "system/expireMaterials/index",  "sMaterial");
+        addDefaultFunctionMenu(81,pMenuReport, "物料追踪", "materialChart", "neolight/materialChart/index", "maChart");
         //可观测性：物料追踪
-        Menu guanceMenu = Menu.CreatePMenu("可观测性", 10, "observability", "scanKey",null);
-        addDefaultFunctionMenu(81,guanceMenu, "物料追踪", "materialChart", "neolight/materialChart/index", "maChart");
+        //Menu guanceMenu = Menu.CreatePMenu("可观测性", 10, "observability", "scanKey",null);
+        //addDefaultFunctionMenu(81,guanceMenu, "物料追踪", "materialChart", "neolight/materialChart/index", "maChart");
 
         //物联网：共享文件夹
         //Menu pMenuWulian = Menu.CreatePMenu("物联网", 11, "internet", "interMenu",null);
 
 
+        //用户管理：用户管理，角色管理
+        Menu pMenuUser = Menu.CreatePMenu("用户管理", 12, "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 poutSet = Menu.CreatePMenu("设置", 12, "system","system",null);
+        Menu poutSet = Menu.CreatePMenu("设置", 13, "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");
@@ -225,16 +234,6 @@ public class MenuInit {
 //        Menu orderSet = new Menu(, "orderSetting", "工单设置", "orderSetting", "system/orderSetting/index", "sysSet");
         addDefaultFunctionMenu(106,poutSet, "料架设置", "shelfSetting", "system/shelfSetting/index", "translation",NL_SHOW_MENU);
 
-
-        //用户管理：用户管理，角色管理
-        Menu pMenuUser = Menu.CreatePMenu("用户管理", 13, "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("盘点管理", 14, "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);

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -562,6 +562,13 @@ public class StoragePosController {
 //                throw new ValidateException("位置[" + pid + "]不存在");
                 continue;
             }
+
+            Barcode posBarcode = pos.getBarcode();
+            if (posBarcode == null){
+                log.info(pos.getPosName()+"库位上没有物料,跳过");
+                continue;
+            }
+
             Storage storage = dataCache.getStorageById(pos.getStorageId());
             if (storage == null) {
                 throw new ValidateException("smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"storageId", pos.getStorageId()});

src/main/resources/messages.properties

@@ -375,13 +375,13 @@ smfcore.spbox.expireOut=\u8FC7\u671F\u7269\u6599\u51FA\u5E93
 smfcore.humiture.codetemperature=\u5236\u51B7\u6E29\u5EA6
 smfcore.humiture.ntemperature=\u51B7\u85CF\u6E29\u5EA6
 smfcore.cyclecount.executing=Cycle Count \u6B63\u5728\u6267\u884C
-smfcore.eleckanban=\u7535\u5B50\u770B\u677F
+smfcore.eleckanban=\u4EEA\u8868\u76D82
 smfcore.agv.already.call=\u5DF2\u7ECF\u547C\u53EB
 smfcore.agv.pickup=AGV\u5DF2\u88AB\u53EB\u6765\u53D6\u8D27
 smfcore.agv.dispatch=\u8D27\u7269\u5DF2\u7ECF\u53D1\u9001\u5230\u5B58\u50A8\u7CFB\u7EDF
 smfcore.agv.awaitingInstruction=\u7B49\u5F85\u6307\u793A
 smfcore.agv.operation=AGV\u5728\u8FD0\u884C\u4E2D
-smfcore.boxmimokanban=\u4E91\u6599\u4ED3\u770B\u677F
+smfcore.boxmimokanban=\u4EEA\u8868\u76D81
 smfcore.neoai=Neo Ai
 smfcore.duo.offline=\u8BBE\u5907{0}\u79BB\u7EBF
 smfcore.msg.op.fail=\u64CD\u4F5C\u5931\u8D25
@@ -399,4 +399,6 @@ smfcore.storagePos.layer=\u5C42
 smfcore.storagePos.slot=\u69FD\u4F4D
 smfcore.storagePos.available=\u662F\u5426\u53EF\u7528 
 smfcore.storagePos.yes=\u662F
-smfcore.storagePos.no=\u5426
\ No newline at end of file
+smfcore.storagePos.no=\u5426
+smfcore.dashBoard=\u4EEA\u8868\u76D8
+smfcore.spHumiture=\u6E29\u6E7F\u5EA6
\ No newline at end of file

src/main/resources/messages_en_US.properties

@@ -62,7 +62,7 @@ smfcore.checkNg=checking material is ng:{0}
 smfcore.loadMaterialFinished=Loading material finished: {0}
 smfcore.lockMaterial=EPM
 smfcore.lightGroup=Neo Light Grouping
-smfcore.order=Material Management
+smfcore.order=Material
 smfcore.workOrder=Work Order
 smfcore.workOrderkanban=WO KANBAN 
 smfcore.searchOut=Search
@@ -71,7 +71,7 @@ smfcore.system=System
 smfcore.bunker=Equipment
 smfcore.storagePos=Storage Location
 smfcore.menu=Menu Manager
-smfcore.materiel =Product Info
+smfcore.materiel =Product Info.
 smfcore.componentParts=Component
 smfcore.barcode=MA ID Manager
 smfcore.log=Big Data
@@ -138,7 +138,7 @@ smfcore.shelf.msg.noTask=The operation failed, and the corresponding outgoing ta
 smfcore.shelf.msg.scanPos=Please scan the library code first
 smfcore.shelf.msg.inOk=The operation is successful, please put it into the storage space[{0}]
 smfcore.label.noReel=Material not found for release
-smfcore.msd=MSD Management 
+smfcore.msd=MSD
 smfcore.msdManage=MSD Inventory
 smfcore.msdData=MSD Traceability
 smfcore.msdSetting=MSD Setting
@@ -146,7 +146,7 @@ smfcore.translation=Resource Translation
 smfcore.languageCanotNull=Language type cannot be empty
 smfcore.noLanguageSetAccess=No permission to edit the language
 smfcore.languageCanotRemoveAll=Cannot delete all languages
-smfcore.solderPaste=Solder Paste Management
+smfcore.solderPaste=Solder Paste
 smfcore.solderPasteKanban=Equipment Overview
 smfcore.solderPasteManage=Inventory
 smfcore.solderPasteData=Traceability
@@ -365,21 +365,21 @@ smfcore.spbox.expireOut=Expired solder paste out of storage
 smfcore.humiture.codetemperature=Refrigeration zone temperature
 smfcore.humiture.ntemperature=Return temperature zone temperature
 smfcore.cyclecount.executing=Cycle Count are being executed
-smfcore.eleckanban=DashBoard
+smfcore.eleckanban=Dashboard2
 smfcore.agv.already.call=Already called
 
 smfcore.agv.pickup=AGV has been called to pick up goods
 smfcore.agv.dispatch=Goods dispatched to storage system
 smfcore.agv.awaitingInstruction=Awaiting instruction
 smfcore.agv.operation=AGV is in operation
-smfcore.boxmimokanban=SMD BOX KANBAN
+smfcore.boxmimokanban=Dashboard1
 smfcore.neoai=Neo Ai
 smfcore.duo.offline=Equipment {0} offline
 smfcore.msg.op.fail=failure of an operation
 smfcore.equip.notExist=Device does not exist
 smfcore.order.finished=workorder[{0}] has completed all of its tasks
-smfcore.spkanban=SP Dash Board
-smfcore.neximWorkOrder=Nexim WorkOrder
+smfcore.spkanban=SP Dashboard
+smfcore.neximWorkOrder=Nexim Work Order
 smfcore.storagePos.plateSize=Detected Size
 smfcore.storagePos.w=Diameter
 smfcore.storagePos.h=Thickness 
@@ -390,4 +390,6 @@ smfcore.storagePos.layer=Layer
 smfcore.storagePos.slot=Slot
 smfcore.storagePos.available=Available 
 smfcore.storagePos.yes=Yes
-smfcore.storagePos.no=No
\ No newline at end of file
+smfcore.storagePos.no=No
+smfcore.dashBoard=Dashboard
+smfcore.spHumiture=Temperature & Humidity
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -367,7 +367,7 @@ smfcore.agv.pickup=AGV\u304C\u5546\u54C1\u3092\u53D7\u3051\u53D6\u308B\u305F\u30
 smfcore.agv.dispatch=\u4FDD\u7BA1\u30B7\u30B9\u30C6\u30E0\u306B\u767A\u9001\u3055\u308C\u308B\u5546\u54C1
 smfcore.agv.awaitingInstruction=\u6307\u793A\u5F85\u3061
 smfcore.agv.operation=AGV\u52D5\u4F5C\u4E2D\u3067\u3059
-
+smfcore.eleckanban=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9
 smfcore.boxmimokanban=\u30AF\u30E9\u30A6\u30C9\u5009\u5EAB\u30AB\u30F3\u30D0\u30F3
 smfcore.neoai=Neo Ai
 smfcore.duo.offline=\u8BBE\u5907{0}\u79BB\u7EBF
@@ -386,4 +386,6 @@ smfcore.storagePos.layer=\u5C42
 smfcore.storagePos.slot=\u69FD\u4F4D
 smfcore.storagePos.available=\u5229\u7528\u53EF\u5426 
 smfcore.storagePos.yes=\u662F
-smfcore.storagePos.no=\u5426
\ No newline at end of file
+smfcore.storagePos.no=\u5426
+smfcore.dashBoard=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9
+smfcore.spHumiture=\u6E29\u6E7F\u5EA6
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -367,8 +367,8 @@ smfcore.agv.pickup=AGV\u5DF2\u88AB\u53EB\u6765\u53D6\u8D27
 smfcore.agv.dispatch=\u8D27\u7269\u5DF2\u7ECF\u53D1\u9001\u5230\u5B58\u50A8\u7CFB\u7EDF
 smfcore.agv.awaitingInstruction=\u7B49\u5F85\u6307\u793A
 smfcore.agv.operation=AGV\u5728\u8FD0\u884C\u4E2D
-
-smfcore.boxmimokanban=\u4E91\u6599\u4ED3\u770B\u677F
+smfcore.eleckanban=\u4EEA\u8868\u76D82
+smfcore.boxmimokanban=\u4EEA\u8868\u76D81
 smfcore.neoai=Neo Ai
 smfcore.duo.offline=\u8BBE\u5907{0}\u79BB\u7EBF
 smfcore.msg.op.fail=\u64CD\u4F5C\u5931\u8D25
@@ -386,4 +386,6 @@ smfcore.storagePos.layer=\u5C42
 smfcore.storagePos.slot=\u69FD\u4F4D
 smfcore.storagePos.available=\u662F\u5426\u53EF\u7528
 smfcore.storagePos.yes=\u662F
-smfcore.storagePos.no=\u5426 
\ No newline at end of file
+smfcore.storagePos.no=\u5426 
+smfcore.dashBoard=\u4EEA\u8868\u76D8
+smfcore.spHumiture=\u6E29\u6E7F\u5EA6
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -367,8 +367,8 @@ smfcore.agv.pickup=AGV\u5DF2\u88AB\u53EB\u4F86\u53D6\u8CA8
 smfcore.agv.dispatch=\u8CA8\u7269\u767C\u9001\u5230\u5B58\u5132\u7CFB\u7D71
 smfcore.agv.awaitingInstruction=\u7B49\u5F85\u6307\u793A
 smfcore.agv.operation=AGV\u6B63\u5728\u904B\u884C
-
-smfcore.boxmimokanban=\u96F2\u6599\u5009\u770B\u677F
+smfcore.eleckanban=\u4EEA\u8868\u76D82
+smfcore.boxmimokanban=\u4EEA\u8868\u76D81
 smfcore.neoai=Neo Ai
 smfcore.duo.offline=\u8A2D\u5099{0}\u96E2\u7DDA
 smfcore.msg.op.fail=\u64CD\u4F5C\u5931\u6557
@@ -386,4 +386,6 @@ smfcore.storagePos.layer=\u5C64
 smfcore.storagePos.slot=\u69FD\u4F4D
 smfcore.storagePos.available=\u662F\u5426\u53EF\u7528
 smfcore.storagePos.yes=\u662F
-smfcore.storagePos.no=\u5426 
\ No newline at end of file
+smfcore.storagePos.no=\u5426 
+smfcore.dashBoard=SP\u5100\u9336\u76E4
+smfcore.spHumiture=\u6E29\u6E7F\u5EA6
\ No newline at end of file