lhq/FT541-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

回滚任务号

Browse Source
This commit is contained in:
liuhanqing
2025-12-03 10:46:18 +08:00
parent 73a04b9b4e
commit fc9da36380
7 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/BaseDdjThread.java
View File

@@ -43,6 +43,8 @@ public abstract class BaseDdjThread implements Runnable, DdjThreadInterface {
private IBasCargoSpaceService basCargoSpaceService; private IBasCargoSpaceService basCargoSpaceService;
public Map<String, List<Integer>> roadwayMap = new HashMap<>(); public Map<String, List<Integer>> roadwayMap = new HashMap<>();
public Map<String,Integer> roadwayRollback = new HashMap<>();
public boolean isRun = true; public boolean isRun = true;
@Override @Override
@@ -220,8 +222,21 @@ public abstract class BaseDdjThread implements Runnable, DdjThreadInterface {
Integer mbph = ddj.getMbph(); Integer mbph = ddj.getMbph();
Integer mblh = ddj.getMblh(); Integer mblh = ddj.getMblh();
Integer mbch = ddj.getMbch(); Integer mbch = ddj.getMbch();
long rwh = ddj.getRwh() + 100; String road = "";
log.error("扫码失败，放回原位 排：{} 列：{} 层：{} 任务号：{}", mbph, mblh, mbch, rwh); for (String roadway : roadwayMap.keySet()) {
List<Integer> 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()); DdjDeviceExecutionQueue ddjQueue = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByRwh(rwh, ddj.getId());
if (ObjUtil.isNull(ddjQueue)) { if (ObjUtil.isNull(ddjQueue)) {
DdjDeviceExecutionQueue ddjDeviceExecutionQueue = new DdjDeviceExecutionQueue(); DdjDeviceExecutionQueue ddjDeviceExecutionQueue = new DdjDeviceExecutionQueue();

4
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj1Thread.java
View File

@@ -54,6 +54,10 @@ public class Ddj1Thread extends BaseDdjThread {
roadwayMap.put("L2002", Arrays.asList(2, 1, 1)); roadwayMap.put("L2002", Arrays.asList(2, 1, 1));
roadwayMap.put("L2007", Arrays.asList(1, 22, 1)); roadwayMap.put("L2007", Arrays.asList(1, 22, 1));
roadwayMap.put("L2008", Arrays.asList(2, 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"); log.info("Ddj1Thread init");

12
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj2Thread.java
View File

@@ -46,10 +46,14 @@ public class Ddj2Thread extends BaseDdjThread {
ssjList.put("outSsj4", outSsj4); ssjList.put("outSsj4", outSsj4);
//初始化巷道口 排 列 层 //初始化巷道口 排 列 层
roadwayMap.put("L2001", Arrays.asList(3, 1, 1)); roadwayMap.put("L2003", Arrays.asList(3, 1, 1));
roadwayMap.put("L2002", Arrays.asList(4, 1, 1)); roadwayMap.put("L2004", Arrays.asList(4, 1, 1));
roadwayMap.put("L2007", Arrays.asList(3, 22, 1)); roadwayMap.put("L2009", Arrays.asList(3, 22, 1));
roadwayMap.put("L2008", Arrays.asList(4, 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"); log.info("Ddj2Thread init");

5
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj3Thread.java
View File

@@ -51,6 +51,11 @@ public class Ddj3Thread extends BaseDdjThread {
roadwayMap.put("L2011", Arrays.asList(5, 22, 1)); roadwayMap.put("L2011", Arrays.asList(5, 22, 1));
roadwayMap.put("L2012", Arrays.asList(6, 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"); log.info("Ddj3Thread init");
} }

3
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj4Thread.java
View File

@@ -41,6 +41,9 @@ public class Ddj4Thread extends BaseDdjThread {
roadwayMap.put("L1001", Arrays.asList(1, 1, 1)); roadwayMap.put("L1001", Arrays.asList(1, 1, 1));
roadwayMap.put("L1002", Arrays.asList(2, 1, 1)); roadwayMap.put("L1002", Arrays.asList(2, 1, 1));
roadwayRollback.put("L1001", 92);
roadwayRollback.put("L1002", 93);
log.info("Ddj4Thread init"); log.info("Ddj4Thread init");
} }

3
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj5Thread.java
View File

@@ -40,7 +40,8 @@ public class Ddj5Thread extends BaseDdjThread {
//初始化巷道口 排 列 层 //初始化巷道口 排 列 层
roadwayMap.put("L1003", Arrays.asList(1, 1, 1)); roadwayMap.put("L1003", Arrays.asList(1, 1, 1));
roadwayMap.put("L1004", Arrays.asList(2, 1, 1)); roadwayMap.put("L1004", Arrays.asList(2, 1, 1));
roadwayRollback.put("L1003", 94);
roadwayRollback.put("L1004", 95);
log.info("Ddj5Thread init"); log.info("Ddj5Thread init");
} }

2
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj6Thread.java
View File

@@ -40,6 +40,8 @@ public class Ddj6Thread extends BaseDdjThread {
//初始化巷道口 排 列 层 //初始化巷道口 排 列 层
roadwayMap.put("L1005", Arrays.asList(1, 1, 1)); roadwayMap.put("L1005", Arrays.asList(1, 1, 1));
roadwayMap.put("L1006", Arrays.asList(2, 1, 1)); roadwayMap.put("L1006", Arrays.asList(2, 1, 1));
roadwayRollback.put("L1003", 96);
roadwayRollback.put("L1004", 97);
log.info("Ddj6Thread init"); log.info("Ddj6Thread init");
} }