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

501流程测试修改，作废流程添加

Browse Source
This commit is contained in:
liuhanqing
2025-08-04 17:51:44 +08:00
parent a75f289184
commit 00a6c777d4
15 changed files with 1143 additions and 1015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.ruoyi.api.service.IToWcsService;
import com.ruoyi.bas.basJobId.service.IBasJobIdService;
import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService;
@@ -78,6 +79,8 @@ public class MydoJobServiceImpl implements IMydoJobService {
private PdaService pdaService;
@Autowired
private IBasWarehouseService basWarehouseService;
@Autowired
private IToWcsService iToWcsService;
/**
@@ -181,7 +184,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
//插入历史表
insertHistory(mydoJob.getJobId());
return AjaxResult.success();
} else {
MydoJobDetail param = new MydoJobDetail();
param.setJobId(jobId);
@@ -200,9 +203,14 @@ public class MydoJobServiceImpl implements IMydoJobService {
updateMydoJob(mydoJob);
//插入历史表
insertHistory(mydoJob.getJobId());
return AjaxResult.success();
}
//通知wcs
AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
if (!ajaxResult.isSuccess()){
return AjaxResult.success();
}else {
throw new RuntimeException(Convert.toStr(ajaxResult.get("msg")));
}
}
/**
@@ -418,13 +426,13 @@ public class MydoJobServiceImpl implements IMydoJobService {
MydoJob job = selectMydoJobByJobId(jobId);
BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(job.getWarehouseId());
if("1".equals(basWarehouse.getWarehouseType()) && Integer.parseInt(job.getStatus())<3){
if("2".equals(basWarehouse.getWarehouseType()) && Integer.parseInt(job.getStatus())<3){
log.error("只能完成正执行的作业");
return AjaxResult.error();
}
TrayCodeMakeSure trayCodeMakeSure = new TrayCodeMakeSure();
trayCodeMakeSure.setTrayCode(job.getTrayCode());
pdaService.outMakeSure(trayCodeMakeSure);
pdaService.outMakeSure(trayCodeMakeSure);
}
return AjaxResult.success();
}
@@ -470,14 +478,21 @@ public class MydoJobServiceImpl implements IMydoJobService {
job.setFinishTime(DateUtil.formatDateTime(DateUtil.date()));
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")));
}
}
return AjaxResult.success();
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
log.error("任务处理异常", e);
return AjaxResult.error();
}
return AjaxResult.error();
}
@Override