From d5f8b5d8d5308de3a70b0ad43d2dbe053eb12826 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 22 十二月 2025 11:39:08 +0800
Subject: [PATCH] 1、流程卡进度查询按玻璃id查询时增加工程添加 2、中空线历史任务添加除膜膜系显示 3、队列信息增加格子号显示
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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 811f058..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
@@ -1,9 +1,11 @@
package com.mes.edgstoragecage.service;
+import cn.hutool.json.JSONObject;
import com.github.yulichang.base.MPJBaseService;
import com.mes.damage.entity.request.DamageRequest;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
-import com.mes.edgstoragecage.entity.vo.CutDrawingVO;
+import com.mes.edgstoragecage.entity.vo.EdgSlotRemainVO;
+import com.mes.largenscreen.entity.PieChartVO;
import java.util.List;
import java.util.Map;
@@ -24,7 +26,7 @@
* @param stationCell
* @return
*/
- List<CutDrawingVO> queryCurrentCutDrawing(int deviceId, int stationCell);
+ JSONObject queryCurrentCutDrawing(int deviceId, int stationCell);
/**
* 鎸夌収宸ョ▼id鍙婄増搴忚幏鍙栧垏鍓茬増鍥� 榛樿鐗堝簭涓�1
@@ -90,9 +92,28 @@
* @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);
+
+ /**
+ * 鎸夌収灏哄,绾胯矾銆佺嚎璺渶澶ф渶灏忓昂瀵歌幏鍙栫鍚堣姹傜殑鐜荤拑灏忕墖鏁版嵁
+ *
+ * @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, int maxThickness);
String edgDetailsOperate(DamageRequest request);
+
+ List<EdgSlotRemainVO> querySlotRemainWidth(int cellLength, int glassGap);
+
+ List<PieChartVO> queryPieChart();
+
+ Boolean identControlsByPatternSequence(DamageRequest request);
}
--
Gitblit v1.8.0