From eaf25c57276ebaf28141418199c92e9502884ccf Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 09 三月 2025 23:51:28 +0800
Subject: [PATCH] 1、原片仓储新增任务完成/任务失败接口供用户异常情况恢复处理 2、原片仓储新增历史任务查询按钮 3、卧式理片新增任务完成/任务失败接口供用户异常情况恢复处理 4、大理片笼临时修改：10mm及以上厚度的玻璃走直通任务，厚度可按照实际情况进行配置 5、fixbug:中空理片笼10mm厚度玻璃进入理片笼小格子异常问题查询，同一个流程卡同一层出现2种厚度，导致厚度赋值异常，目前已改为查询最后一次导入的为准
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 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 43d2024..3fc8538 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,8 +1,10 @@
package com.mes.edgstoragecage.service;
import com.github.yulichang.base.MPJBaseService;
-import com.mes.edgglasstask.entity.request.IdentWornRequest;
+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 java.util.List;
import java.util.Map;
@@ -17,22 +19,21 @@
*/
public interface EdgStorageCageDetailsService extends MPJBaseService<EdgStorageCageDetails> {
-// boolean identWorn(Map<String, Object> arguments);
-
/**
- * 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
- *
+ * 鎸夌収璁惧鍙婄嚎璺紝鑾峰彇褰撳墠绾胯矾姝ｅ湪鍒囧壊鐨勭増鍥句俊鎭�
+ * @param deviceId
+ * @param stationCell
* @return
*/
- List<Map<String, Object>> selectCutTerritory();
+ List<CutDrawingVO> queryCurrentCutDrawing(int deviceId, int stationCell);
/**
- * 鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
- *
- * @param current
+ * 鎸夌収宸ョ▼id鍙婄増搴忚幏鍙栧垏鍓茬増鍥� 榛樿鐗堝簭涓�1
+ * @param engineerId
+ * @param patternSequence
* @return
*/
- List<List<Map<String, Object>>> selectCurrentCutTerritory(String current);
+ Map<String, Object> queryCutDrawingByEngineerId(String engineerId, int patternSequence);
/**
* 鑾峰彇 宸ョ▼涓嬬殑閽㈠寲鐗堝浘
@@ -66,7 +67,7 @@
* @param request
* @return
*/
- String identControls(IdentWornRequest request);
+ String identControls(DamageRequest request);
/**
* 纾ㄨ竟妯″潡姹囨姤鐜荤拑鐘舵�� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愮牬鎹�/鎷胯蛋銆�
@@ -74,7 +75,7 @@
* @param request
* @return
*/
- String edgReportStatus(IdentWornRequest request);
+ String edgReportStatus(DamageRequest request);
/**
* 杩涚墖 鎵爜ID楠岃瘉閲嶅
@@ -93,4 +94,8 @@
* @return
*/
EdgStorageCageDetails queryEdgStorageDetailsBySize(int deviceId, int currentSlot, double width, double height);
+
+ String edgDetailsOperate(DamageRequest request);
+
+ List<EdgSlotRemainVO> querySlotRemainWidth(int cellLength, int glassGap);
}
--
Gitblit v1.8.0