diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java index 36c8fbb..04268cb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java @@ -102,9 +102,9 @@ public class MydoJobServiceImpl implements IMydoJobService mydoJobMapper.insertHistory(jobId); //当执行任务的【删除】操作时(特殊场景需要手动处理异常导致不需要入库时,此时不需要向回传异常) // 此处顺便处理对应任务号生成的堆垛机执行队列,省去sql直接表中删记录的操作 - if (ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByTaskNo(jobId) != null) { - MydoJob mydoJob = selectMydoJobByJobId(jobId); - ddjDeviceExecutionQueueService.deleteDdjDeviceExecutionQueueByTaskNo(mydoJob.getTaskNo()); + String taskNo = selectMydoJobByJobId(jobId).getTaskNo(); + if (ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByTaskNo(taskNo) != null) { + ddjDeviceExecutionQueueService.deleteDdjDeviceExecutionQueueByTaskNo(taskNo); } } diff --git a/ruoyi-ui/src/views/job/mydoJob/index.vue b/ruoyi-ui/src/views/job/mydoJob/index.vue index c9208b3..1d84202 100644 --- a/ruoyi-ui/src/views/job/mydoJob/index.vue +++ b/ruoyi-ui/src/views/job/mydoJob/index.vue @@ -116,9 +116,13 @@ - 手动完成 + + 手动作废 + 入库重新下发