From d41ce9c4703807bf2607a74b8305c1d78aed4ec1 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 22 九月 2025 13:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java
index 7585d13..278cf88 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java
@@ -19,6 +19,7 @@
import javax.annotation.Resource;
import java.io.IOException;
import java.util.List;
+import java.util.Map;
/**
* (HollowGlassOutRelationInfo)琛ㄦ帶鍒跺眰
@@ -33,6 +34,7 @@
@Resource
HollowGlassOutRelationInfoService hollowGlassOutRelationInfoService;
+
@ApiOperation("棰嗗彇浠诲姟")
@PostMapping("/receiveTask")
public Result<HollowGlassOutRelationInfo> receiveTask(HollowTaskRequest request) {
@@ -63,26 +65,26 @@
@ApiOperation("棰勮鎸囧畾浠诲姟淇℃伅")
@PostMapping("/appointHollowTaskDetails")
- public Result<List<HollowGlassQueueInfo>> appointHollowTaskDetails(String flowCardId, int cell) {
- return Result.build(200, "棰勮鎸囧畾浠诲姟淇℃伅鎴愬姛", hollowGlassOutRelationInfoService.appointHollowTaskDetails(flowCardId, cell));
+ public Result<Map<String, List<HollowGlassQueueInfo>>> appointHollowTaskDetails(int cell) {
+ return Result.build(200, "棰勮鎸囧畾浠诲姟淇℃伅鎴愬姛", hollowGlassOutRelationInfoService.appointHollowTaskDetails(cell));
}
@ApiOperation("鍒犻櫎鎸囧畾浠诲姟淇℃伅")
@PostMapping("/deleteHollowTaskDetails")
public Result<Boolean> deleteHollowTaskDetails(String flowCardId, int cell) {
- return Result.build(200, "棰勮鎸囧畾浠诲姟淇℃伅鎴愬姛", hollowGlassOutRelationInfoService.deleteHollowTaskDetails(flowCardId, cell));
+ return Result.build(200, "鍒犻櫎鎸囧畾浠诲姟淇℃伅鎴愬姛", hollowGlassOutRelationInfoService.deleteHollowTaskDetails(flowCardId, cell));
}
@ApiOperation("寮�濮嬩换鍔�")
@PostMapping("/startTask")
- public Result<Boolean> startTask(String flowCardId, int cell) {
- return Result.build(200, "寮�濮嬩换鍔℃垚鍔�", hollowGlassOutRelationInfoService.startTask(flowCardId, cell));
+ public Result<Boolean> startTask(int cell) {
+ return Result.build(200, "寮�濮嬩换鍔℃垚鍔�", hollowGlassOutRelationInfoService.startTask(cell));
}
@ApiOperation("鏆傚仠浠诲姟")
@PostMapping("/pauseTask")
- public Result<Boolean> pauseTask(String flowCardId, int cell) {
- return Result.build(200, "鏆傚仠浠诲姟鎴愬姛", hollowGlassOutRelationInfoService.pauseTask(flowCardId, cell));
+ public Result<Boolean> pauseTask(int cell) {
+ return Result.build(200, "鏆傚仠浠诲姟鎴愬姛", hollowGlassOutRelationInfoService.pauseTask(cell));
}
@ApiOperation("缁撴潫浠诲姟")
--
Gitblit v1.8.0