From c253255495465d4406fcaddeb7be40d15fce290a Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 21 三月 2024 13:00:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs
---
src/main/java/com/zy/asrs/controller/AgvMapController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMapController.java b/src/main/java/com/zy/asrs/controller/AgvMapController.java
index 0fb729b..b1f74bf 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMapController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMapController.java
@@ -58,7 +58,7 @@
List<AgvLocMast> locMasts = agvLocMastService.selectLocByLevAndFloor(lev,floor);
for (AgvLocMast locMast : locMasts) {
Integer row = locMast.getRow1();
- Integer bay = locMast.getBay1();
+ Integer bay = 34 - locMast.getBay1();
int x = bay;
@@ -74,8 +74,8 @@
// x = generateMap3Bay(bay);
//}
- ArrayList rowData = arrayLists.get(y);
- Object o = rowData.get(x);
+ ArrayList rowData = arrayLists.get(x);
+ Object o = rowData.get(y);
JSONObject jsonObject = JSON.parseObject(o.toString());
jsonObject.put("value","0");
--
Gitblit v1.9.1