From fa9329c3a9aa5c57c66cb3906d2418bdf2a393a7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 16:28:17 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapWsShuttleVo.java | 2 +-
zy-asrs-flow/src/pages/map/utils.js | 7 ++++---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MockScheduler.java | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 553aace..bbf26ab 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -44,6 +44,7 @@
export const SENSOR_ZINDEX = Object.freeze({
SHELF: 1,
POINT: 1,
+ TRAVEL_PATH: 80,
SHUTTLE: 100,
AGV: 100,
})
@@ -630,13 +631,13 @@
// shuttleVo
for (const shuttleVo of mapVo.shuttleVos) {
// path
- drawPreTravelPath(shuttleVo.preTravelPath, shuttleVo.shuttleNo, curFloor);
+ drawTravelPath(shuttleVo.travelPath, shuttleVo.shuttleNo, curFloor);
// shuttle
showShuttle(shuttleVo.shuttleNo, shuttleVo.curLocNo, curFloor, setCurSPrite);
}
}
-export const drawPreTravelPath = (path, shuttleNo, curFloor) => {
+export const drawTravelPath = (path, shuttleNo, curFloor) => {
if (!mapContainer) {
return;
}
@@ -647,7 +648,7 @@
pathLine = new PIXI.Graphics();
pathLine.name = pathLineName;
pathLine.lineStyle(3 * (1 / mapContainer.scale.x), 0x3498db, 1);
- pathLine.zIndex = 9999;
+ pathLine.zIndex = SENSOR_ZINDEX.TRAVEL_PATH;
let firstNode = true;
for (let i = 0; i < path.length; i++) {
const { row, bay, lev } = parseLocNo(path[i]);
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapWsShuttleVo.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapWsShuttleVo.java
index ce19963..52afaec 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapWsShuttleVo.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapWsShuttleVo.java
@@ -15,6 +15,6 @@
private String curLocNo;
- private List<String> preTravelPath = new ArrayList<>();
+ private List<String> travelPath = new ArrayList<>();
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MockScheduler.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MockScheduler.java
index 03ba0d5..aa771de 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MockScheduler.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MockScheduler.java
@@ -60,7 +60,7 @@
shuttleVo.setCurLocNo(Utils.getLocNo(row, bay, lev));
List<String> preTravelPath = generateFullTravelPath(10, 30, lev);
- shuttleVo.setPreTravelPath(preTravelPath);
+ shuttleVo.setTravelPath(preTravelPath);
wsVo.getShuttleVos().add(shuttleVo);
--
Gitblit v1.9.1