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

修改国际化

Browse Source
This commit is contained in:
liuhanqing
2025-08-12 11:24:55 +08:00
parent 893609c2a4
commit cccebc0ce0
13 changed files with 102 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,6 +199,11 @@ public class MydoJobServiceImpl implements IMydoJobService {
inStockinDetail.setScanNum(Convert.toStr(subtract));
inStockinDetailService.updateInStockinDetail(inStockinDetail);
}
//修改货位状态
BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(job.getCargoSpaceId());
basCargoSpace.setStatus("1");
basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
mydoJob.setStatus("5");
updateMydoJob(mydoJob);
//插入历史表
@@ -206,7 +211,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
}
//通知wcs
AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
if (!ajaxResult.isSuccess()){
if (ajaxResult.isSuccess()){
return AjaxResult.success();
}else {
throw new RuntimeException(Convert.toStr(ajaxResult.get("msg")));
@@ -238,7 +243,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
}
AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
if (!ajaxResult.isSuccess()){
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message17"));
}
BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(job.getWarehouseId());
if("2".equals(basWarehouse.getWarehouseType())) {
@@ -432,7 +437,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
if("2".equals(basWarehouse.getWarehouseType()) && Integer.parseInt(job.getStatus())<3){
log.error("只能完成正执行的作业");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message14"));
}
TrayCodeMakeSure trayCodeMakeSure = new TrayCodeMakeSure();
trayCodeMakeSure.setTrayCode(job.getTrayCode());
@@ -450,7 +455,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
MydoJob job = selectMydoJobByJobId(jobId);
if (job == null) {
log.error("任务不存在");
return AjaxResult.error();
return AjaxResult.error(MessageUtils.message("error.message28"));
}
MydoJobDetail mydoJobDetail = new MydoJobDetail();
mydoJobDetail.setJobId(jobId);