增加转储入库，单盘入库，接口异常菜单。提示信息调整

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

@@ -208,6 +208,8 @@ public class DataInitManager {
         Menu  inOrderMenu= new Menu(new ArrayList<Menu>(), 1, "inList", "入库单", 1, "inList", "system/inList/index", "", 0, "headIcon");
         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");
 
 
 
 
         celueOut.setHidden(true);
         celueOut.setHidden(true);
@@ -215,8 +217,10 @@ public class DataInitManager {
         materialBox.setHidden(true);
         materialBox.setHidden(true);
         outSet.setHidden(true);
         outSet.setHidden(true);
         posOut.setHidden(true);
         posOut.setHidden(true);
+//        zhuanruMenu.setHidden(true);
+//        singleMenu.setHidden(true);
 //        orderSet.setHidden(true);
 //        orderSet.setHidden(true);
-        menus.addAll(createMenus(poutOut, menuOrder, out,posOut,groupOut,materialBox,outSet,inOrderMenu,putinMenu));
+        menus.addAll(createMenus(poutOut, menuOrder, out,posOut,groupOut,materialBox,outSet,inOrderMenu,putinMenu,zhuanruMenu,singleMenu));
 
 
         //MSD管理：MSD库存.MSD追溯性.MSD设置
         //MSD管理：MSD库存.MSD追溯性.MSD设置
         Menu msd = Menu.CreatePMenu("MSD管理", 20, "msd", 2, "MSD");
         Menu msd = Menu.CreatePMenu("MSD管理", 20, "msd", 2, "MSD");
@@ -252,7 +256,8 @@ public class DataInitManager {
         Menu pMenuLog = Menu.CreatePMenu("日志管理", 30, "log", 2, "log");
         Menu pMenuLog = Menu.CreatePMenu("日志管理", 30, "log", 2, "log");
         Menu menuLog = new Menu(new ArrayList<Menu>(), 1, "taskLog", "物料日志", 1, "taskLog", "neolight/taskLog/index", "", 0, "education");
         Menu menuLog = new Menu(new ArrayList<Menu>(), 1, "taskLog", "物料日志", 1, "taskLog", "neolight/taskLog/index", "", 0, "education");
         Menu msgLog = new Menu(new ArrayList<Menu>(), 1, "message", "消息查询", 1, "message", "neolight/message/index", "", 0, "messagefind");
         Menu msgLog = new Menu(new ArrayList<Menu>(), 1, "message", "消息查询", 1, "message", "neolight/message/index", "", 0, "messagefind");
-        menus.addAll(createMenus(pMenuLog, menuLog,msgLog));
+        Menu exceptionLog = new Menu(new ArrayList<Menu>(), 1, "interfaceException", "接口异常", 1, "interfaceException", "neolight/interfaceException/index", "", 0, "messagefind");
+        menus.addAll(createMenus(pMenuLog, menuLog,msgLog,exceptionLog));
 
 
         //报表：出入库、库存
         //报表：出入库、库存
         Menu pMenuReport = Menu.CreatePMenu("报表", 30, "report", 2, "inOutData");
         Menu pMenuReport = Menu.CreatePMenu("报表", 30, "report", 2, "inOutData");

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

@@ -178,7 +178,9 @@ public class Component extends BasePo implements Serializable {
             return Float.valueOf(alarmValue).intValue();
             return Float.valueOf(alarmValue).intValue();
         }
         }
     }
     }
-
+    public boolean hasSizeInfo() {
+        return height > 0 && plateSize > 0;
+    }
     /**
     /**
      * 是否是锡膏
      * 是否是锡膏
      */
      */

src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java

@@ -332,7 +332,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
     public Barcode verifyBarcodePutIn(List<Storage> storageList, Barcode barcodeSave) throws ValidateException {
     public Barcode verifyBarcodePutIn(List<Storage> storageList, Barcode barcodeSave) throws ValidateException {
 
 
         if (barcodeSave == null) {
         if (barcodeSave == null) {
-            throw new ValidateException("smfcore.error.barcode.invalid", "条码无效", new String[]{""});
+            throw new ValidateException("条码无效", "无效的条码" );
         }
         }
 
 
         Date expireDate = barcodeSave.getExpireDate();
         Date expireDate = barcodeSave.getExpireDate();

src/main/java/com/neotel/smfcore/core/device/handler/impl/NLPShelfHandler.java

@@ -119,7 +119,7 @@ public class NLPShelfHandler extends BaseDeviceHandler{
 
 
 //        CodeBean codeBean = codeResolve.resolveSingleCode(codeStr);
 //        CodeBean codeBean = codeResolve.resolveSingleCode(codeStr);
         if (barcode == null || barcode.getBarcode() == null) {
         if (barcode == null || barcode.getBarcode() == null) {
-            return ResultBean.newErrorResult(1, "smfcore.error.barcode.invalid", "条码无效");
+            return ResultBean.newErrorResult(1, "smfcore.error.barcode.noValidCode", "无效的条码");
         }
         }
 
 
         String pn = barcode.getPartNumber();
         String pn = barcode.getPartNumber();

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -155,6 +155,9 @@ public class DeviceController {
 
 
                 try {
                 try {
                     Barcode barcode = codeResolve.resolveOneValideBarcode(code);
                     Barcode barcode = codeResolve.resolveOneValideBarcode(code);
+                    if(barcode==null) {
+                        throw new ValidateException("smfcore.error.barcode.invalid", "{0}不是有效的条码", new String[]{code});
+                    }
 
 
                     for (DataLog dataLog : taskService.getQueueTasks()) {
                     for (DataLog dataLog : taskService.getQueueTasks()) {
 //                        if(!dataLog.isPackageReel()){
 //                        if(!dataLog.isPackageReel()){

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -686,7 +686,7 @@ public class TaskService {
     private Barcode verifyBarcodePutIn(List<Storage> storageList, Barcode barcodeSave, String inRFID) throws ValidateException {
     private Barcode verifyBarcodePutIn(List<Storage> storageList, Barcode barcodeSave, String inRFID) throws ValidateException {
 
 
         if (barcodeSave == null) {
         if (barcodeSave == null) {
-            throw new ValidateException("smfcore.error.barcode.invalid", "条码无效");
+            throw new ValidateException("smfcore.error.barcode.noValidCode", "条码无效");
         }
         }
 
 
         StoragePos pos;
         StoragePos pos;

src/main/java/com/neotel/smfcore/hella/handler/HellaServiceHandler.java

@@ -324,7 +324,7 @@ public class HellaServiceHandler extends IoHandlerAdapter implements ITaskListen
         String codeStr = command.getData().toString();
         String codeStr = command.getData().toString();
         CodeBean codeBean = codeResolve.resolveSingleCode(codeStr);
         CodeBean codeBean = codeResolve.resolveSingleCode(codeStr);
         if(codeBean==null||codeBean.getBarcode()==null){
         if(codeBean==null||codeBean.getBarcode()==null){
-            return ResultBean.newErrorResult(1,"smfcore.error.barcode.invalid","条码无效");
+            return ResultBean.newErrorResult(1,"smfcore.error.barcode.invalid","{0}不是有效的条码",new String[]{codeStr});
         }
         }
         if(ObjectUtil.isNotEmpty(codeBean.getErrorCode()) ){
         if(ObjectUtil.isNotEmpty(codeBean.getErrorCode()) ){
             return ResultBean.newErrorResult(1,codeBean.getErrorCode(),codeBean.getError(),codeBean.getParams());
             return ResultBean.newErrorResult(1,codeBean.getErrorCode(),codeBean.getError(),codeBean.getParams());