1.增加超时时间

2.取消任务bug修改

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

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

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

@@ -315,13 +315,6 @@ public class TaskService {
 
 
     private boolean cancelTask(DataLog task) {
     private boolean cancelTask(DataLog task) {
         if (task != null) {
         if (task != null) {
-            //从正在执行和等待列表中移除
-            removeQueueTask(task);
-            task.setStatus(OP_STATUS.CANCEL.name());
-            task.setUpdateDate(new Date());
-            updateFinishedTask(task);
-            log.info("任务[" + task.getId() + "] posName[" + task.getPosName() + "] Reel Id[" + task.getBarcode() + "]取消成功");
-
             //同时进行库位屏蔽
             //同时进行库位屏蔽
             if (task.isExecuting()) {
             if (task.isExecuting()) {
                 String posName = task.getPosName();
                 String posName = task.getPosName();
@@ -343,6 +336,12 @@ public class TaskService {
                 }
                 }
                 ReelLockPosUtil.removeReelLockPosInfo(task.getBarcode());
                 ReelLockPosUtil.removeReelLockPosInfo(task.getBarcode());
             }
             }
+            //从正在执行和等待列表中移除
+            removeQueueTask(task);
+            task.setStatus(OP_STATUS.CANCEL.name());
+            task.setUpdateDate(new Date());
+            updateFinishedTask(task);
+            log.info("任务[" + task.getId() + "] posName[" + task.getPosName() + "] Reel Id[" + task.getBarcode() + "]取消成功");
             return true;
             return true;
         }
         }
         return false;
         return false;