From 4d4a381b0c164ccfb433f6d79471b4f1cb31732b Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Sat, 11 Oct 2025 13:15:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=B5=8B=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/job/mapper/MydoJobMapper.java | 2 ++ .../java/com/ruoyi/job/service/IMydoJobService.java | 2 ++ .../ruoyi/job/service/impl/MydoJobServiceImpl.java | 5 +++++ .../ssj/floor1/Floor1BothWayInSsjThread.java | 2 +- .../ssj/floor1/Floor1SingleSsjThread.java | 2 +- .../src/main/resources/mapper/job/MydoJobMapper.xml | 12 +++++++++++- 6 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java index c85a3d95..76aaa743 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java @@ -79,4 +79,6 @@ public interface MydoJobMapper MydoJob selectMydoJobByEntranceList(@Param("entranceList") List entranceList); List selectMydoJobFinishList(MydoJob mydoJob); + + MydoJob selectRunningMydoJobByExitList(@Param("exitList") List exitList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java b/ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java index 23670e25..94f7050d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java @@ -74,4 +74,6 @@ public interface IMydoJobService MydoJob selectMydoJobByEntranceList(List entranceList); List selectMydoJobFinishList(MydoJob mydoJob); + + MydoJob selectRunningMydoJobByExitList(List strings); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java index f2d3a6c5..cad2dbca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java @@ -152,4 +152,9 @@ public class MydoJobServiceImpl implements IMydoJobService public List selectMydoJobFinishList(MydoJob mydoJob) { return mydoJobMapper.selectMydoJobFinishList(mydoJob); } + + @Override + public MydoJob selectRunningMydoJobByExitList(List exitList) { + return mydoJobMapper.selectRunningMydoJobByExitList(exitList); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java index 1302e130..9aa8043a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java @@ -136,7 +136,7 @@ public class Floor1BothWayInSsjThread implements Runnable { private void dispatch2(DeviceSsj ssj) { if (ssj.getDw() == 1 && ssj.getTaskNo() > 0 && ssj.getTaskNo() < 1000 && ssj.getTraySize() != 0) { //先检测有没有出库作业，有出库作业直接退回 - MydoJob outMydoJob = mydoJobService.selectMydoJobByExitList(Collections.singletonList(ssj.getDeviceCode())); + MydoJob outMydoJob = mydoJobService.selectRunningMydoJobByExitList(Collections.singletonList(ssj.getDeviceCode())); String l2012WriteAddress = "DB501.20"; String l2013WriteAddress = "DB501.30"; if (ObjUtil.isNotNull(outMydoJob) || StrUtil.isEmpty(ssj.getTrayCode())) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1SingleSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1SingleSsjThread.java index dc288961..86b467eb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1SingleSsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1SingleSsjThread.java @@ -159,7 +159,7 @@ public class Floor1SingleSsjThread implements Runnable { log.error("货位不存在 cargoSpaceId{}", mydoJob.getCargoSpaceId()); } else { //生成队列 - List list = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueListByRwlx(DDJ_RWLX_2, Convert.toInt(mydoJob)); + List list = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueListByRwlx(DDJ_RWLX_2, Convert.toInt(mydoJob.getRoadwayId())); List pclList = roadwayMap.get(ssj.getDeviceCode()); if (CollUtil.isEmpty(list) && CollUtil.isNotEmpty(pclList)) { DdjDeviceExecutionQueue ddjDeviceExecutionQueue = new DdjDeviceExecutionQueue(); diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml index 7481846b..eca6b611 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml @@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and in_or_out > 20 and status = 1 and execution_phase= 0 - order by priority desc,create_time desc + order by priority desc,create_time @@ -220,4 +220,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and fault_flag = #{faultFlag} +