增加DUO料仓

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

+package com.neotel.smfcore.core.device.handler.impl;
+
+import com.neotel.smfcore.core.storage.enums.DeviceType;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "DUO料仓")
+@RestController
+@Slf4j
+public class DUOBoxHandler extends XLRBoxHandler{
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.SMD_DUO;
+    }
+}

src/main/java/com/neotel/smfcore/custom/micron1053/Micron1053Menu.java

@@ -36,7 +36,7 @@ public class Micron1053Menu {
         MenuInit.addMenu(menuLabel,mL5,132, "ML5 LOADING SELECTION","ML5Loading", "mlFive/LoadingSelect/index","loadingSelection");
         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,133, "DISPATCH STATUS", "dispatchStatus", "mlFive/dispatchStatus/index","dispatchStatus");
         MenuInit.addMenu(menuLabel,mL5,134,"LOADING STATUS","loadingStatus", "mlFive/loadingStatus/index","loadingStatus");
         MenuInit.addMenu(menuLabel,mL5,134,"LOADING STATUS","loadingStatus", "mlFive/loadingStatus/index","loadingStatus");
-
+        MenuInit.addMenu(menuLabel,mL5,136,"ML5S Dispatch","mlFivesDispatch", "mlFives/dispatch/index","dispatch");
         //status菜单
         //status菜单
 //        Menu status = Menu.CreatePMenu("Status", 14, "status1053", "state",null);
 //        Menu status = Menu.CreatePMenu("Status", 14, "status1053", "state",null);
 //        MenuInit.addMenu(menuLabel,status,140, "Equipment Status","statePage", "state/state/index","statePage");
 //        MenuInit.addMenu(menuLabel,status,140, "Equipment Status","statePage", "state/state/index","statePage");

src/main/java/com/neotel/smfcore/custom/micron1053/loading/LoadingController.java

@@ -97,7 +97,7 @@ public class LoadingController {
         InList inList=loadingUtil.getInlist();
         InList inList=loadingUtil.getInlist();
         if(inList==null){
         if(inList==null){
             LoadingInfo loadingInfo=dataCache.getCache(Constants.CACHE_LOADING);
             LoadingInfo loadingInfo=dataCache.getCache(Constants.CACHE_LOADING);
-            if(loadingInfo==null&&ObjectUtil.isNotEmpty(loadingInfo.getOperationId())&&(!loadingInfo.getMode().equals(mode))) {
+            if(loadingInfo!=null&&ObjectUtil.isNotEmpty(loadingInfo.getOperationId())&&(!loadingInfo.getMode().equals(mode))) {
                 return ResultBean.newErrorResult(9, "smfcore.micron.modeError",   loadingInfo.getMode() + " Loading 未完成", new String[]{loadingInfo.getMode()});
                 return ResultBean.newErrorResult(9, "smfcore.micron.modeError",   loadingInfo.getMode() + " Loading 未完成", new String[]{loadingInfo.getMode()});
             }
             }
             return ResultBean.newErrorResult(-1,"smfcore.micron.nodata","未找到信息");
             return ResultBean.newErrorResult(-1,"smfcore.micron.nodata","未找到信息");