From d940d0b4c0e7d6fcebfb0fea2bed1c514e1f796f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 01 七月 2024 14:35:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 a8309dc..f52662f 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,8 +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;
@@ -18,27 +18,38 @@
public interface EdgStorageCageService extends MPJBaseService<EdgStorageCage> {
/**
+ * 鏌ヨ绗煎唴绂绘寚瀹氭牸瀛愭渶杩戠┖鏍�
+ * flag :鏄惁涓虹洿閫�
+ *
+ * @return
+ */
+ EdgStorageCage selectNearestEmpty(int currentSlot, boolean flag);
+
+ /**
* 鏌ヨ绗煎唴绌烘牸
* @return
*/
- List<Map> selectCacheEmpty();
+ List<EdgStorageCage> selectCacheEmpty();
/**
* 鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏
* @return
*/
- List<Map> selectCacheOut();
+ List<Map<String, Object>> selectCacheOut();
/**
* 鏌ヨ绗煎唴璇︽儏
* @return
*/
- List<Map> selectEdgStorageCages();
+ List<Map<String, Object>> selectEdgStorageCages();
/**
- * 淇敼鐞嗙墖绗煎唴淇℃伅
+ * 淇敼鐞嗙墖绗间俊鎭�
* @param edgStorageCage
* @return
*/
boolean updateEdgStorageCage(EdgStorageCage edgStorageCage);
+
+ boolean updateEdgStorageCageDetails(int edgStorageCageId, EdgStorageCageDetails edgStorageCageDetails);
+
}
--
Gitblit v1.8.0