料仓增加SMD_XLC类型，菜单增加料盒操作

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

@@ -192,10 +192,11 @@ public class DataInitManager {
         Menu celueOut = new Menu(new ArrayList<Menu>(), 1, "tacticsOuput", "策略出库", 1, "tacticsOuput", "neolight/tacticsOuput/index", "", 0, "workOrder");
         Menu groupOut = new Menu(new ArrayList<Menu>(), 1, "labelOuput", "物料分组", 1, "labelOuput", "neolight/labelOuput/index", "", 0, "export1");
         Menu manualOut = new Menu(new ArrayList<Menu>(), 1, "manualOut", "手动出库", 1, "manualOut", "neolight/manualOut/index", "", 0, "export1");
+        Menu materialBox = new Menu(new ArrayList<Menu>(), 1, "materialBox", "料盒操作", 1, "materialBox", "neolight/materialBox/index", "", 0, "export1");
         celueOut.setHidden(true);
         groupOut.setHidden(true);
         manualOut.setHidden(true);
-        menus.addAll(createMenus(poutOut, menuOrder, menuOut,celueOut,groupOut,manualOut));
+        menus.addAll(createMenus(poutOut, menuOrder, menuOut,celueOut,groupOut,manualOut,materialBox));
 
         //设置：料仓管理，菜单管理
         Menu poutSet = Menu.CreatePMenu("设置", 30, "system", 2, "system");

src/main/java/com/neotel/smfcore/core/device/bean/StatusBean.java

@@ -136,10 +136,10 @@ public class StatusBean {
     }
 
     /**
-     * 是否超时(3秒)
+     * 是否超时(10秒)
      */
     public boolean timeOut(){
-        return System.currentTimeMillis() - time > 10 * 1000;
+        return (System.currentTimeMillis() - time) >( 10 * 1000);
     }
 
     /**

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

+package com.neotel.smfcore.core.device.handler.impl;
+
+import com.neotel.smfcore.core.device.api.IOpAuthApi;
+import com.neotel.smfcore.core.storage.enums.DeviceType;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+@Service
+@Slf4j
+public class LineBoxHandler extends  BaseDeviceHandler {
+    public LineBoxHandler(List<IOpAuthApi> apiList) {
+        super(apiList);
+    }
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.LINE;
+    }
+}

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

+package com.neotel.smfcore.core.device.handler.impl;
+
+import com.google.common.base.Strings;
+import com.neotel.smfcore.common.utils.StorageConstants;
+import com.neotel.smfcore.core.device.api.IOpAuthApi;
+import com.neotel.smfcore.core.device.bean.BoxStatusBean;
+import com.neotel.smfcore.core.device.bean.StatusBean;
+import com.neotel.smfcore.core.device.enums.BOX_STATUS;
+import com.neotel.smfcore.core.device.enums.OP;
+import com.neotel.smfcore.core.device.enums.OP_STATUS;
+import com.neotel.smfcore.core.storage.enums.DeviceType;
+import com.neotel.smfcore.core.storage.service.po.StoragePos;
+import com.neotel.smfcore.core.system.service.po.DataLog;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Service
+@Slf4j
+public class XLCBoxHandler extends BaseDeviceHandler {
+    public XLCBoxHandler(List<IOpAuthApi> apiList) {
+        super(apiList);
+    }
+    /**
+     * 当前出入库操作的库位(key为cid, value为当前执行的任务)
+     */
+    private Map<String,DataLog> operateTaskMap = new ConcurrentHashMap<>();
+
+
+    /**
+     * 获取当前正在执行的任务
+     */
+    public DataLog getCurrentTask(String cid){
+        return operateTaskMap.get(cid);
+    }
+
+    /**
+     * 更新或清理(task为null)当前正在执行的任务
+     */
+    public void updateCurrentTask(String cid, DataLog task){
+        if(task == null){
+            operateTaskMap.remove(cid);
+        }else{
+            operateTaskMap.put(cid, task);
+        }
+    }
+    @Override
+    public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
+        handleMsg(statusBean);
+        statusBean = saveAlarmAndHumidity(statusBean);
+        statusBean = handleXLCStatusBean(statusBean);
+        statusBean = handleInOutFinished(statusBean);
+        StatusBean humidityResult = handleHumidity(statusBean);
+        if(humidityResult != null){
+            return humidityResult;
+        }
+
+
+
+        return statusBean;
+    }
+
+
+    private StatusBean handleXLCStatusBean(StatusBean statusBean){
+        String cid = statusBean.getCid();
+        Collection<DataLog> queueTasks = taskService.getQueueTasks(cid);
+
+        Map<String, BoxStatusBean> statusOfBoxes = statusBean.getBoxStatus();
+        if (statusOfBoxes != null) {
+            for (BoxStatusBean boxStatus : statusOfBoxes.values()) {
+                try {
+                    //出库入库动作完成处理
+                    int status = boxStatus.getStatus();
+                    String posName = boxStatus.getPosId();
+                    if(!Strings.isNullOrEmpty(posName)){//客户端发一次完成之后,会发空的 posName,不需要处理
+                        if (BOX_STATUS.OUT_FINISHED == status) {//出仓完成,设置当前任务
+                            DataLog currentTask = null;
+                            for (DataLog queueTask : queueTasks) {
+                                if(queueTask.isExecuting() && queueTask.getPosName().equals(posName)){
+                                    currentTask = queueTask;
+                                    String doorInfo = statusBean.getFromData("door");
+                                    if(doorInfo == null){
+                                        doorInfo = "1";
+                                    }
+                                    currentTask.setSubSourceId(doorInfo);
+                                    taskService.updateQueueTask(currentTask);
+                                    break;
+                                }
+                            }
+                            DataLog cacheTask = operateTaskMap.get(cid);
+                            if(currentTask != null){
+                                if(cacheTask == null || !cacheTask.getId().equals(currentTask.getId())){
+                                    updateCurrentTask(currentTask.getCid(),currentTask);
+                                }
+                            }
+                        }
+                    }
+                } catch (Exception e) {
+                    log.error("方仓到位时出错",e);
+                }
+            }
+        }
+
+
+        if(statusBean.getStatus() == StorageConstants.STATUS.READY){
+            DataLog currentTask = getCurrentTask(cid);
+            if(currentTask != null){
+                //当前有任务未完成,暂不执行其他任务
+                return statusBean;
+            }
+            for (DataLog task : queueTasks) {
+                if (cid.equals(task.getCid()) && task.isWait()) {
+                    StoragePos pos = storagePosManager.getByPosName(task.getPosName());
+                    if(pos.isExpandPos()){
+                        continue;
+                    }
+
+                    if(task.isPutInTask()){
+                        statusBean.setOp(OP.PUT_IN);
+                        statusBean.addData("door",task.getSubSourceId());
+                    }else if(task.isCheckOutTask()){
+                        statusBean.setOp(OP.CHECKOUT);
+                    }
+                    statusBean.addPosInfo("",pos.getPosName(),pos.getW(),pos.getH(),false);
+
+                    log.info("发送["+task.getType()+"]任务["+pos.getPosName()+"]到客户端door="+task.getSubSourceId());
+                    task.setStatus(OP_STATUS.EXECUTING.name());
+                    taskService.updateQueueTask(task);
+                    return statusBean;
+                }
+            }
+        }
+        return statusBean;
+    }
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.SMD_XLC;
+    }
+}

src/main/java/com/neotel/smfcore/core/storage/enums/DeviceType.java

@@ -89,9 +89,13 @@ public enum DeviceType {
      * 13 SMD-DUO(DUO料仓)
      */
     SMD_DUO("storage.type.smdDuo"),
+    /**
+     * 14 放料箱的方仓
+     */
+    SMD_XLC("storage.type.smdXlc"),
 
     /**
-     * 14 (默认料仓)
+     * 15 (默认料仓)
      */
     DEFAULT("storage.type.default")
     ;