From e31a077927d47bd05bcfdc3367deafb8c4069c6d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 26 十二月 2024 23:57:34 +0800
Subject: [PATCH] 1、卧式理片玻璃替换仅替换版图信息 2、指定钢化、指定工程fixbug:膜系字段修改为filmsId 3、移除大理片笼向前端推送钢化历史任务数据 4、中空领取任务界面接口改造：新增开始/暂停/结束任务按钮，流程卡列表、预览任务、删除任务接口 5、领取/强制任务接口改造：新增除膜信息、李赛克文件需要的数据信息
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java
index e935cc4..6674652 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java
@@ -2,7 +2,9 @@
import com.mes.hollow.entity.HollowGlassOutRelationInfo;
+import com.mes.hollow.entity.request.HollowTaskRequest;
import com.mes.hollow.service.HollowGlassOutRelationInfoService;
+import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
@@ -10,6 +12,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.List;
/**
* (HollowGlassOutRelationInfo)琛ㄦ帶鍒跺眰
@@ -26,20 +29,19 @@
@ApiOperation("棰嗗彇浠诲姟")
@PostMapping("/receiveTask")
- public Result<HollowGlassOutRelationInfo> receiveTask(String flowCardId, int cell, int totalPairQuantity) {
- HollowGlassOutRelationInfo hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService.receiveTask(flowCardId, cell, totalPairQuantity);
+ public Result<HollowGlassOutRelationInfo> receiveTask(HollowTaskRequest request) {
+ HollowGlassOutRelationInfo hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService.receiveTask(request);
if (null == hollowGlassOutRelationInfo) {
return Result.error(500, "鏈夋鍦ㄦ墽琛岀殑浠诲姟锛岃鍏堢‘淇濅换鍔″畬鎴愬悗锛屽啀娆￠鍙栦换鍔�");
} else {
return Result.success(hollowGlassOutRelationInfo);
}
-
}
@ApiOperation("寮哄埗鍑虹墖")
@PostMapping("/forceOutGlass")
- public Result<HollowGlassOutRelationInfo> forceOutGlass(String flowCardId, int cell, int totalPairQuantity) {
- HollowGlassOutRelationInfo hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService.forceOutGlass(flowCardId, cell, totalPairQuantity);
+ public Result<HollowGlassOutRelationInfo> forceOutGlass(HollowTaskRequest request) {
+ HollowGlassOutRelationInfo hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService.forceOutGlass(request);
if (null == hollowGlassOutRelationInfo) {
return Result.error(500, "鏈夋鍦ㄦ墽琛岀殑浠诲姟锛岃鍏堢‘淇濅换鍔″畬鎴愬悗锛屽啀娆″己鍒舵墽琛屼换鍔�");
} else {
@@ -47,6 +49,42 @@
}
}
+ @ApiOperation("娴佺▼鍗′换鍔″垪琛�")
+ @PostMapping("/hollowTaskList")
+ public Result<List<String>> hollowTaskList(int cell) {
+ return Result.build(200, "娴佺▼鍗′换鍔″垪琛ㄦ煡璇㈡垚鍔�", hollowGlassOutRelationInfoService.hollowTaskList(cell));
+ }
+
+ @ApiOperation("棰勮鎸囧畾浠诲姟淇℃伅")
+ @PostMapping("/appointHollowTaskDetails")
+ public Result<List<HollowGlassQueueInfo>> appointHollowTaskDetails(String flowCardId, int cell) {
+ return Result.build(200, "棰勮鎸囧畾浠诲姟淇℃伅鎴愬姛", hollowGlassOutRelationInfoService.appointHollowTaskDetails(flowCardId, cell));
+ }
+
+ @ApiOperation("鍒犻櫎鎸囧畾浠诲姟淇℃伅")
+ @PostMapping("/deleteHollowTaskDetails")
+ public Result<Boolean> deleteHollowTaskDetails(String flowCardId, int 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));
+ }
+
+ @ApiOperation("鏆傚仠浠诲姟")
+ @PostMapping("/pauseTask")
+ public Result<Boolean> pauseTask(String flowCardId, int cell) {
+ return Result.build(200, "鏆傚仠浠诲姟鎴愬姛", hollowGlassOutRelationInfoService.pauseTask(flowCardId, cell));
+ }
+
+ @ApiOperation("缁撴潫浠诲姟")
+ @PostMapping("/finishTask")
+ public Result<Boolean> finishTask(String flowCardId, int cell) {
+ return Result.build(200, "缁撴潫浠诲姟鎴愬姛", hollowGlassOutRelationInfoService.finishTask(flowCardId, cell));
+ }
+
@ApiOperation("鏄惁璋冨害寮�鍏�")
@PostMapping("/dispatchHollowSwitch")
public Result<Boolean> dispatchHollowSwitch(Boolean flag) {
--
Gitblit v1.8.0