From d58092aced22e65141938c81aebd55dbfad5bde7 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 24 四月 2024 00:14:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java | 12 ++++++------
src/main/java/com/zy/asrs/controller/AgvMapController.java | 9 +++++----
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMapController.java b/src/main/java/com/zy/asrs/controller/AgvMapController.java
index 5f1da7b..2ef1a0e 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMapController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMapController.java
@@ -73,10 +73,10 @@
//y = generateMap2Bay(bay);
}
////3妤�
- //if(floor == 3){
- // y = generateMap3Row(row);
- // x = generateMap3Bay(bay);
- //}
+ if(floor == 3){
+ y = generateMap3Row(row);
+// x = generateMap3Bay(bay);
+ }
ArrayList rowData = arrayLists.get(x);
Object o = rowData.get(y);
@@ -127,6 +127,7 @@
x ++;
}
}
+ if(row >9) x += 9;
return x;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
index ea016b6..fa0dad3 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
@@ -129,7 +129,7 @@
return false;
}
- if(row <= 6 && bay >= 29){
+ if(row <= 6 && bay >= 30){
return false;
}
@@ -140,13 +140,13 @@
return false;
}
- if(row <= 21 && bay >= 33){
+ if(row <= 21 && row != 7 && row != 8 && bay >= 33){
return false;
}
- if(row <= 24 && bay >= 34){
+ if((row <= 24 && row != 7 && row != 8) && bay >= 34){
return false;
}
- if(row <= 26 && bay >= 29){
+ if(row >= 25 && row <= 26 && bay >= 29){
return false;
}
@@ -155,7 +155,7 @@
return false;
}
- if((row != 22 && row != 23 && row != 24 && row != 25 ) && bay == 16){
+ if((row >= 22 && row != 26 ) && bay == 16){
return false;
}
@@ -183,7 +183,7 @@
return 2;
}
- if(row <= 18 && bay <= 8){
+ if(row <= 18 && bay >= 9){
return 2;
}
--
Gitblit v1.9.1