From fbdad64fe45fa120beb4332e7a3615856d05ab96 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 06 三月 2025 18:20:05 +0800
Subject: [PATCH] 四期

---
 src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 0aec48a..48d963c 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -580,7 +580,7 @@
                 }
             } else {
                 if (station.endsWith("F4") && locType == 3) {
-                    agvLocMast = agvCommonService.getLocNo(locType, 1, false, false);
+                    agvLocMast = agvCommonService.getLocNoOnXiSuer(locType, 1);
                 } else {
                     List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1"));
                     if (Integer.parseInt(config.getValue()) <= agvWrkMasts.size()) {
@@ -741,7 +741,8 @@
 //                    //agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
 //                }
 //            }
-            agvLocMast = agvCommonService.getLocByLocRule(3, 1, code);
+            // 棰勭暀20涓簱浣�
+            agvLocMast = agvCommonService.getLocByLocRule20(3, 1, code,false);
 
 
             String devNo = agvBasDevp.getDevNo();

--
Gitblit v1.9.1