From d55b5b015eef8c31d9dea6587dc6fd0e02818cd1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 31 十月 2025 08:21:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
index fdd61c2..c6d42c2 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
@@ -92,9 +92,11 @@
* @param deviceId
* @param width
* @param height
+ * @param cell
+ * @param maxThickness
* @return
*/
- EdgStorageCageDetails queryEdgStorageDetailsBySize(int deviceId, int currentSlot, double width, double height);
+ EdgStorageCageDetails queryEdgStorageDetailsBySize(int deviceId, int currentSlot, double width, double height, int cell, int maxThickness);
/**
* 鎸夌収灏哄,绾胯矾銆佺嚎璺渶澶ф渶灏忓昂瀵歌幏鍙栫鍚堣姹傜殑鐜荤拑灏忕墖鏁版嵁
@@ -102,13 +104,16 @@
* @param deviceId
* @param width
* @param height
+ * @param maxThickness
* @return
*/
- EdgStorageCageDetails queryEdgStorageDetailsByLimitSize(int deviceId, Integer currentCell, double width, double height, int cell, int minOneFirstLength, int minOneSecondLength, int maxTwoFirstLength, int maxTwoSecondLength);
+ EdgStorageCageDetails queryEdgStorageDetailsByLimitSize(int deviceId, Integer currentCell, double width, double height, int cell, int minOneFirstLength, int minOneSecondLength, int maxTwoFirstLength, int maxTwoSecondLength, int maxThickness);
String edgDetailsOperate(DamageRequest request);
List<EdgSlotRemainVO> querySlotRemainWidth(int cellLength, int glassGap);
List<PieChartVO> queryPieChart();
+
+ Boolean identControlsByPatternSequence(DamageRequest request);
}
--
Gitblit v1.8.0