菜单调整。元器件增加整盘：散盘比。条形码增加是否锁定。

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

@@ -181,22 +181,21 @@ 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");
-        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));
+//        //设备看板
+//        Menu menukanban = new Menu(new ArrayList<Menu>(), 1, "boxkanban", "设备看板", 1, "lockMaterial", "lockMaterial/material/index", "", 0, "kanban");
+//        menus.addAll(createMenus(menukanban));
+
 
         //物料管理：工单出库，查找出库（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, "orderOut");
+//        Menu menuOrder = new Menu(new ArrayList<Menu>(), 1, "workOrder", "工单出库", 1, "workOrder", "neolight/workOrder/index", "", 0, "orderOut");
+        Menu menuOrder = new Menu(new ArrayList<Menu>(), 1, "billworkOrder", "工单", 1, "billworkOrder", "neolight/billworkOrder/index", "", 0, "orderOut");
 
         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, "tacticsOuput");
         out.setChildren(Arrays.asList((new Menu[]{menuOut,celueOut})));
+        Menu reelOut = new Menu(new ArrayList<Menu>(), 1, "reelOut", "料盘出库", 1, "reelOut", "system/reelOut/index", "", 0, "swagger");
 
         Menu posOut = new Menu(new ArrayList<Menu>(), 1, "posOutput", "库位出库", 1, "posOutput", "system/posOutput/index", "", 0, "swagger");
 
@@ -206,7 +205,7 @@ public class DataInitManager {
         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");
         Menu  inOrderMenu= new Menu(new ArrayList<Menu>(), 1, "inList", "入库单", 1, "inList", "system/inList/index", "", 0, "headIcon");
-        Menu  putinMenu= new Menu(new ArrayList<Menu>(), 1, "putIn", "物料入库", 1, "putIn", "system/putIn/index", "", 0, "headIcon");
+//        Menu  putinMenu= new Menu(new ArrayList<Menu>(), 1, "putIn", "物料入库", 1, "putIn", "system/putIn/index", "", 0, "headIcon");
 
         Menu  zhuanruMenu= new Menu(new ArrayList<Menu>(), 1, "dumpWarehousing", "转储入库", 1, "dumpWarehousing", "system/dumpWarehousing/index", "", 0, "headIcon");
         Menu  singleMenu= new Menu(new ArrayList<Menu>(), 1, "singleDiskWarehousing", "单盘入库", 1, "singleDiskWarehousing", "system/singleDiskWarehousing/index", "", 0, "headIcon");
@@ -219,10 +218,10 @@ public class DataInitManager {
         materialBox.setHidden(true);
         outSet.setHidden(true);
         posOut.setHidden(true);
-        zhuanruMenu.setHidden(true);
-        singleMenu.setHidden(true);
+//        zhuanruMenu.setHidden(true);
+//        singleMenu.setHidden(true);
 //        orderSet.setHidden(true);
-        menus.addAll(createMenus(poutOut, menuOrder, out,posOut,groupOut,materialBox,outSet,inOrderMenu,putinMenu,zhuanruMenu,singleMenu,sluggishMaterials,safetyInventory));
+        menus.addAll(createMenus(poutOut, menuOrder, out,reelOut,posOut,groupOut,materialBox,outSet,inOrderMenu,zhuanruMenu,singleMenu,sluggishMaterials,safetyInventory));
 
         //MSD管理：MSD库存.MSD追溯性.MSD设置
         Menu msd = Menu.CreatePMenu("MSD管理", 20, "msd", 2, "MSD");
@@ -262,11 +261,11 @@ public class DataInitManager {
        exceptionLog.setHidden(true);
         menus.addAll(createMenus(pMenuLog, menuLog,msgLog,exceptionLog));
 
-        //报表：出入库、库存
-        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 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");
@@ -274,11 +273,11 @@ public class DataInitManager {
         guanceMenu.setHidden(true);
         menus.addAll(createMenus(guanceMenu, zuizongMenu));
 
-        //物联网：共享文件夹
-        Menu pMenuWulian = Menu.CreatePMenu("物联网", 30, "internet", 2, "interMenu");
-        Menu orderSet = new Menu(new ArrayList<Menu>(), 1, "orderSetting", "共享文件夹", 1, "orderSetting", "system/orderSetting/index", "", 0, "sysSet");
-        orderSet.setHidden(true);
-        menus.addAll(createMenus(pMenuWulian, orderSet));
+//        //物联网：共享文件夹
+//        Menu pMenuWulian = Menu.CreatePMenu("物联网", 30, "internet", 2, "interMenu");
+//        Menu orderSet = new Menu(new ArrayList<Menu>(), 1, "orderSetting", "共享文件夹", 1, "orderSetting", "system/orderSetting/index", "", 0, "sysSet");
+//        orderSet.setHidden(true);
+//        menus.addAll(createMenus(pMenuWulian, orderSet));
 
 
         //设置：料仓管理，菜单管理
@@ -286,18 +285,15 @@ public class DataInitManager {
         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 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 shelfMenu = new Menu(new ArrayList<Menu>(), 1, "shelfSetting", "料架设置", 1, "shelfSetting", "system/shelfSetting/index", "", 0, "translation");
+//        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 shelfMenu = new Menu(new ArrayList<Menu>(), 1, "shelfSetting", "料架设置", 1, "shelfSetting", "system/shelfSetting/index", "", 0, "translation");
 
 //        outSet.setHidden(true);
 //        orderSet.setHidden(true);
          menuMenu.setHidden(true);
-        translationSet.setHidden(true);
-        menus.addAll(createMenus(poutSet, menuStorage, menuStoragePos, menuMenu,sysSet,translationSet,shelfMenu));
+//        translationSet.setHidden(true);
+        menus.addAll(createMenus(poutSet, menuStorage, menuStoragePos, menuMenu));
 
 
         //用户管理：用户管理，角色管理

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/BarcodeDto.java

@@ -241,4 +241,7 @@ public class BarcodeDto implements Serializable {
 
     @ApiModelProperty("第一次入库时间")
     private Date firstPutInDate;
+
+    @ApiModelProperty("是否是冻结的湿敏物料")
+    private boolean lockMsl;
 }

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/ComponentDto.java

@@ -161,4 +161,11 @@ public class ComponentDto implements Serializable {
 
     @ApiModelProperty("呆滞天数，默认0无需处理")
     private int sluggishDay = 0;
+
+
+    @ApiModelProperty("整盘比")
+    private  int wholeReel=0;
+
+    @ApiModelProperty("散盘比")
+    private  int halfReel=0;
 }

src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java

@@ -235,6 +235,13 @@ public class Barcode extends BasePo implements Serializable {
      * 呆滞到期时间（入库时间+呆滞日期）
      */
     private Date sluggishTime;
+
+    /**
+     * 是否是冻结的湿敏物料
+     */
+    private boolean lockMsl;
+
+
     /**
      * 添加相关联条码
      *

src/main/java/com/neotel/smfcore/core/barcode/service/po/Component.java

@@ -167,6 +167,16 @@ public class Component extends BasePo implements Serializable {
     private  boolean MBB=false;
 
     /**
+     * 整盘比
+     */
+    private  int wholeReel=0;
+
+    /**
+     * 散盘比
+     */
+    private  int halfReel=0;
+
+    /**
      * 有效时长(生产日期+此天数为过期日期),设置默认有效期为2年
      */
     private int validDay = 0;

src/main/java/com/neotel/smfcore/core/language/util/MessageUtils.java

@@ -142,7 +142,7 @@ public class MessageUtils {
 //                log.info("获取资源[" + msgKey + "][" + defaultMsg + "][" + lanType + "]失败：未找到code[" + msgKey + "]对应语言[" + lanType + "]");
                 return msg.getMsg();
             }
-            log.info("获取资源[" + msgKey + "][" + defaultMsg + "][" + lanType + "]失败：未找到code[" + msgKey + "]");
+            log.debug("获取资源[" + msgKey + "][" + defaultMsg + "][" + lanType + "]失败：未找到code[" + msgKey + "]");
         }
         return defaultMsg;
     }

修改记录.txt

@@ -30,3 +30,7 @@
 
 20220318：
 安全库存和 呆滞物料功能
+
+
+20220322
+菜单调整。元器件增加整盘：散盘比。条形码增加是否锁定。