1

myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java

@@ -741,7 +741,17 @@ public class TaskService implements ITaskService {
         }
         return false;
     }
-
+    public boolean hasNowExeTask(String cid, int type) {
+        for (DataLog task : taskMap.values()) {
+            if (task.isCancel() || task.isFinished() || task.isEnd()) {
+                continue;
+            }
+            if (task.isExecuting() && type == task.getType() && task.getCid().equals(cid)) {
+                return true;
+            }
+        }
+        return false;
+    }
     /**
      * 获取正在执行出库(或入库)的 boxID,用作出入库时分配仓位,防止卡死的问题
      */

myproject/src/main/java/com/myproject/webapp/controller/webService/boxHandler/SmdXlBoxHandler.java

@@ -120,10 +120,10 @@ public class SmdXlBoxHandler {
 //                return statusBean;
 //            }
             //判断如果有执行中的入库任务，直接返回
-            if(taskService.hasExecutingTask(statusBean.getCid(), StorageConstants.OP.CHECKOUT)){
+            if(taskService.hasNowExeTask(statusBean.getCid(), StorageConstants.OP.CHECKOUT)){
                 return statusBean;
             }
-            if(taskService.hasExecutingTask(statusBean.getCid(), StorageConstants.OP.PUT_IN)){
+            if(taskService.hasNowExeTask(statusBean.getCid(), StorageConstants.OP.PUT_IN)){
                 return statusBean;
             }
             for (DataLog task : queueTasks) {