From 2832d39ad91a6de161bf9b8f8e3307bf6bc7fb65 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 10 四月 2024 23:41:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs
---
src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java b/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
index d474beb..9397864 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
@@ -21,8 +21,11 @@
@Select("select dev_no from agv_bas_devp where loc_sts = 'O'")
List<String> getAvailableEmptyInSite();
- @Select("select station_code from agv_bas_devp where floor = #{floor} and cache_shelves = 'Y' group by station_code")
+ @Select("select station_code from agv_bas_devp where cache_shelves = 'N' and in_enable = 'Y' group by station_code")
List<String> selectCacheShelvesStationCodeByFloor(@Param("floor") int floor);
+
+ @Select("select dev_no from agv_bas_devp where loc_type1 = #{locType} and out_enable = 'Y'")
+ List<String> selectCacheShelvesStationCodeByLocType(@Param("locType") Short locType);
@Select("SELECT\n" +
"\tbas.dev_no,\n" +
@@ -38,6 +41,6 @@
"\tnum")
List<Map<String,Object>> selectDevNoAndNumBystationCode(@Param("stationCode") String stationCode);
- @Select("select station_code from agv_bas_devp group by station_code ")
+ @Select("select station_code from agv_bas_devp group by station_code")
List<String> selectAllStationCode();
}
--
Gitblit v1.9.1