From 5edf4a62b9f78a049a30200b337bbf135083ca5d Mon Sep 17 00:00:00 2001 From: FT577-Server Date: Fri, 16 Oct 2026 09:48:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/api/service/impl/ApiServiceImpl.java | 4 ++-- .../com/ruoyi/schedule/scheduleTask/ssj/RoadConvThread.java | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java index 2bd6be9..60d4ab2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java @@ -275,7 +275,7 @@ public class ApiServiceImpl implements IApiService { MydoJob mydoJob = new MydoJob(); mydoJob = BeanUtil.copyProperties(receiveInJob, MydoJob.class); // mydoJob.setJobId(mydoJobService.getJobId("RK")); - mydoJob.setTaskNo(mydoJobService.getTaskNo("3")); +// mydoJob.setTaskNo(mydoJobService.getTaskNo("3")); // mydoJob.setWmsTaskNo(receiveInJob.getJobId()); // mydoJob.setCargoSpaceId(receiveInJob.getTrayCode()); // mydoJob.setTrayCode(receiveOutJob.getTrayCode()); @@ -342,7 +342,7 @@ public class ApiServiceImpl implements IApiService { MydoJob mydoJob = new MydoJob(); mydoJob = BeanUtil.copyProperties(receiveInJob, MydoJob.class); // mydoJob.setJobId(mydoJobService.getJobId("RK")); - mydoJob.setTaskNo(mydoJobService.getTaskNo("3")); +// mydoJob.setTaskNo(mydoJobService.getTaskNo("3")); // mydoJob.setWmsTaskNo(receiveInJob.getJobId()); // mydoJob.setCargoSpaceId(receiveInJob.getTrayCode()); // mydoJob.setTrayCode(receiveOutJob.getTrayCode()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/RoadConvThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/RoadConvThread.java index ec5773a..c835838 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/RoadConvThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/RoadConvThread.java @@ -519,7 +519,11 @@ public class RoadConvThread implements Runnable { List mydoJobs = mydoJobService.selectMydoJobList( 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());