From 05335db3fe00ae8a6752f2ff0c8a93d93270177b Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Tue, 16 Sep 2025 15:27:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=BD=9C=E4=B8=9A=20?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E4=BD=9C=E5=BA=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MydoJobServiceImpl.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 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 3e99653..12c44c9 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 @@ -168,19 +168,22 @@ public class MydoJobServiceImpl implements IMydoJobService { String jobId = mydoJob.getJobId(); MydoJob job = selectMydoJobByJobId(jobId); if (job == null) { - return AjaxResult.warn(MessageUtils.message("warn.message")); + return AjaxResult.warn("任务不存在"); } if (!"1".equals(job.getStatus())) { - return AjaxResult.warn(MessageUtils.message("warn.message1")); + return AjaxResult.warn("只能作废未开始的任务"); } - if ("1".equals(job.getInOrOut()) || "4".equals(job.getInOrOut())) { + if ("1".equals(job.getInOrOut())) { mydoJob.setStatus("5"); updateMydoJob(mydoJob); + //修改货位状态 + BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(job.getCargoSpaceId()); + basCargoSpace.setStatus("1"); + basCargoSpaceService.updateBasCargoSpace(basCargoSpace); //插入历史表 insertHistory(mydoJob.getJobId()); - - } else { + } else if ("2".equals(job.getInOrOut())|| "3".equals(job.getInOrOut())){ MydoJobDetail param = new MydoJobDetail(); param.setJobId(jobId); List mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(param); @@ -206,11 +209,8 @@ public class MydoJobServiceImpl implements IMydoJobService { } //通知wcs AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo()); - if (ajaxResult.isSuccess()) { - return AjaxResult.success(); - } else { - throw new RuntimeException(Convert.toStr(ajaxResult.get("msg"))); - } + log.info("取消任务结果：{}", ajaxResult); + return AjaxResult.success(); } /**