1

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

@@ -624,12 +624,14 @@ public class MicronDispatchController {
                             .filter(obj -> (obj.getRi().equals(barcode.getBarcode()))).collect(Collectors.toList());
                             .filter(obj -> (obj.getRi().equals(barcode.getBarcode()))).collect(Collectors.toList());
                     if (findes.size() > 0) {
                     if (findes.size() > 0) {
                         reelItem = findes.get(0);
                         reelItem = findes.get(0);
+                        selectReelItems.remove(reelItem);
                     }
                     }
                     //如果是之前验证成功的，直接跳过
                     //如果是之前验证成功的，直接跳过
 
 
                     if (reelItem == null) {
                     if (reelItem == null) {
                         reelItem = liteOrderCache.NewSelItem(pos);
                         reelItem = liteOrderCache.NewSelItem(pos);
                     } else if (reelItem.isSuccess() && (!reelItem.getStatus().equalsIgnoreCase(OrderItemStatus.wait))) {
                     } else if (reelItem.isSuccess() && (!reelItem.getStatus().equalsIgnoreCase(OrderItemStatus.wait))) {
+                        selectReelItems.add(reelItem);
                         continue;
                         continue;
                     }
                     }
 
 
@@ -825,6 +827,24 @@ 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();
             List<DataLog> allTask = taskService.getAllTasks();
             for (DataLog task : allTask
             for (DataLog task : allTask