lsy/FT577-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

现场运行调整

Browse Source
This commit is contained in:
FT577
2026-09-18 20:57:11 +08:00
parent c67d2b127b
commit a6a9fc15f2
3 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/api/domain/wcs2wms/ReceiveJob.java
View File

@@ -62,6 +62,12 @@ public class ReceiveJob {
@Nullable
private String roadwayId;
/**
* 优先级
*/
@Nullable
private Integer priority;
}

26
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
View File

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSON;
@@ -168,31 +169,28 @@ public class ApiServiceImpl implements IApiService {
BasCargoSpace cargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(stockoutReceive.getCargoSpaceId());
// 0.检查货位参数是否合法
if(StrUtil.isBlank(stockoutReceive.getCargoSpaceId())){
log.info("【请求错误】wms推送出库任务失败，参数错误，推送作业号:{}，推送出库货位:{}", stockoutReceive.getJobId(), stockoutReceive.getCargoSpaceId());
return AjaxResult.error("【请求错误】wms推送出库任务失败，参数错误，推送作业号:" + stockoutReceive.getJobId() + "，推送出库货位:" + stockoutReceive.getCargoSpaceId());
}
// if(StrUtil.isBlank(stockoutReceive.getCargoSpaceId())){
// log.info("【请求错误】wms推送出库任务失败，参数错误，推送作业号:{}，推送出库货位:{}", stockoutReceive.getJobId(), stockoutReceive.getCargoSpaceId());
// return AjaxResult.error("【请求错误】wms推送出库任务失败，参数错误，推送作业号:" + stockoutReceive.getJobId() + "，推送出库货位:" + stockoutReceive.getCargoSpaceId());
// }
// 1.wms推送的作业号是否重复
MydoJob job = new MydoJob().builder().jobId(stockoutReceive.getJobId()).build();
List<MydoJob> tasks = mydoJobService.selectMydoJobList(job);
if (tasks.size() != 0) {
if (ObjUtil.isNotNull(job)) {
log.info("【提示】wms下发出库任务失败，该任务已存在，wms作业号:{}", stockoutReceive.getJobId());
return AjaxResult.error("【提示】wms下发出库任务失败，该任务已存在，wms作业号:{}" + stockoutReceive.getJobId());
}
// 2.wms推送的出库货位是否已经有任务
job = new MydoJob().builder().cargoSpaceId(stockoutReceive.getCargoSpaceId()).build();
tasks = mydoJobService.selectMydoJobList(job);
if (tasks.size() != 0) {
if (ObjUtil.isNotNull(job)) {
log.info("【提示】wms下发出库任务失败，已经存在该货位的出库任务，wms作业号:{}，推送出库货位:{}", stockoutReceive.getJobId(), stockoutReceive.getCargoSpaceId());
return AjaxResult.error("【提示】wms下发出库任务失败，已经存在该货位的出库任务，wms作业号:{}" + stockoutReceive.getJobId() + "，推送出库货位:" + stockoutReceive.getCargoSpaceId());
}
// 3.wms推送的出托盘号是否已经有任务
job = new MydoJob().builder().cargoSpaceId(stockoutReceive.getTrayCode()).build();
tasks = mydoJobService.selectMydoJobList(job);
if (tasks.size() != 0) {
if (ObjUtil.isNotNull(job)) {
log.info("【提示】wms下发出库任务失败，已经存在该托盘的出库任务，wms作业号:{}，推送托盘号:{}", stockoutReceive.getJobId(), stockoutReceive.getTrayCode());
return AjaxResult.error("【提示】wms下发出库任务失败，已经存在该货位的出库任务，wms作业号:{}" + stockoutReceive.getJobId() + "，推送托盘号:" + stockoutReceive.getTrayCode());
}
@@ -255,16 +253,14 @@ public class ApiServiceImpl implements IApiService {
// 1.wms推送的作业号是否重复
MydoJob job = new MydoJob().builder().jobId(receiveInJob.getJobId()).build();
List<MydoJob> tasks = mydoJobService.selectMydoJobList(job);
if (tasks.size() != 0) {
if (ObjUtil.isNotNull(job)) {
log.info("【请求错误】wms下发入库任务失败，该任务已存在，推送作业号:{}，目标货位:{}", receiveInJob.getJobId(), receiveInJob.getCargoSpaceId());
return AjaxResult.error("【请求错误】wms下发入库任务失败，该任务已存在，推送作业号:{}" + receiveInJob.getJobId() + "，目标货位:" + receiveInJob.getCargoSpaceId());
}
// 2.wms推送的目标货位是否已经有任务
job = new MydoJob().builder().cargoSpaceId(receiveInJob.getCargoSpaceId()).build();
tasks = mydoJobService.selectMydoJobList(job);
if (tasks.size() != 0) {
if (ObjUtil.isNotNull(job)) {
log.info("【请求错误】wms下发入库任务失败，已经存在该货位的入库任务，推送作业号:{}，目标货位:{}", receiveInJob.getJobId(), receiveInJob.getCargoSpaceId());
return AjaxResult.error("【请求错误】wms下发入库任务失败，已经存在目标货位的入库任务，目标货位:{}" + receiveInJob.getJobId() + "，目标货位:" + receiveInJob.getCargoSpaceId());
}
@@ -283,7 +279,7 @@ public class ApiServiceImpl implements IApiService {
// mydoJob.setTraySize(GoodsType.TYPE_DEFAULT);
// mydoJob.setInOrOut("1");
mydoJob.setStatus(TASK_STATUS_CREATED);
mydoJob.setPriority(10);
// mydoJob.setPriority(10);
mydoJob.setCreateTime(DateUtils.getNowDate());
mydoJob.setExecutionPhase(TASK_EP_CREATED);
// mydoJob.setTraySize(receiveOutJob.getDepartmentId());

7
ruoyi-admin/src/main/resources/application.yml
View File

@@ -71,14 +71,13 @@ spring:
# 热部署开关
enabled: true
# redis 配置
spring.redis:
redis:
# 地址
host: 127.0.0.1
# host: 172.16.4.12
host: 172.16.30.100
# 端口，默认为6379
port: 6379
# 数据库索引
database: 2
database: 0
# 密码
password:
# 连接超时时间