连续入库任务未结束bug修改

myproject/src/main/java/com/myproject/webapp/controller/custom803/XLController.java

@@ -291,7 +291,6 @@ public class XLController extends BaseController {
             return ResultBean.newErrorResult(-1 ,e.getMessage());
             return ResultBean.newErrorResult(-1 ,e.getMessage());
         }
         }
     }
     }
-
     /**
     /**
      * 料箱放入库位后，调用极创接口，通知极创料箱已放入
      * 料箱放入库位后，调用极创接口，通知极创料箱已放入
      *
      *
@@ -329,13 +328,7 @@ public class XLController extends BaseController {
             List<DataLog> allTasks = taskService.getFinishedTasks();
             List<DataLog> allTasks = taskService.getFinishedTasks();
             allTasks.addAll(taskService.getQueueTasks());
             allTasks.addAll(taskService.getQueueTasks());
 //            putInFinished
 //            putInFinished
-            DataLog queueTask = null;
-            for (DataLog obj : allTasks) {
-                if (obj.isPutInTask() && obj.getPosName().equals(posName)) {
-                    queueTask = obj;
-                    break;
-                }
-            }
+            DataLog queueTask = GetTask(posName,StorageConstants.OP.PUT_IN);
             if (queueTask == null) {
             if (queueTask == null) {
                 return ResultBean.newErrorResult(404, "料箱放入库位, 通知极创,未找到入库任务");
                 return ResultBean.newErrorResult(404, "料箱放入库位, 通知极创,未找到入库任务");
             }
             }
@@ -615,7 +608,7 @@ public class XLController extends BaseController {
 //                }
 //                }
 //            }
 //            }
 
 
-            DataLog task=GetOutTask(posName);
+            DataLog task=GetTask(posName,StorageConstants.OP.CHECKOUT);
 
 
             if(task==null){
             if(task==null){
                 return ResultBean.newErrorResult(-100,"未找到出库任务");
                 return ResultBean.newErrorResult(-100,"未找到出库任务");
@@ -654,7 +647,7 @@ public class XLController extends BaseController {
         }
         }
     }
     }
 
 
-    private DataLog GetOutTask(String posName){
+    private DataLog GetTask(String posName,int type){
         List<DataLog> allTasks = taskService.getFinishedTasks();
         List<DataLog> allTasks = taskService.getFinishedTasks();
         allTasks.addAll(taskService.getQueueTasks());
         allTasks.addAll(taskService.getQueueTasks());
 
 
@@ -664,7 +657,7 @@ public class XLController extends BaseController {
             if(obj.isCancel()||obj.isFinished()||obj.isEnd()){
             if(obj.isCancel()||obj.isFinished()||obj.isEnd()){
                 continue;
                 continue;
             }
             }
-            if (obj.isCheckOutTask() && obj.getPosName().equals(posName)) {
+            if ((obj.getType()==type) && obj.getPosName().equals(posName)) {
                 queueTask = obj;
                 queueTask = obj;
                 break;
                 break;
             }
             }
@@ -673,7 +666,7 @@ public class XLController extends BaseController {
         if(queueTask==null){
         if(queueTask==null){
             //查找所有的任务列表
             //查找所有的任务列表
             for (DataLog obj : allTasks) {
             for (DataLog obj : allTasks) {
-                if (obj.isCheckOutTask() && obj.getPosName().equals(posName)) {
+                if ((obj.getType()==type) && obj.getPosName().equals(posName)) {
                     queueTask = obj;
                     queueTask = obj;
                     break;
                     break;
                 }
                 }
@@ -750,7 +743,7 @@ public class XLController extends BaseController {
 //                    }
 //                    }
 //                }
 //                }
 //            }
 //            }
-            DataLog queueTask=GetOutTask(posName);
+            DataLog queueTask=GetTask(posName,StorageConstants.OP.CHECKOUT);
             if (queueTask == null) {
             if (queueTask == null) {
                 return ResultBean.newErrorResult(404, "料箱从库位取出, 通知极创,未找到出库任务");
                 return ResultBean.newErrorResult(404, "料箱从库位取出, 通知极创,未找到出库任务");
             }
             }