From cdc8ae9e45e07f74f472b6827263e70732d2bd45 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Thu, 19 Mar 2026 15:01:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E8=B0=83=E5=BA=A6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/schedule/ScheduleThread.java | 32 +++++++++++++------ .../scheduleTask/ddj/impl/Ddj5Thread.java | 20 +++++++++--- .../scheduleTask/ddj/impl/Ddj6Thread.java | 21 +++++++++--- 3 files changed, 54 insertions(+), 19 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java index 1354bc3..211d4ce 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java @@ -182,11 +182,10 @@ public class ScheduleThread { plcDdj5ReadCustomThread.getThread().start(); } - /*plcDdj2ReadCustomThread.getThread().start(); - plcDdj3ReadCustomThread.getThread().start(); - plcDdj4ReadCustomThread.getThread().start(); - plcDdj5ReadCustomThread.getThread().start(); - plcDdj6ReadCustomThread.getThread().start();*/ + if (plcDdj6ReadCustomThread!=null){ + plcDdj6ReadCustomThread.getThread().start(); + + } isRun = true; } @@ -215,11 +214,10 @@ public class ScheduleThread { ddj5CustomThread.thread.start(); } - /*ddj2CustomThread.thread.start(); - ddj3CustomThread.thread.start(); - ddj4CustomThread.thread.start(); - ddj5CustomThread.thread.start(); - ddj6CustomThread.thread.start();*/ + if (ddj6CustomThread!=null){ + ddj6CustomThread.thread.start(); + + } isRun2 = true; } @@ -232,11 +230,15 @@ public class ScheduleThread { plcDdj1ReadCustomThread.runnable.isRun = false; plcDdj1ReadCustomThread.thread.interrupt(); plcDdj2ReadCustomThread.runnable.isRun = false; + plcDdj2ReadCustomThread.thread.interrupt(); plcDdj3ReadCustomThread.runnable.isRun = false; + plcDdj3ReadCustomThread.thread.interrupt(); plcDdj4ReadCustomThread.runnable.isRun = false; plcDdj4ReadCustomThread.thread.interrupt(); plcDdj5ReadCustomThread.runnable.isRun = false; + plcDdj5ReadCustomThread.thread.interrupt(); plcDdj6ReadCustomThread.runnable.isRun = false; + plcDdj6ReadCustomThread.thread.interrupt(); plcReadInit(); isRun = false; } @@ -247,8 +249,18 @@ public class ScheduleThread { public void stopAllThread2() { monitoringCustomThread.runnable.isRun = false; monitoringCustomThread.thread.interrupt(); + ddj1CustomThread.runnable.isRun = false; + ddj1CustomThread.thread.interrupt(); + ddj2CustomThread.runnable.isRun = false; + ddj2CustomThread.thread.interrupt(); + ddj3CustomThread.runnable.isRun = false; + ddj3CustomThread.thread.interrupt(); ddj4CustomThread.runnable.isRun = false; ddj4CustomThread.thread.interrupt(); + ddj5CustomThread.runnable.isRun = false; + ddj5CustomThread.thread.interrupt(); + ddj6CustomThread.runnable.isRun = false; + ddj6CustomThread.thread.interrupt(); scheduleInit(); isRun2 = false; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj5Thread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj5Thread.java index 6047c55..77c141e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj5Thread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj5Thread.java @@ -43,20 +43,32 @@ public class Ddj5Thread extends BaseDdjThread { ssjList.put("outSsj2", outSsj2); //初始化巷道口 排 列 层 - roadwayMap.put("L1003", Arrays.asList(1, 1, 1)); - roadwayMap.put("L1004", Arrays.asList(2, 1, 1)); + roadwayMap.put("L1003", Arrays.asList(1, 0, 1)); + roadwayMap.put("L1004", Arrays.asList(2, 0, 1)); + //未扫码 回退任务号 无入库任务在此基础+100 roadwayRollback.put("L1003", 94); roadwayRollback.put("L1004", 95); + //初始化称重设备连接ip port + czRoadwayMap.put("L1003", "172.19.40.216:4001"); + czRoadwayMap.put("L1004", "172.19.40.217:4001"); + + /*czOverMap.put("L1003", "DB502.12"); + czOverMap.put("L1004", "DB502.26");*/ + + outJobMap.put("L1003", "DB502.38"); + outJobMap.put("L1004", "DB502.52"); + log.info("Ddj5Thread init"); } + @Override public HashMap getParamMap(String trayCode,Integer height,double weight) { HashMap paramMap = new HashMap<>(); paramMap.put("trayCode", trayCode); paramMap.put("warehouseId",WAREHOUSE_02); - paramMap.put("roadwayId",ROADWAY_ID_02); + paramMap.put("roadwayId",ROADWAY_ID_05); paramMap.put("height",height); paramMap.put("weight",weight); return paramMap; @@ -66,7 +78,7 @@ public class Ddj5Thread extends BaseDdjThread { public MydoJob getOutJobParam() { MydoJob mydoJob = new MydoJob(); mydoJob.setWarehouseId(WAREHOUSE_02); - mydoJob.setRoadwayId(String.valueOf(ROADWAY_ID_02)); + mydoJob.setRoadwayId(String.valueOf(ROADWAY_ID_05)); mydoJob.setStatus("1"); return mydoJob; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj6Thread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj6Thread.java index 06ed300..4d1cca8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj6Thread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj6Thread.java @@ -43,11 +43,22 @@ public class Ddj6Thread extends BaseDdjThread { ssjList.put("outSsj2", outSsj2); //初始化巷道口 排 列 层 - roadwayMap.put("L1005", Arrays.asList(1, 1, 1)); - roadwayMap.put("L1006", Arrays.asList(2, 1, 1)); + roadwayMap.put("L1005", Arrays.asList(1, 0, 1)); + roadwayMap.put("L1006", Arrays.asList(2, 0, 1)); + //未扫码 回退任务号 无入库任务在此基础+100 roadwayRollback.put("L1005", 96); roadwayRollback.put("L1006", 97); + //初始化称重设备连接ip port + czRoadwayMap.put("L1005", "172.19.40.218:4001"); + czRoadwayMap.put("L1006", "172.19.40.219:4001"); + + /*czOverMap.put("L1003", "DB502.12"); + czOverMap.put("L1004", "DB502.26");*/ + + outJobMap.put("L1005", "DB502.66"); + outJobMap.put("L1006", "DB502.80"); + log.info("Ddj6Thread init"); } @@ -57,10 +68,9 @@ public class Ddj6Thread extends BaseDdjThread { HashMap paramMap = new HashMap<>(); paramMap.put("trayCode", trayCode); paramMap.put("warehouseId",WAREHOUSE_02); - paramMap.put("roadwayId",ROADWAY_ID_03); + paramMap.put("roadwayId",ROADWAY_ID_06); paramMap.put("height",height); paramMap.put("weight",weight); - return paramMap; } @@ -68,7 +78,7 @@ public class Ddj6Thread extends BaseDdjThread { public MydoJob getOutJobParam() { MydoJob mydoJob = new MydoJob(); mydoJob.setWarehouseId(WAREHOUSE_02); - mydoJob.setRoadwayId(String.valueOf(ROADWAY_ID_03)); + mydoJob.setRoadwayId(String.valueOf(ROADWAY_ID_06)); mydoJob.setStatus("1"); return mydoJob; @@ -86,4 +96,5 @@ public class Ddj6Thread extends BaseDdjThread { return "1"; } + }