From 1c4833bb2e8c1bccd96038c339d114393f82e97c Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期六, 11 五月 2024 16:50:36 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java | 40 +++++++++++++++++++++++++++++++--------- 1 files changed, 31 insertions(+), 9 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java index 5d2f575..a9d0721 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java @@ -1,7 +1,8 @@ package com.mes.edgstoragecage.service; -import com.baomidou.mybatisplus.extension.service.IService; +import com.github.yulichang.base.MPJBaseService; import com.mes.edgstoragecage.entity.EdgStorageCage; +import com.mes.edgstoragecage.entity.EdgStorageCageDetails; import java.util.List; import java.util.Map; @@ -14,17 +15,38 @@ * @author zhoush * @since 2024-04-07 */ -public interface EdgStorageCageService extends IService<EdgStorageCage> { +public interface EdgStorageCageService extends MPJBaseService<EdgStorageCage> { - //鏌ヨ绗煎唴绌烘牸 - List<Map> selectCacheEmpty(); + /** + * 鏌ヨ绗煎唴绂绘寚瀹氭牸瀛愭渶杩戠┖鏍� + * @return + */ + EdgStorageCage selectNearestEmpty(int currentSlot); - //鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏 - List<Map> selectCacheOut(); + /** + * 鏌ヨ绗煎唴绌烘牸 + * @return + */ + List<EdgStorageCage> selectCacheEmpty(); - //鏌ヨ绗煎唴璇︽儏 - List<Map> selectEdgStorageCages(); + /** + * 鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏 + * @return + */ + List<Map<String, Object>> selectCacheOut(); - //淇敼鐞嗙墖绗煎唴淇℃伅 + /** + * 鏌ヨ绗煎唴璇︽儏 + * @return + */ + List<Map<String, Object>> selectEdgStorageCages(); + + /** + * 淇敼鐞嗙墖绗间俊鎭� + * @param edgStorageCage + * @return + */ boolean updateEdgStorageCage(EdgStorageCage edgStorageCage); + + boolean updateEdgStorageCageDetails(int edgStorageCageId, EdgStorageCageDetails edgStorageCageDetails); } -- Gitblit v1.8.0