From 33308e16bbb153d9aac76fd703ec0f38ea7e344a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 09 十月 2024 15:47:59 +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 |   53 +++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 37 insertions(+), 16 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 d49d07e..73b2bd4 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,37 +1,58 @@
 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.glassinfo.entity.GlassInfo;
+import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
 
 import java.util.List;
 import java.util.Map;
 
 /**
  * <p>
- *  鏈嶅姟绫�
+ * 鏈嶅姟绫�
  * </p>
  *
  * @author zhoush
  * @since 2024-04-07
  */
-public interface EdgStorageCageService extends IService<EdgStorageCage> {
+public interface EdgStorageCageService extends MPJBaseService<EdgStorageCage> {
 
-    //鏌ヨ绗煎唴绌烘牸
+    /**
+     * 鏌ヨ绗煎唴绂绘寚瀹氭牸瀛愭渶杩戠┖鏍�
+     * flag :鏄惁涓虹洿閫�
+     *
+     * @return
+     */
+    EdgStorageCage selectNearestEmpty(int currentSlot, boolean flag);
+
     List<EdgStorageCage> selectCacheEmpty();
+    /**
+     * 鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏
+     * @return
+     */
+    List<Map<String, Object>> selectCacheOut();
 
-    //鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏
-    List<EdgStorageCage> selectCacheOut();
+    /**
+     * 鏌ヨ绗煎唴璇︽儏
+     * @return
+     */
+    List<Map<String, Object>> selectEdgStorageCages();
 
-    //鏌ヨ绗煎唴璇︽儏
-    List<Map> selectCacheInfos();
+    /**
+     * 淇敼鐞嗙墖绗间俊鎭�
+     *
+     * @param edgStorageCage
+     * @return
+     */
+    boolean updateEdgStorageCage(EdgStorageCage edgStorageCage);
 
-    //娣诲姞鐞嗙墖绗间俊鎭�  浼犲叆glassid
-    boolean insertCacheInfo(String glassid);
+    /**
+     * 鏇存柊鐞嗙墖绗艰鎯呬俊鎭�
+     *
+     * @param edgStorageCageId
+     * @param edgStorageCageDetails
+     * @return
+     */
+    boolean updateEdgStorageCageDetails(int edgStorageCageId, EdgStorageCageDetails edgStorageCageDetails);
 
-    //淇敼鐞嗙墖绗煎唴淇℃伅
-    boolean updateCacheInfo(String cacheId);
-
-    //鍒犻櫎鐞嗙墖绗煎唴淇℃伅
-    boolean deleteCacheInfo(String cacheId);
 }

--
Gitblit v1.8.0