中止修改

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

@@ -635,37 +635,46 @@ private IStoragePosManager storagePosManager;
         String mode = params.get("mode").toString();
         log.info(" abort :mode=" + mode);
         LiteOrder order = getOrderByMode(mode);
-        if (order == null) {
+
+        TaskDto taskDto = getTaskDtoByMode(mode);
+        if (taskDto == null) {
+
             return ResultBean.newErrorResult(-1, "smfcore.micron.operationFailure", "操作失败");
         }
-        List<LiteOrderItem> liteOrderItemList = order.getOrderItems();
-        List<LiteOrderItem> newList = new ArrayList<>();
+        if (order != null) {
+            List<LiteOrderItem> liteOrderItemList = order.getOrderItems();
+            List<LiteOrderItem> newList = new ArrayList<>();
 
-        for (LiteOrderItem orderItem :
-                liteOrderItemList) {
-            if (orderItem.getStatus() == OrderItemStatus.notify_fail) {
+            for (LiteOrderItem orderItem :
+                    liteOrderItemList) {
+                if (orderItem.getStatus() == OrderItemStatus.notify_fail) {
 
-                List<DataLog> dataLogList = dataLogManager.findByQuery(new Query(Criteria.where("subSourceId").is(orderItem.getId())));
+                    List<DataLog> dataLogList = dataLogManager.findByQuery(new Query(Criteria.where("subSourceId").is(orderItem.getId())));
 
-                //如果任务未结束，结束任务
-                for (DataLog dataLog : dataLogList
-                ) {
-                    if (dataLog.isExecuting()) {
+                    //如果任务未结束，结束任务
+                    for (DataLog dataLog : dataLogList
+                    ) {
+                        if (dataLog.isExecuting()) {
 
-                        taskService.cancelTask(dataLog.getId());
-                        log.info("abort 终止出库,mode=" + mode + ",取消正在执行的出库任务：barcode=" + dataLog.getBarcode() + ",posName=" + dataLog.getPosName());
+                            taskService.cancelTask(dataLog.getId());
+                            log.info("abort 终止出库,mode=" + mode + ",取消正在执行的出库任务：barcode=" + dataLog.getBarcode() + ",posName=" + dataLog.getPosName());
+                        }
                     }
+                    orderItem.setStatus(OrderItemStatus.cancel);
+                    orderItem = liteOrderItemManager.save(orderItem);
+                    newList.add(orderItem);
+                    log.info(" abort :barcode=[" + orderItem.getPn() + "] 取消出库任务");
                 }
-                orderItem.setStatus(OrderItemStatus.cancel);
-                orderItem = liteOrderItemManager.save(orderItem);
-                newList.add(orderItem);
-                log.info(" abort :barcode=[" + orderItem.getPn() + "] 取消出库任务");
             }
-        }
 
-        log.info("abort 终止出库,mode=" + mode + ",取消正在执行的出库任务：关闭工单=" + order.getOrderNo());
-        CloseOrder(order);
+            log.info("abort 终止出库,mode=" + mode + ",取消正在执行的出库任务：关闭工单=" + order.getOrderNo());
+            CloseOrder(order);
+        }else {
 
+            String key = Constants.CACHE_DISPATCH +mode;
+            log.info("abort  mode=" + mode + " 清空 key=" + key + " 的cache");
+            dataCache.updateCache(key, "");
+        }
         return ResultBean.newOkResult("");
     }