From 6f088dc1cb716e345da064a5e89f148bd248c75d Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 30 四月 2024 10:54:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
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..3e4ee35 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;
}
@@ -313,9 +313,9 @@
}
@Override
- public AgvLocMast selectEmptyZpallet(int type) {
+ public AgvLocMast selectEmptyZpallet(int type, int floor) {
- return this.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_sts","D").eq("loc_type2",type));
+ return this.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_sts","D").eq("loc_type2",type).eq("floor",floor));
}
--
Gitblit v1.9.1