From 38806c4ea2b4ad403d0b95addcdd73a61f530999 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 20 十二月 2024 13:41:39 +0800
Subject: [PATCH] Merge branch 'phyzasrs-erp' into phyzasrs-erp-4
---
src/main/java/com/zy/asrs/service/AgvBasDevpService.java | 6 +++++-
1 files changed, 5 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 635c785..dab9548 100644
--- a/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
@@ -12,7 +12,7 @@
public void initBasDevp();
- public void updateLocStsAndBarcodeByDevNo(String devNo, String locSts, String barcode);
+ public void updateLocStsAndBarcodeByDevNo(String devNo, String locSts, String barcode, Short containerType);
public Map<String, Object> getAgvBasDevpDtoByStationCode(String stationCode);
@@ -25,9 +25,13 @@
List<AgvBasDevp> getBasDevpByNoCacheShelves();
List<String> selectCacheShelvesStationCodeByFloor(int floor);
+ List<String> selectCacheShelvesStationCodeByLocType(short locType, int floor);
+ List<String> selectCacheShelvesStationCodeByLocType2(short locType, int floor);
public List<Map<String,Object>> selectDevNoAndNumBystationCode(String stationCode);
List<String> selectAllStationCode();
+ AgvBasDevp selectByDevNo(String devNo);
+
}
--
Gitblit v1.9.1