From ce7423ed32c2a427fe508909c41b9cd0dbfd2f58 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 20 一月 2025 15:18:26 +0800
Subject: [PATCH] Merge branch 'phyzasrs-erp' into phyzasrs-erp-4
---
src/main/java/com/zy/asrs/service/AgvBasDevpService.java | 4 +++-
1 files changed, 3 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 a4aea20..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,6 +25,8 @@
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);
--
Gitblit v1.9.1