From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 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 2a998da..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,23 +24,15 @@
*
* @return
*/
- EdgStorageCage selectNearestEmpty(int currentSlot, boolean flag);
-
- List<EdgStorageCage> selectCacheEmpty();
+ 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();
/**
* 淇敼鐞嗙墖绗间俊鎭�
@@ -69,4 +62,5 @@
*/
EdgStorageCage getEdgStorageCageBySize(int deviceId, double width, double height, int slot);
+ void resetSlotRemainWidth(List<EdgSlotRemainVO> edgSlotRemainVOS);
}
--
Gitblit v1.8.0