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) {