From 014a0b830b1b2d2d5d6b2f02da58bce7b2b53061 Mon Sep 17 00:00:00 2001
From: lsymicc <e003914@163.com>
Date: Sat, 9 May 2026 15:23:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=8B=E5=8A=A8=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E4=BD=9C=E4=B8=9A=E7=9A=84=E9=98=9F=E5=88=97=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java | 6 +++---
 ruoyi-ui/src/views/job/mydoJob/index.vue                    | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

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 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="OuthandFinish"
+        <el-button type="success" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="OuthandFinish"
           v-hasPermi="['job:mydoJob:OuthandFinish']">手动完成</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-check" size="mini" :disabled="multiple"
+          @click="handleDelete(scope.row)" v-hasPermi="['job:mydoJob:remove']">手动作废</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-edit" size="mini" :disabled="single"
           @click="onResendTaskClicked" v-hasPermi="['job:mydoJob:resendTaskToEntrance']">入库重新下发</el-button>