diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/BaseDdjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/BaseDdjThread.java index fc05748..5b16e8b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/BaseDdjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/BaseDdjThread.java @@ -43,6 +43,8 @@ public abstract class BaseDdjThread implements Runnable, DdjThreadInterface { private IBasCargoSpaceService basCargoSpaceService; public Map> roadwayMap = new HashMap<>(); + public Map roadwayRollback = new HashMap<>(); + public boolean isRun = true; @Override @@ -220,8 +222,21 @@ public abstract class BaseDdjThread implements Runnable, DdjThreadInterface { Integer mbph = ddj.getMbph(); Integer mblh = ddj.getMblh(); Integer mbch = ddj.getMbch(); - long rwh = ddj.getRwh() + 100; - log.error("扫码失败,放回原位 排:{} 列:{} 层:{} 任务号:{}", mbph, mblh, mbch, rwh); + String road = ""; + for (String roadway : roadwayMap.keySet()) { + List integers = roadwayMap.get(roadway); + if (integers.get(0).equals(mbph) && integers.get(1).equals(mblh) && integers.get(2).equals(mbch)){ + road = roadway; + break; + } + } + if (!roadwayRollback.containsKey(road)){ + log.error("未找到回滚任务号 p:{} l:{} c:{}",mbph,mblh,mbch); + return; + } + + long rwh = roadwayRollback.get(road); + log.info("扫码失败,放回原位 排:{} 列:{} 层:{} 任务号:{}", mbph, mblh, mbch, rwh); DdjDeviceExecutionQueue ddjQueue = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByRwh(rwh, ddj.getId()); if (ObjUtil.isNull(ddjQueue)) { DdjDeviceExecutionQueue ddjDeviceExecutionQueue = new DdjDeviceExecutionQueue(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj1Thread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj1Thread.java index 4766343..6623b6e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj1Thread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj1Thread.java @@ -54,6 +54,10 @@ public class Ddj1Thread extends BaseDdjThread { roadwayMap.put("L2002", Arrays.asList(2, 1, 1)); roadwayMap.put("L2007", Arrays.asList(1, 22, 1)); roadwayMap.put("L2008", Arrays.asList(2, 22, 1)); + roadwayRollback.put("L2001", 80); + roadwayRollback.put("L2002", 81); + roadwayRollback.put("L2007", 82); + roadwayRollback.put("L2008", 83); log.info("Ddj1Thread init"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj2Thread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj2Thread.java index 244ab95..a841bbd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj2Thread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj2Thread.java @@ -46,10 +46,14 @@ public class Ddj2Thread extends BaseDdjThread { ssjList.put("outSsj4", outSsj4); //初始化巷道口 排 列 层 - roadwayMap.put("L2001", Arrays.asList(3, 1, 1)); - roadwayMap.put("L2002", Arrays.asList(4, 1, 1)); - roadwayMap.put("L2007", Arrays.asList(3, 22, 1)); - roadwayMap.put("L2008", Arrays.asList(4, 22, 1)); + roadwayMap.put("L2003", Arrays.asList(3, 1, 1)); + roadwayMap.put("L2004", Arrays.asList(4, 1, 1)); + roadwayMap.put("L2009", Arrays.asList(3, 22, 1)); + roadwayMap.put("L2010", Arrays.asList(4, 22, 1)); + roadwayRollback.put("L2003", 84); + roadwayRollback.put("L2004", 85); + roadwayRollback.put("L2009", 86); + roadwayRollback.put("L2010", 87); log.info("Ddj2Thread init"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj3Thread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj3Thread.java index 9275d3f..872160e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj3Thread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj3Thread.java @@ -51,6 +51,11 @@ public class Ddj3Thread extends BaseDdjThread { roadwayMap.put("L2011", Arrays.asList(5, 22, 1)); roadwayMap.put("L2012", Arrays.asList(6, 22, 1)); + roadwayRollback.put("L2005", 88); + roadwayRollback.put("L2006", 89); + roadwayRollback.put("L2011", 90); + roadwayRollback.put("L2012", 91); + log.info("Ddj3Thread init"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj4Thread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj4Thread.java index 7d44ed6..eff0b3a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj4Thread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj4Thread.java @@ -41,6 +41,9 @@ public class Ddj4Thread extends BaseDdjThread { roadwayMap.put("L1001", Arrays.asList(1, 1, 1)); roadwayMap.put("L1002", Arrays.asList(2, 1, 1)); + roadwayRollback.put("L1001", 92); + roadwayRollback.put("L1002", 93); + log.info("Ddj4Thread init"); } 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 322a86f..6599d6f 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 @@ -40,7 +40,8 @@ public class Ddj5Thread extends BaseDdjThread { //初始化巷道口 排 列 层 roadwayMap.put("L1003", Arrays.asList(1, 1, 1)); roadwayMap.put("L1004", Arrays.asList(2, 1, 1)); - + roadwayRollback.put("L1003", 94); + roadwayRollback.put("L1004", 95); log.info("Ddj5Thread init"); } 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 eed2f10..80696e2 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 @@ -40,6 +40,8 @@ public class Ddj6Thread extends BaseDdjThread { //初始化巷道口 排 列 层 roadwayMap.put("L1005", Arrays.asList(1, 1, 1)); roadwayMap.put("L1006", Arrays.asList(2, 1, 1)); + roadwayRollback.put("L1003", 96); + roadwayRollback.put("L1004", 97); log.info("Ddj6Thread init"); }