From d7765b799489db445388e528044ab3b2bd2e649e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 12 六月 2025 08:22:57 +0800
Subject: [PATCH] 钢化模块modbus和S7改造
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 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 4fbbbed..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>
@@ -19,35 +20,47 @@
/**
* 鏌ヨ绗煎唴绂绘寚瀹氭牸瀛愭渶杩戠┖鏍�
+ * flag :鏄惁涓虹洿閫�
+ *
* @return
*/
- EdgStorageCage selectNearestEmpty(int currentSlot);
+ EdgStorageCage selectNearestEmpty(Integer currentCell, int deviceId, boolean flag);
/**
- * 鏌ヨ绗煎唴绌烘牸
+ * 鎸夌収璁惧鍙疯繑鍥炲搴旂殑绗煎唴璇︽儏鏁版嵁
+ * @param deviceId
* @return
*/
- List<EdgStorageCage> selectCacheEmpty();
+ List<EdgStorageCageVO> selectEdgStorageCagesByDeviceId(int deviceId);
- /**
- * 鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏
- * @return
- */
- List<Map<String, Object>> selectCacheOut();
-
- /**
- * 鏌ヨ绗煎唴璇︽儏
- * @return
- */
- List<Map<String, Object>> selectEdgStorageCages();
/**
* 淇敼鐞嗙墖绗间俊鎭�
+ *
* @param edgStorageCage
* @return
*/
boolean updateEdgStorageCage(EdgStorageCage edgStorageCage);
+ /**
+ * 鏇存柊鐞嗙墖绗艰鎯呬俊鎭�
+ *
+ * @param edgStorageCageId
+ * @param edgStorageCageDetails
+ * @return
+ */
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