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/EdgStorageCageDetailsService.java | 10 ++++++++--
1 files changed, 8 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 d8be128..43d2024 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
@@ -9,7 +9,7 @@
/**
* <p>
- * 鏈嶅姟绫�
+ * 鏈嶅姟绫�
* </p>
*
* @author zhoush
@@ -21,18 +21,22 @@
/**
* 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
+ *
* @return
*/
List<Map<String, Object>> selectCutTerritory();
/**
* 鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
+ *
* @param current
* @return
*/
List<List<Map<String, Object>>> selectCurrentCutTerritory(String current);
+
/**
* 鑾峰彇 宸ョ▼涓嬬殑閽㈠寲鐗堝浘
+ *
* @param current
* @return
*/
@@ -40,6 +44,7 @@
/**
* 鏌ヨ绗煎唴鐗堝浘宸�艰寖鍥村唴鐨� 姝ゅ昂瀵哥幓鐠� 濡傛棤鍒欐寜鐓� 閽㈠寲鐗堝浘搴忓彿 浠ュ強鐜荤拑搴忓彿
+ *
* @param glassId
* @param threshold
* @return
@@ -82,9 +87,10 @@
/**
* 鎸夌収灏哄
*
+ * @param deviceId
* @param width
* @param height
* @return
*/
- EdgStorageCageDetails queryEdgStorageDetailsBySize(double width, double height);
+ EdgStorageCageDetails queryEdgStorageDetailsBySize(int deviceId, int currentSlot, double width, double height);
}
--
Gitblit v1.8.0