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-07-29 16:59:06 +08:00
parent 2e79e1a04e
commit 59aa1b8b3e
12 changed files with 207 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@ import com.ruoyi.check.difference.service.ICheckDifferenceRecordService;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
@@ -35,6 +36,7 @@ import com.ruoyi.pda.domain.TrayCodeMakeSure;
import com.ruoyi.pda.service.PdaService;
import com.ruoyi.stock.stock.domain.BasStock;
import com.ruoyi.stock.stock.service.IBasStockService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.job.mydojob.mapper.MydoJobMapper;
@@ -50,6 +52,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
* @date 2025-05-23
*/
@Service
@Slf4j
public class MydoJobServiceImpl implements IMydoJobService {
@Autowired
private MydoJobMapper mydoJobMapper;
@@ -167,10 +170,10 @@ public class MydoJobServiceImpl implements IMydoJobService {
String jobId = mydoJob.getJobId();
MydoJob job = selectMydoJobByJobId(jobId);
if (job == null) {
return AjaxResult.warn("任务不存在");
return AjaxResult.warn(MessageUtils.message("warn.message"));
}
if (!"1".equals(job.getStatus())) {
return AjaxResult.warn("任务已开始");
return AjaxResult.warn(MessageUtils.message("warn.message1"));
}
if ("1".equals(job.getInOrOut()) || "4".equals(job.getInOrOut())) {
mydoJob.setStatus("5");
@@ -223,12 +226,12 @@ public class MydoJobServiceImpl implements IMydoJobService {
String jobId = mydoJob.getJobId();
MydoJob job = selectMydoJobByJobId(jobId);
if (job == null) {
return AjaxResult.warn("任务不存在");
return AjaxResult.warn(MessageUtils.message("warn.message"));
}
BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(job.getWarehouseId());
if("2".equals(basWarehouse.getWarehouseType())) {
if ("1".equals(job.getStatus()) || "2".equals(job.getStatus())) {
return AjaxResult.warn("任务未开始");
return AjaxResult.warn(MessageUtils.message("warn.message1"));
}
}
if ("1".equals(job.getInOrOut()) || "4".equals(job.getInOrOut())) {
@@ -259,7 +262,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
insertHistory(mydoJob.getJobId());
return AjaxResult.success();
} else {
return AjaxResult.warn("子任务不存在");
return AjaxResult.warn(MessageUtils.message("warn.message2"));
}
} else if ("2".equals(job.getInOrOut()) || "3".equals(job.getInOrOut())) {
//ctu物料入库 高架库入库
@@ -322,7 +325,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
insertHistory(mydoJob.getJobId());
return AjaxResult.success();
} else {
return AjaxResult.warn("子任务不存在");
return AjaxResult.warn(MessageUtils.message("warn.message2"));
}
} else if ("5".equals(job.getInOrOut()) || "6".equals(job.getInOrOut())) {
//盘点 ctu入库 高架库入库
@@ -376,10 +379,10 @@ public class MydoJobServiceImpl implements IMydoJobService {
insertHistory(mydoJob.getJobId());
return AjaxResult.success();
} else {
return AjaxResult.warn("子任务不存在");
return AjaxResult.warn(MessageUtils.message("warn.message2"));
}
} else {
return AjaxResult.warn("暂不支持的任务类型");
return AjaxResult.warn(MessageUtils.message("warn.message3"));
}
}
@@ -415,7 +418,8 @@ public class MydoJobServiceImpl implements IMydoJobService {
BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(job.getWarehouseId());
if("1".equals(basWarehouse.getWarehouseType()) && Integer.parseInt(job.getStatus())<3){
return AjaxResult.error("只能完成正执行的作业");
log.error("只能完成正执行的作业");
return AjaxResult.error();
}
TrayCodeMakeSure trayCodeMakeSure = new TrayCodeMakeSure();
trayCodeMakeSure.setTrayCode(job.getTrayCode());
@@ -431,7 +435,8 @@ public class MydoJobServiceImpl implements IMydoJobService {
for (String jobId : jobIds) {
MydoJob job = selectMydoJobByJobId(jobId);
if (job == null) {
return AjaxResult.error("任务不存在");
log.error("任务不存在");
return AjaxResult.error();
}
MydoJobDetail mydoJobDetail = new MydoJobDetail();
mydoJobDetail.setJobId(jobId);
@@ -469,7 +474,8 @@ public class MydoJobServiceImpl implements IMydoJobService {
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error("任务处理异常");
log.error("任务处理异常", e);
return AjaxResult.error();
}
}
@@ -490,7 +496,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
Stringbuilder += stockId + msg + "<br/>";
}
return AjaxResult.success(Stringbuilder.toString());
return AjaxResult.success();
}
@Override