From df88dca7312e0a25d1e495e7bded5488f923514d Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 16 五月 2024 17:25:16 +0800
Subject: [PATCH] # 手动调拨
---
src/main/java/com/zy/asrs/controller/AgvMapController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMapController.java b/src/main/java/com/zy/asrs/controller/AgvMapController.java
index 2ef1a0e..d5f4367 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMapController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMapController.java
@@ -68,6 +68,10 @@
int x = bay;
int y = row;
//2妤�
+ if(floor == 1){
+ x = generateMap1Bay(bay);
+ }
+ //2妤�
if(floor == 2){
y = generateMap2Row(row);
//y = generateMap2Bay(bay);
@@ -92,6 +96,18 @@
}
return JSONObject.toJSONString(arrayLists);
+ }
+ private Integer generateMap1Bay(int bay){
+ int y = bay;
+ Integer[] bayAdd = {1,3,5,7,9,11,13,15,17,19};
+ for(int i=0; i<bayAdd.length; i++){
+ if(bay > bayAdd[i]){
+ y ++;
+ }
+ }
+
+ return y;
+
}
private Integer generateMap2Row(int row){
@@ -121,13 +137,13 @@
private Integer generateMap3Row(int row){
int x = row;
- Integer[] rowAdd = {2,4,6,7,8,10,12,13,15,17,19,21,23,24,26,28,30,32};
+ Integer[] rowAdd = {2,4,6,8,10,12,14,15,17,19,21,22,24,26,28,30,32};
for(int i=0; i<rowAdd.length; i++){
if(row >= rowAdd[i]){
x ++;
}
}
- if(row >9) x += 9;
+ if(row >8) x += 9;
return x;
}
--
Gitblit v1.9.1