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-Server
2026-10-16 09:48:33 +08:00
parent efaf0d670e
commit 5edf4a62b9
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -275,7 +275,7 @@ public class ApiServiceImpl implements IApiService {
MydoJob mydoJob = new MydoJob(); MydoJob mydoJob = new MydoJob();
mydoJob = BeanUtil.copyProperties(receiveInJob, MydoJob.class); mydoJob = BeanUtil.copyProperties(receiveInJob, MydoJob.class);
// mydoJob.setJobId(mydoJobService.getJobId("RK")); // mydoJob.setJobId(mydoJobService.getJobId("RK"));
mydoJob.setTaskNo(mydoJobService.getTaskNo("3")); // mydoJob.setTaskNo(mydoJobService.getTaskNo("3"));
// mydoJob.setWmsTaskNo(receiveInJob.getJobId()); // mydoJob.setWmsTaskNo(receiveInJob.getJobId());
// mydoJob.setCargoSpaceId(receiveInJob.getTrayCode()); // mydoJob.setCargoSpaceId(receiveInJob.getTrayCode());
// mydoJob.setTrayCode(receiveOutJob.getTrayCode()); // mydoJob.setTrayCode(receiveOutJob.getTrayCode());
@@ -342,7 +342,7 @@ public class ApiServiceImpl implements IApiService {
MydoJob mydoJob = new MydoJob(); MydoJob mydoJob = new MydoJob();
mydoJob = BeanUtil.copyProperties(receiveInJob, MydoJob.class); mydoJob = BeanUtil.copyProperties(receiveInJob, MydoJob.class);
// mydoJob.setJobId(mydoJobService.getJobId("RK")); // mydoJob.setJobId(mydoJobService.getJobId("RK"));
mydoJob.setTaskNo(mydoJobService.getTaskNo("3")); // mydoJob.setTaskNo(mydoJobService.getTaskNo("3"));
// mydoJob.setWmsTaskNo(receiveInJob.getJobId()); // mydoJob.setWmsTaskNo(receiveInJob.getJobId());
// mydoJob.setCargoSpaceId(receiveInJob.getTrayCode()); // mydoJob.setCargoSpaceId(receiveInJob.getTrayCode());
// mydoJob.setTrayCode(receiveOutJob.getTrayCode()); // mydoJob.setTrayCode(receiveOutJob.getTrayCode());

6
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/RoadConvThread.java
View File

@@ -519,7 +519,11 @@ public class RoadConvThread implements Runnable {
List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList( List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList(
new MydoJob().builder().exitId(exitId).build() new MydoJob().builder().exitId(exitId).build()
); );
if (mydoJobs.isEmpty()){
//有正在执行的作业
if ( mydoJobs.stream().anyMatch(s -> Convert.toInt(s.getStatus()) > 1)) return;
if (!mydoJobs.isEmpty()){
//如果有出库任务 - 检查货位编码是否合法 //如果有出库任务 - 检查货位编码是否合法
BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByWmsCargoSpaceId(mydoJob.getCargoSpaceId()); BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByWmsCargoSpaceId(mydoJob.getCargoSpaceId());