From 6298f178c71f1eb95d4066ffe88d4becd6fc6bfc Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 11 七月 2024 08:34:42 +0800
Subject: [PATCH] #MES上报

---
 src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java |   17 +++++++++++++++--
 1 files changed, 15 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..6fcda28 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
@@ -21,8 +21,21 @@
     @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'")
+    @Select("SELECT\n" +
+            "\tdev_no \n" +
+            "FROM\n" +
+            "\tagv_bas_devp\n" +
+            "\tLEFT JOIN agv_wrk_mast ON agv_bas_devp.dev_no = agv_wrk_mast.loc_no \n" +
+            "WHERE\n" +
+            "\tagv_wrk_mast.loc_no IS NULL \n" +
+            "\tAND agv_bas_devp.loc_type1 = #{locType} \n" +
+            "\tAND agv_bas_devp.floor = #{floor} \n" +
+            "\tAND agv_bas_devp.out_enable = 'Y'")
+    List<String> selectCacheShelvesStationCodeByLocType(@Param("locType") Short locType, @Param("floor") int floor);
 
     @Select("SELECT\n" +
             "\tbas.dev_no,\n" +
@@ -38,6 +51,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