From 8b5b1811556bf9a9c95574276b2a93cb5099cec4 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 07 四月 2024 08:36:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack
---
zy-asrs-flow/public/model/03-1货架规格货物.fbx | 0
zy-asrs-flow/public/model/01.货架.fbx | 0
zy-asrs-flow/public/model/02.货架带托盘.fbx | 0
zy-asrs-flow/public/model/03-2货架不规则货物.fbx | 0
zy-asrs-flow/public/model/03-3货架木箱.fbx | 0
zy-asrs-flow/src/pages/map/utils.js | 20 +++++++++++++++++++-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MockScheduler.java | 20 +++++++++++++++++++-
7 files changed, 38 insertions(+), 2 deletions(-)
diff --git "a/zy-asrs-flow/public/model/01.\350\264\247\346\236\266.fbx" "b/zy-asrs-flow/public/model/01.\350\264\247\346\236\266.fbx"
new file mode 100644
index 0000000..dd0903d
--- /dev/null
+++ "b/zy-asrs-flow/public/model/01.\350\264\247\346\236\266.fbx"
Binary files differ
diff --git "a/zy-asrs-flow/public/model/02.\350\264\247\346\236\266\345\270\246\346\211\230\347\233\230.fbx" "b/zy-asrs-flow/public/model/02.\350\264\247\346\236\266\345\270\246\346\211\230\347\233\230.fbx"
new file mode 100644
index 0000000..138ba48
--- /dev/null
+++ "b/zy-asrs-flow/public/model/02.\350\264\247\346\236\266\345\270\246\346\211\230\347\233\230.fbx"
Binary files differ
diff --git "a/zy-asrs-flow/public/model/03-1\350\264\247\346\236\266\350\247\204\346\240\274\350\264\247\347\211\251.fbx" "b/zy-asrs-flow/public/model/03-1\350\264\247\346\236\266\350\247\204\346\240\274\350\264\247\347\211\251.fbx"
new file mode 100644
index 0000000..1663439
--- /dev/null
+++ "b/zy-asrs-flow/public/model/03-1\350\264\247\346\236\266\350\247\204\346\240\274\350\264\247\347\211\251.fbx"
Binary files differ
diff --git "a/zy-asrs-flow/public/model/03-2\350\264\247\346\236\266\344\270\215\350\247\204\345\210\231\350\264\247\347\211\251.fbx" "b/zy-asrs-flow/public/model/03-2\350\264\247\346\236\266\344\270\215\350\247\204\345\210\231\350\264\247\347\211\251.fbx"
new file mode 100644
index 0000000..0f7552c
--- /dev/null
+++ "b/zy-asrs-flow/public/model/03-2\350\264\247\346\236\266\344\270\215\350\247\204\345\210\231\350\264\247\347\211\251.fbx"
Binary files differ
diff --git "a/zy-asrs-flow/public/model/03-3\350\264\247\346\236\266\346\234\250\347\256\261.fbx" "b/zy-asrs-flow/public/model/03-3\350\264\247\346\236\266\346\234\250\347\256\261.fbx"
new file mode 100644
index 0000000..b78a522
--- /dev/null
+++ "b/zy-asrs-flow/public/model/03-3\350\264\247\346\236\266\346\234\250\347\256\261.fbx"
Binary files differ
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index f25e436..3188b8f 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -113,6 +113,17 @@
};
}
+export const querySprite = (type, no) => {
+ if (!mapContainer) {
+ return;
+ }
+ for (const sprite of mapContainer.children) {
+ if (sprite.data?.type === type && sprite.data?.no === no) {
+ return sprite;
+ }
+ }
+}
+
// show sprite feature from sprite click event
export const viewFeature = (sprite, setCurSPrite) => {
sprite.off('pointerup');
@@ -588,6 +599,13 @@
const mapVo = JSON.parse(data);
// shuttle
for (const shuttleVo of mapVo.shuttleVos) {
- console.log(shuttleVo);
+ const shuttle = querySprite(SENSOR_TYPE.SHUTTLE, shuttleVo.shuttleNo);
+ if (!shuttle && !shuttleVo.curLocNo) { continue; }
+ const { row, bay, lev } = parseLocNo(shuttleVo.curLocNo);
+ const shelf = querySprite(SENSOR_TYPE.SHELF, row + '-' + bay);
+ new TWEEDLE.Tween(shuttle.position).easing(TWEEDLE.Easing.Linear.None).to({
+ x: shelf.position.x,
+ y: shelf.position.y
+ }, 1000).start();
}
}
\ No newline at end of file
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 0bfef8e..9396a06 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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.zy.asrs.wcs.core.map.entity.MapWsShuttleVo;
import com.zy.asrs.wcs.core.map.entity.MapWsVo;
+import com.zy.asrs.wcs.core.utils.Utils;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -12,6 +13,10 @@
@Component
public class MockScheduler {
+ private int row = 1;
+ private int bay = 1;
+ private int lev = 1;
+
@Scheduled(cron = "0/1 * * * * ? ")
public void mock() {
MapWsVo wsVo = new MapWsVo();
@@ -19,7 +24,20 @@
// shuttle
MapWsShuttleVo shuttleVo = new MapWsShuttleVo();
shuttleVo.setShuttleNo("1");
- shuttleVo.setCurLocNo("1-1-1");
+
+
+ if (bay < 30) {
+ bay ++;
+ } else {
+ bay = 1;
+ if (row < 10) {
+ row ++;
+ } else {
+ row = 1;
+ }
+ }
+
+ shuttleVo.setCurLocNo(Utils.getLocNo(row, bay, lev));
wsVo.getShuttleVos().add(shuttleVo);
MapWebSocket.broadcast(JSON.toJSONString(wsVo));
--
Gitblit v1.9.1