From d3df1630ad3e1c71b61d177ee818d5c5c94e97c0 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期六, 11 十月 2025 18:45:29 +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 | 19 ++++++++++++++++---
1 files changed, 16 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 94e2ce6..8a4c171 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
@@ -1,12 +1,17 @@
package com.mes.hollow.service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.hollow.entity.HollowGlassOutRelationInfo;
+import com.mes.hollow.entity.dto.OrderDetailsDTO;
+import com.mes.hollow.entity.request.HollowHistoryTaskRequest;
import com.mes.hollow.entity.request.HollowTaskRequest;
import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
+import com.mes.largenscreen.entity.PieChartVO;
import java.io.IOException;
import java.util.List;
+import java.util.Map;
/**
* (HollowGlassOutRelationInfo)琛ㄦ湇鍔℃帴鍙�
@@ -22,18 +27,26 @@
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);
Boolean deleteHollowTaskDetails(String flowCardId, int cell);
String generateHollowLisecFile(String flowCardId, int cell, int isForce, int isOut) throws IOException;
+
+ Page<HollowGlassOutRelationInfo> queryHollowHistoryTask(HollowHistoryTaskRequest request);
+
+ List<PieChartVO> queryPieChart();
+
+ OrderDetailsDTO queryProductNameByFlowCardId(String flowCardId);
}
--
Gitblit v1.8.0