From 4660b2e57c53fa6b798c104abbe4a6b0ad4b6a97 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 18:50:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzwms2' into phyzwms2
---
src/main/java/com/zy/asrs/service/AgvBasDevpService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/AgvBasDevpService.java b/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
index a55f78e..dab9548 100644
--- a/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
@@ -25,7 +25,8 @@
List<AgvBasDevp> getBasDevpByNoCacheShelves();
List<String> selectCacheShelvesStationCodeByFloor(int floor);
- List<String> selectCacheShelvesStationCodeByLocType(short locType);
+ List<String> selectCacheShelvesStationCodeByLocType(short locType, int floor);
+ List<String> selectCacheShelvesStationCodeByLocType2(short locType, int floor);
public List<Map<String,Object>> selectDevNoAndNumBystationCode(String stationCode);
--
Gitblit v1.9.1