From 671fb92246c499da1e655787bf8133b209ba7fad Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期二, 18 六月 2024 16:55:33 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java index 1327452..38e5f48 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java @@ -1,11 +1,13 @@ package com.mes.downstorage.service; +import com.github.yulichang.base.MPJBaseService; import com.mes.downstorage.entity.DownStorageCageDetails; +import com.mes.glassinfo.entity.GlassInfo; import java.util.List; import java.util.Map; -public interface DownStorageCageDetailsService { +public interface DownStorageCageDetailsService extends MPJBaseService<DownStorageCageDetails> { /** * @return //娣诲姞鐞嗙墖绗煎唴淇℃伅 */ @@ -44,11 +46,17 @@ * @param end * @return log.info(" 鍗曠墖鎯呭喌鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓уぇ灏忓嚭鐗�, 骞朵笖浼樺厛鍑烘弧鏋剁殑灏忕墖 "); */ - List<DownStorageCageDetails> CacheOut(int start, int end); + /** - * @return 鏌ヨ绌烘牸瀛� + * @return 鍑虹墖 */ - // List<DownStorageCageDetails> selectCacheEmpty2(); + List<DownStorageCageDetails> CacheOut1(int start, int end); + + + /** + * @return 鐩撮�氭煡璇� + */ + List<GlassInfo> DirectConnection(); } -- Gitblit v1.8.0