From 04406757acdcf5cca2215adc390bca42ccd8bf3a Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 07 二月 2025 14:58:04 +0800
Subject: [PATCH] Merge branch 'phyzasrs-erp' into phyzasrs-erp-4

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

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index b815fa0..fbf95e5 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -109,6 +109,7 @@
 
         List<AgvLocDetl> agvLocDetls = this.selectList(wrapper);
 
+
         for (AgvLocDetl agvLocDetl : agvLocDetls) {
             //鍒ゆ柇褰撳墠搴撲綅璐х墿鏄惁F鍦ㄥ簱
             AgvLocMast agvLocMast = agvLocMastService.selectById(agvLocDetl.getLocNo());
@@ -133,7 +134,9 @@
                 //褰撳墠搴撲綅鎵�澶勬ゼ灞�
                 int floor = Integer.parseInt(agvLocDetl.getLocNo().split("F")[1]);
                 //locDto.setAgvStaNos(queryAgvStaNosByFloor(floor));
-                locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(), floor));
+                //鍥涙湡
+                //locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(), floor));
+                locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1()));
                 locDtoList.add(locDto);
 
                 issued -= anfme;

--
Gitblit v1.9.1