入库作业 手动作废

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<MydoJobDetail> 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();
     }
 
     /**