From ae1459d90f53ac81177e75790d859c6a12e7ed54 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 12 十一月 2025 11:09:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassOutRelationInfoService.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassOutRelationInfoService.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassOutRelationInfoService.java
index 398d723..4d0e263 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassOutRelationInfoService.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassOutRelationInfoService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.hollow.entity.HollowGlassOutRelationInfo;
+import com.mes.order.entity.OrderDetailsDTO;
import com.mes.hollow.entity.request.HollowHistoryTaskRequest;
import com.mes.hollow.entity.request.HollowTaskRequest;
import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
@@ -10,6 +11,7 @@
import java.io.IOException;
import java.util.List;
+import java.util.Map;
/**
* (HollowGlassOutRelationInfo)琛ㄦ湇鍔℃帴鍙�
@@ -25,13 +27,15 @@
Boolean dispatchHollowSwitch(Boolean flag);
+ Boolean priorityHollowSwitch(Boolean flag);
+
List<String> hollowTaskList(int cell);
- List<HollowGlassQueueInfo> appointHollowTaskDetails(String flowCardId, int cell);
+ Map<String, List<HollowGlassQueueInfo>> appointHollowTaskDetails(int cell);
- Boolean startTask(String flowCardId, int cell);
+ Boolean startTask(int cell);
- Boolean pauseTask(String flowCardId, int cell);
+ Boolean pauseTask(int cell);
Boolean finishTask(String flowCardId, int cell);
@@ -42,5 +46,7 @@
Page<HollowGlassOutRelationInfo> queryHollowHistoryTask(HollowHistoryTaskRequest request);
List<PieChartVO> queryPieChart();
+
+ OrderDetailsDTO queryProductNameByFlowCardId(String flowCardId);
}
--
Gitblit v1.8.0