From 13bdad370f0b35b68f79a75f8183a23135e45225 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期二, 15 七月 2025 17:03:10 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java index 7adeaaa..a3f6339 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java @@ -253,12 +253,12 @@ } private void setFlagForAgvBasDevpDto(AgvWrkMast agvWrkMast, AgvBasDevpDto agvBasDevpDto){ - //褰撳伐浣滄。绫诲瀷涓�101.鍑哄簱 骞朵笖 宸ヤ綔浣嶇姸鎬佷负F.鍦ㄥ簱鏃讹紝鏄剧ず瀹瑰櫒绂诲満鎸夐挳 + //褰撳伐浣滄。绫诲瀷涓�101.鍑哄簱 骞朵笖 宸ヤ綔浣嶇姸鎬佷负F.鍦ㄥ簱鏃讹紝鏄剧ず璐ф灦绂诲満鎸夐挳 if(agvWrkMast.getIoType() == 101 && "F".equals(agvBasDevpDto.getLocSts())){ agvBasDevpDto.setContainerMoveOutFlag(true); } - //褰撳伐浣滄。绫诲瀷涓�101.鍑哄簱 骞朵笖 宸ヤ綔浣嶇姸鎬佷负F.鍦ㄥ簱鏃讹紝鏄剧ず瀹瑰櫒绂诲満鎸夐挳 + //褰撳伐浣滄。绫诲瀷涓�101.鍑哄簱 骞朵笖 宸ヤ綔浣嶇姸鎬佷负F.鍦ㄥ簱鏃讹紝鏄剧ず璐ф灦绂诲満鎸夐挳 if(agvWrkMast.getIoType() == 110 && "D".equals(agvBasDevpDto.getLocSts())){ agvBasDevpDto.setContainerMoveOutFlag(true); } @@ -300,8 +300,18 @@ } @Override + public List<String> selectCacheShelvesStationCodeByLocType(short locType, int floor) { + return this.baseMapper.selectCacheShelvesStationCodeByLocType(locType,floor); + } + + @Override public List<String> selectCacheShelvesStationCodeByLocType(short locType) { - return this.baseMapper.selectCacheShelvesStationCodeByLocType(locType); + return this.baseMapper.selectCacheShelvesStationCodeByLocTypeV2(locType); + } + + @Override + public List<String> selectCacheShelvesStationCodeByLocType2(short locType, int floor) { + return this.baseMapper.selectCacheShelvesStationCodeByLocType2(locType,floor); } public List<Map<String,Object>> selectDevNoAndNumBystationCode(String stationCode){ -- Gitblit v1.9.1