部分菜单默认隐藏

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

@@ -196,6 +196,7 @@ public class DataInitManager {
         celueOut.setHidden(true);
         celueOut.setHidden(true);
         groupOut.setHidden(true);
         groupOut.setHidden(true);
         manualOut.setHidden(true);
         manualOut.setHidden(true);
+        materialBox.setHidden(true);
         menus.addAll(createMenus(poutOut, menuOrder, menuOut,celueOut,groupOut,manualOut,materialBox));
         menus.addAll(createMenus(poutOut, menuOrder, menuOut,celueOut,groupOut,manualOut,materialBox));
 
 
         Menu msd = Menu.CreatePMenu("MSD管理", 20, "msd", 2, "MSD");
         Menu msd = Menu.CreatePMenu("MSD管理", 20, "msd", 2, "MSD");
@@ -239,7 +240,8 @@ public class DataInitManager {
 
 
         menuMenu.setHidden(true);
         menuMenu.setHidden(true);
         outSet.setHidden(true);
         outSet.setHidden(true);
-        sysSet.setHidden(true);
+        translationSet.setHidden(true);
+        orderSet.setHidden(true);
         //        menuMenu.setHidden(true);
         //        menuMenu.setHidden(true);
 //        sysSetting.setHidden(true);
 //        sysSetting.setHidden(true);
         menus.addAll(createMenus(poutSet, menuStorage, menuStoragePos, menuMenu, sysSetting,outSet,sysSet,translationSet,orderSet));
         menus.addAll(createMenus(poutSet, menuStorage, menuStoragePos, menuMenu, sysSetting,outSet,sysSet,translationSet,orderSet));
@@ -256,7 +258,7 @@ public class DataInitManager {
         Menu helpAbout = Menu.CreatePMenu("帮助", 30, "help", 2, "help");
         Menu helpAbout = Menu.CreatePMenu("帮助", 30, "help", 2, "help");
         Menu instruMenu = new Menu(new ArrayList<Menu>(), 1, "instruction", "说明书", 1, "instruction", "system/instruction/index", "", 0, "aboutBook");
         Menu instruMenu = new Menu(new ArrayList<Menu>(), 1, "instruction", "说明书", 1, "instruction", "system/instruction/index", "", 0, "aboutBook");
         Menu aboutMenu = new Menu(new ArrayList<Menu>(), 1, "about", "关于", 1, "about", "system/about/index", "", 0, "message");
         Menu aboutMenu = new Menu(new ArrayList<Menu>(), 1, "about", "关于", 1, "about", "system/about/index", "", 0, "message");
-
+        instruMenu.setHidden(true);
         menus.addAll(createMenus(helpAbout,instruMenu,aboutMenu));
         menus.addAll(createMenus(helpAbout,instruMenu,aboutMenu));
 
 
         Set<String> menuIdSet = new HashSet<String>() {};
         Set<String> menuIdSet = new HashSet<String>() {};

src/main/java/com/neotel/smfcore/core/barcode/bean/BarcodeRule.java

@@ -704,6 +704,9 @@ public class BarcodeRule {
         codeStr="TJM210215000771&10446507326&15000&2021-01-18&NAUK11263MAB&&10446&&R107920210124A13OG";
         codeStr="TJM210215000771&10446507326&15000&2021-01-18&NAUK11263MAB&&10446&&R107920210124A13OG";
         rule="RI&PN&QTY&PRODATEyyyy-MM-dd&5&6&7&8&9";
         rule="RI&PN&QTY&PRODATEyyyy-MM-dd&5&6&7&8&9";
 
 
+        codeStr="=7x8=TJM210308001935&10446500253&10000&2021-01-01&Z573226594&&10446&&R05242021030201596";
+        rule="RI&PN&QTY&PRODATEyyyy-MM-dd&5&&6&&7";
+
         BarcodeRule br = BarcodeRule.newRule(rule);
         BarcodeRule br = BarcodeRule.newRule(rule);
         Barcode b = br.toCodeBean(codeStr).getBarcode();
         Barcode b = br.toCodeBean(codeStr).getBarcode();
         if(b != null){
         if(b != null){

src/main/java/com/neotel/smfcore/hella/tcp/HellaTcpClient.java

@@ -128,8 +128,12 @@ public class HellaTcpClient {
     @PreDestroy
     @PreDestroy
     public void stop() {
     public void stop() {
         try {
         try {
-            log.info("stopping the TCP Client");
-            connector.dispose();
+            if(connector!=null){
+                log.info("stopping the TCP Client");
+                connector.dispose();
+            }else{
+                log.info("stopping the TCP Client: connector=null ");
+            }
         } catch (Exception e) {
         } catch (Exception e) {
             log.error("TCP Server stop error:",e);
             log.error("TCP Server stop error:",e);
         }
         }