lsy/FT568-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化手动处理作业的队列处理

Browse Source
This commit is contained in:
lsymicc
2026-05-09 15:23:14 +08:00
parent be289748cf
commit 014a0b830b
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java
View File

@@ -102,9 +102,9 @@ public class MydoJobServiceImpl implements IMydoJobService
mydoJobMapper.insertHistory(jobId); mydoJobMapper.insertHistory(jobId);
//当执行任务的【删除】操作时（特殊场景需要手动处理异常导致不需要入库时，此时不需要向回传异常） //当执行任务的【删除】操作时（特殊场景需要手动处理异常导致不需要入库时，此时不需要向回传异常）
// 此处顺便处理对应任务号生成的堆垛机执行队列，省去sql直接表中删记录的操作 // 此处顺便处理对应任务号生成的堆垛机执行队列，省去sql直接表中删记录的操作
if (ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByTaskNo(jobId) != null) { String taskNo = selectMydoJobByJobId(jobId).getTaskNo();
MydoJob mydoJob = selectMydoJobByJobId(jobId); if (ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByTaskNo(taskNo) != null) {
ddjDeviceExecutionQueueService.deleteDdjDeviceExecutionQueueByTaskNo(mydoJob.getTaskNo()); ddjDeviceExecutionQueueService.deleteDdjDeviceExecutionQueueByTaskNo(taskNo);
} }
} }

6
ruoyi-ui/src/views/job/mydoJob/index.vue
View File

@@ -116,9 +116,13 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <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> v-hasPermi="['job:mydoJob:OuthandFinish']">手动完成</el-button>
</el-col> </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-col :span="1.5">
<el-button type="primary" plain icon="el-icon-edit" size="mini" :disabled="single" <el-button type="primary" plain icon="el-icon-edit" size="mini" :disabled="single"
@click="onResendTaskClicked" v-hasPermi="['job:mydoJob:resendTaskToEntrance']">入库重新下发</el-button> @click="onResendTaskClicked" v-hasPermi="['job:mydoJob:resendTaskToEntrance']">入库重新下发</el-button>