From 7e5796e4813bb1f4d2696a0fd05f408147c3b96e Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期三, 11 六月 2025 15:16:01 +0800 Subject: [PATCH] 所有项目必填判断 --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 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 cd22d48..2c89397 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 @@ -3,9 +3,10 @@ import com.github.yulichang.base.MPJBaseService; import com.mes.edgstoragecage.entity.EdgStorageCage; import com.mes.edgstoragecage.entity.EdgStorageCageDetails; +import com.mes.edgstoragecage.entity.vo.EdgSlotRemainVO; +import com.mes.edgstoragecage.entity.vo.EdgStorageCageVO; import java.util.List; -import java.util.Map; /** * <p> @@ -23,20 +24,15 @@ * * @return */ - EdgStorageCage selectNearestEmpty(int currentSlot, boolean flag); - + EdgStorageCage selectNearestEmpty(Integer currentCell, int deviceId, boolean flag); /** - * 鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏 + * 鎸夌収璁惧鍙疯繑鍥炲搴旂殑绗煎唴璇︽儏鏁版嵁 + * @param deviceId * @return */ - List<Map<String, Object>> selectCacheOut(); + List<EdgStorageCageVO> selectEdgStorageCagesByDeviceId(int deviceId); - /** - * 鏌ヨ绗煎唴璇︽儏 - * @return - */ - List<Map<String, Object>> selectEdgStorageCages(); /** * 淇敼鐞嗙墖绗间俊鎭� @@ -55,4 +51,16 @@ */ boolean updateEdgStorageCageDetails(int edgStorageCageId, EdgStorageCageDetails edgStorageCageDetails); + /** + * 鐩稿悓灏哄鍙互鏀句笅鐨勬牸瀛� + * + * @param deviceId + * @param width + * @param height + * @param slot + * @return + */ + EdgStorageCage getEdgStorageCageBySize(int deviceId, double width, double height, int slot); + + void resetSlotRemainWidth(List<EdgSlotRemainVO> edgSlotRemainVOS); } -- Gitblit v1.8.0