From 71d7efb9efc8bf63bfd3f3b66becf3ba03ea21f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com>
Date: Fri, 31 Oct 2025 09:13:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mydojob/service/impl/MydoJobServiceImpl.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
index 2cb4135..17c421f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
@@ -455,7 +455,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
                 MydoJob job = selectMydoJobByJobId(jobId);
                 if (job == null) {
                     log.error("任务不存在");
-                    return AjaxResult.error(MessageUtils.message("error.message28"));
+                    return AjaxResult.error(job.getTrayCode()+"该托盘任务不存在");
                 }
                 MydoJobDetail mydoJobDetail = new MydoJobDetail();
                 mydoJobDetail.setJobId(jobId);
@@ -489,12 +489,12 @@ public class MydoJobServiceImpl implements IMydoJobService {
                 updateMydoJob(job);
                 insertHistory(jobId);
                 //通知wcs
-//                AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
-//                if (ajaxResult.isSuccess()){
-//                    return AjaxResult.success();
-//                }else {
-//                    throw new RuntimeException(Convert.toStr(ajaxResult.get("msg")));
-//                }
+                AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
+                if (ajaxResult.isSuccess()){
+                    return AjaxResult.success();
+                }else {
+                    throw new RuntimeException(Convert.toStr(ajaxResult.get("msg")));
+                }
             }
 
         } catch (Exception e) {