From cf538247e9e079e1b0aac376d2616eb7bc8042c0 Mon Sep 17 00:00:00 2001 From: lsymicc Date: Thu, 11 Jun 2026 16:39:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=90=88=E6=9F=A5=E8=A1=A8=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/common/TaskStatusCode.java | 4 ++-- ruoyi-ui/src/views/job/mydoJob/index.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/common/TaskStatusCode.java b/ruoyi-admin/src/main/java/com/ruoyi/common/TaskStatusCode.java index 2170a75..43587e0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/common/TaskStatusCode.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/common/TaskStatusCode.java @@ -57,7 +57,7 @@ public class TaskStatusCode { public static final String TASK_EP_AGV = "2"; /** - * 任务执行阶段 入口输送机 + * 任务执行阶段 入口输送机输送到位 */ public static final String TASK_EP_SSJ = "3"; @@ -89,7 +89,7 @@ public class TaskStatusCode { /** * 任务执行阶段 任务超时-自动结束当前任务 */ - public static final String TASK_EP_DDJ_FINISH_TIMEOUT = "6_TIMEOUT_FINISH"; + public static final String TASK_EP_DDJ_FINISH_TIMEOUT = "6"; /** * 入库异常 - 放货有货 diff --git a/ruoyi-ui/src/views/job/mydoJob/index.vue b/ruoyi-ui/src/views/job/mydoJob/index.vue index d0c465e..f6fb9b8 100644 --- a/ruoyi-ui/src/views/job/mydoJob/index.vue +++ b/ruoyi-ui/src/views/job/mydoJob/index.vue @@ -285,7 +285,7 @@ export default { getList() { this.loading = true - listMydoJobFinish(this.queryParams).then(response => { + listMydoJobUnion(this.queryParams).then(response => { this.mydoJobList = response.rows this.total = response.total this.loading = false