lhq/FT517-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

入库作业 手动作废

Browse Source
This commit is contained in:
liuhanqing
2025-09-16 15:27:28 +08:00
parent 7a87a99e05
commit 05335db3fe
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
View File

@@ -168,19 +168,22 @@ public class MydoJobServiceImpl implements IMydoJobService {
String jobId = mydoJob.getJobId(); String jobId = mydoJob.getJobId();
MydoJob job = selectMydoJobByJobId(jobId); MydoJob job = selectMydoJobByJobId(jobId);
if (job == null) { if (job == null) {
return AjaxResult.warn(MessageUtils.message("warn.message")); return AjaxResult.warn("任务不存在");
} }
if (!"1".equals(job.getStatus())) { 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"); mydoJob.setStatus("5");
updateMydoJob(mydoJob); updateMydoJob(mydoJob);
//修改货位状态
BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(job.getCargoSpaceId());
basCargoSpace.setStatus("1");
basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
//插入历史表 //插入历史表
insertHistory(mydoJob.getJobId()); insertHistory(mydoJob.getJobId());
} else if ("2".equals(job.getInOrOut())|| "3".equals(job.getInOrOut())){
} else {
MydoJobDetail param = new MydoJobDetail(); MydoJobDetail param = new MydoJobDetail();
param.setJobId(jobId); param.setJobId(jobId);
List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(param); List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(param);
@@ -206,11 +209,8 @@ public class MydoJobServiceImpl implements IMydoJobService {
} }
//通知wcs //通知wcs
AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo()); AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
if (ajaxResult.isSuccess()) { log.info("取消任务结果：{}", ajaxResult);
return AjaxResult.success(); return AjaxResult.success();
} else {
throw new RuntimeException(Convert.toStr(ajaxResult.get("msg")));
}
} }
/** /**