From afe6bc19be0bab2c46b7e9a59bb7987831e16ae3 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 17 一月 2025 11:18:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassOutRelationInfoService.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassOutRelationInfoService.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassOutRelationInfoService.java
index 8858806..94e2ce6 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassOutRelationInfoService.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassOutRelationInfoService.java
@@ -2,6 +2,11 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mes.hollow.entity.HollowGlassOutRelationInfo;
+import com.mes.hollow.entity.request.HollowTaskRequest;
+import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
+
+import java.io.IOException;
+import java.util.List;
 
 /**
  * (HollowGlassOutRelationInfo)琛ㄦ湇鍔℃帴鍙�
@@ -11,10 +16,24 @@
  */
 public interface HollowGlassOutRelationInfoService extends IService<HollowGlassOutRelationInfo> {
 
-    HollowGlassOutRelationInfo receiveTask(String flowCardId, int cell, int totalPairQuantity);
+    HollowGlassOutRelationInfo receiveTask(HollowTaskRequest request);
 
-    HollowGlassOutRelationInfo forceOutGlass(String flowCardId, int cell, int totalPairQuantity);
+    HollowGlassOutRelationInfo forceOutGlass(HollowTaskRequest request);
 
     Boolean dispatchHollowSwitch(Boolean flag);
+
+    List<String> hollowTaskList(int cell);
+
+    List<HollowGlassQueueInfo> appointHollowTaskDetails(String flowCardId, int cell);
+
+    Boolean startTask(String flowCardId, int cell);
+
+    Boolean pauseTask(String flowCardId, int cell);
+
+    Boolean finishTask(String flowCardId, int cell);
+
+    Boolean deleteHollowTaskDetails(String flowCardId, int cell);
+
+    String generateHollowLisecFile(String flowCardId, int cell, int isForce, int isOut) throws IOException;
 }
 

--
Gitblit v1.8.0