From ab14726215678ac69adfeafbd845ebc5b0776ea2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:56:41 +0800
Subject: [PATCH] 优化订单同步逻辑及库位查找
---
src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 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 f2aee4b..885fb64 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
@@ -24,8 +24,30 @@
@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}")
- List<String> selectCacheShelvesStationCodeByLocType(@Param("locType") Short locType);
+ //@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" +
+ "\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