自动取消任务

src/main/java/com/neotel/smfcore/custom/micron1053/task/MicronDispatchController.java

@@ -827,26 +827,26 @@ public class MicronDispatchController {
             return ResultBean.newErrorResult(-1, "smfcore.micron.operationFailure", "操作失败");
             return ResultBean.newErrorResult(-1, "smfcore.micron.operationFailure", "操作失败");
         }
         }
         if (order != null) {
         if (order != null) {
-//            //自动取消任务
-//            List<DataLog> allTask = taskService.getAllTasks();
-//            for (DataLog task : allTask
-//            ) {
-//                if (OP.CHECKOUT == task.getType() && (!task.isEnd())) {
-//                    //更新工单状态
-//                    String taskSourceName = task.getSourceName();
-//                    if (!Strings.isNullOrEmpty(taskSourceName) && order.getOrderNo().equals(taskSourceName)) {
-//                        if (task.isExecuting()||task.isWait()) {
-//
-//                            log.info("abort 终止出库,mode=" + mode + ",还有正在执行,状态="+task.getStatus()+"的任务：barcode=" + task.getBarcode() + ",posName=" + task.getPosName()+",尝试自动取消任务");
-//                            taskService.cancelTask(task.getId());
-////                            return ResultBean.newErrorResult(-1, "smfcore.order.close.taskNotEnd", "操作失败，工单还有未完成的任务");
-//                        }
-//                    }
-//                }
-//            }
+            //自动取消任务
+            List<DataLog> allTask = taskService.getAllTasks();
+            for (DataLog task : allTask
+            ) {
+                if (OP.CHECKOUT == task.getType() && (!task.isEnd())) {
+                    //更新工单状态
+                    String taskSourceName = task.getSourceName();
+                    if (!Strings.isNullOrEmpty(taskSourceName) && order.getOrderNo().equals(taskSourceName)) {
+                        if (task.isExecuting()||task.isWait()) {
+
+                            log.info("abort 终止出库,mode=" + mode + ",还有正在执行,状态="+task.getStatus()+"的任务：barcode=" + task.getBarcode() + ",posName=" + task.getPosName()+",尝试自动取消任务");
+                            taskService.cancelTask(task.getId());
+//                            return ResultBean.newErrorResult(-1, "smfcore.order.close.taskNotEnd", "操作失败，工单还有未完成的任务");
+                        }
+                    }
+                }
+            }
 
 
             //有任务的工单不能关闭
             //有任务的工单不能关闭
-            List<DataLog> allTask = taskService.getAllTasks();
+              allTask = taskService.getAllTasks();
             for (DataLog task : allTask
             for (DataLog task : allTask
             ) {
             ) {
                 if (OP.CHECKOUT == task.getType() && (!task.isEnd())) {
                 if (OP.CHECKOUT == task.getType() && (!task.isEnd())) {