From 9d2d63ee09e8bcf494fc3fd14a48d82731fac9ef Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 24 四月 2024 09:14:38 +0800
Subject: [PATCH] 根据楼层入库出库
---
src/main/java/com/zy/common/service/AgvCommonService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index b362b5b..ccf1f43 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -71,7 +71,7 @@
* 妫�绱㈠簱浣嶅彿
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public AgvLocMast getLocNo(int type) {
+ public AgvLocMast getLocNo(int type, int floor) {
// 鐩爣搴撲綅
AgvLocMast locMast = null;
// if(Cools.isEmpty(agvWaitPakinList)){
@@ -110,7 +110,7 @@
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
- locMast = getLocNoRule(type);
+ locMast = getLocNoRule(type,floor);
if (locMast != null) {
return locMast;
}
@@ -227,9 +227,10 @@
}
//闅忔満鍙栦竴涓揣浣�
- private AgvLocMast getLocNoRule(int type){
+ private AgvLocMast getLocNoRule(int type,int floor){
return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
.eq("loc_sts","O")
+ .eq("floor",floor)
.eq("loc_type1",type));
}
--
Gitblit v1.9.1