From 78ff74dfc9c42ee12993ac01c43063d0432231e3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 20 十二月 2024 15:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs-erp-4' into phyzasrs-erp-4
---
src/main/java/com/zy/common/service/AgvCommonService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index e7aded0..b3b3a6a 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -114,7 +114,13 @@
try{
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
- locMast = getLocNoRule(type,floor,isEmpty,isCurrLev);
+ //濡傛灉鏄崐鎴愬搧绠卞３
+ if (type == 6) {
+
+ }else {
+ //涓嶅姩杩欎釜閫昏緫
+ locMast = getLocNoRule(type,floor,isEmpty,isCurrLev);
+ }
if (locMast != null) {
return locMast;
}
--
Gitblit v1.9.1