出库任务未完成,又被入库的问题

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

@@ -449,13 +449,18 @@ public class TaskService implements ITaskService {
             throw new ValidateException("[ " + barcodeSave.getBarcode() + "]已在"+storage.getName()+"["+pos.getPosName()+"]中");
         }
 
+        Collection<DataLog> queueTasks = getQueueTasks();
+        List<DataLog> allTasks = getFinishedTasks();
+        if(!queueTasks.isEmpty()){
+            allTasks.addAll(queueTasks);
+        }
 
-        for (DataLog task : taskMap.values()) {
+        for (DataLog task : allTasks) {
             if(task.isPutInTask()){
                 if(task.getBarcode().equals(barcodeSave.getBarcode())){
                     //同一个条码的入库任务
                     for (Storage storage : storageList) {
-                        if(task.getStorageId().equals(storage.getId())){
+                        if(task.getStorageId().equals(storage.getId()) && task.isPutInTask()){
                             return barcodeSave;
                         }
                     }