From efaf0d670eba5b938fd1a8c6fbd69db3e520688f Mon Sep 17 00:00:00 2001 From: lsymicc Date: Sat, 10 Oct 2026 13:31:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E8=B0=83=E8=AF=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/api/service/impl/ApiServiceImpl.java | 2 +- .../com/ruoyi/schedule/scheduleTask/ssj/RoadConvThread.java | 6 +++++- 2 files changed, 6 insertions(+), 2 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 6dd56b3..2bd6be9 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 @@ -207,7 +207,7 @@ public class ApiServiceImpl implements IApiService { // mydoJob.setWmsTaskNo(stockoutReceive.getTaskCode()); // mydoJob.setCargoSpaceId(stockoutReceive.getCargoSpaceId()); // mydoJob.setTrayCode(receiveOutJob.getTrayCode()); - mydoJob.setInOrOut(stockoutReceive.getInOrOut()); +// mydoJob.setInOrOut(stockoutReceive.getInOrOut()); // mydoJob.setTraySize(mydoJobService.getTraytypeByTrayCode(mydoJob.getTrayCode())); mydoJob.setStatus(TASK_STATUS_CREATED); mydoJob.setPriority(10); 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 e884e42..ec5773a 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 @@ -516,7 +516,10 @@ public class RoadConvThread implements Runnable { //检查是否有出库任务 MydoJob mydoJob = mydoJobService.selectMydoJobByExitId(exitId); - if (ObjUtil.isNotNull(mydoJob)) { + List mydoJobs = mydoJobService.selectMydoJobList( + new MydoJob().builder().exitId(exitId).build() + ); + if (mydoJobs.isEmpty()){ //如果有出库任务 - 检查货位编码是否合法 BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByWmsCargoSpaceId(mydoJob.getCargoSpaceId()); @@ -634,6 +637,7 @@ public class RoadConvThread implements Runnable { } + /** * 向堆垛机发送【移库】任务 */