From 2bc10d832acd06bc6511e50405202fde99b0e7c2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 18 一月 2025 10:20:25 +0800
Subject: [PATCH] java 优化库位检索逻辑,添加AGV工作明细服务,修复定时任务

---
 src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java b/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
index e17d619..885fb64 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
@@ -33,8 +33,21 @@
             "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);
+    List<String> selectCacheShelvesStationCodeByLocType(@Param("locType") Short locType, @Param("floor") int floor);
+
+    @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.source_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> selectCacheShelvesStationCodeByLocType2(@Param("locType") Short locType, @Param("floor") int floor);
 
     @Select("SELECT\n" +
             "\tbas.dev_no,\n" +

--
Gitblit v1.9.1