From ea8859c58b8fd24a54f7a838d6f8eaa98d57fb65 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 18 十二月 2024 11:44:07 +0800
Subject: [PATCH] 1、大理片笼进出片任务新增限制:进片玻璃数大于可用格子时,不允许进片 2、超过最大尺寸且直通通道有玻璃时 不能进片 3、大理片超过最大高度走直通通道 4、fixbug:笼子厚度限制
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java | 63 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 11 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 008cd26..2a998da 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,31 +1,72 @@
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> {
- //鏌ヨ绗煎唴绌烘牸
- List<Map> selectCacheEmpty();
+ /**
+ * 鏌ヨ绗煎唴绂绘寚瀹氭牸瀛愭渶杩戠┖鏍�
+ * flag :鏄惁涓虹洿閫�
+ *
+ * @return
+ */
+ EdgStorageCage selectNearestEmpty(int currentSlot, boolean flag);
- //鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏
- List<Map> selectCacheOut();
+ List<EdgStorageCage> selectCacheEmpty();
- //鏌ヨ绗煎唴璇︽儏
- List<Map> selectEdgStorageCages();
+ /**
+ * 鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏
+ *
+ * @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);
+
}
--
Gitblit v1.8.0