From 91d7afedf3ea51ee87ee47d4da2e1b6243f8fb84 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 05 一月 2025 21:50:21 +0800
Subject: [PATCH] 1、大理片笼进片任务新增数量校验，当收到进片请求时，拿电气的玻璃数量与mes接收到的数量作比较，相同继续执行，不相同结束本次任务 2、李赛克文件优化，合中空玻璃每个间隔框的类型可能不同，需要在界面上做选择 3、中空设备号与格子号不匹配bug解决 4、自动报工存在接口调用异常，临时将调用接口回退原版本，待最新接口调用无异常后更新接口 5、fixbug:中空大理片详情界面删除接口异常
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java | 61 +++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 7 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..3460b35 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,14 +2,19 @@
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.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.List;
/**
* (HollowGlassOutRelationInfo)琛ㄦ帶鍒跺眰
@@ -17,6 +22,7 @@
* @author makejava
* @since 2024-11-30 13:57:28
*/
+@Api(tags = "涓┖浠诲姟鍏崇郴")
@RestController
@RequestMapping("hollowGlassOutRelationInfo")
public class HollowGlassOutRelationInfoController {
@@ -26,25 +32,60 @@
@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, "鏈夋鍦ㄦ墽琛岀殑浠诲姟锛岃鍏堢‘淇濅换鍔″畬鎴愬悗锛屽啀娆￠鍙栦换鍔�");
+ 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, "鏈夋鍦ㄦ墽琛岀殑浠诲姟锛岃鍏堢‘淇濅换鍔″畬鎴愬悗锛屽啀娆″己鍒舵墽琛屼换鍔�");
+ return Result.error(500, "褰撳墠娴佺▼鍗℃湁鏈畬鎴愮殑浠诲姟锛岃鍏堢‘淇濅换鍔″畬鎴愬悗锛屽啀娆″己鍒舵墽琛屼换鍔�");
} else {
return Result.success(hollowGlassOutRelationInfo);
}
+ }
+
+ @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("鏄惁璋冨害寮�鍏�")
@@ -53,5 +94,11 @@
return Result.build(200, "淇敼鎴愬姛", hollowGlassOutRelationInfoService.dispatchHollowSwitch(flag));
}
+ @ApiOperation("鎵嬪姩鐢熸垚鏉庤禌鍏嬫枃浠�")
+ @PostMapping("/generateHollowLisecFile")
+ public Result<String> generateHollowLisecFile(String flowCardId, int cell, int isForce) throws IOException {
+ return Result.build(200, "淇敼鎴愬姛", hollowGlassOutRelationInfoService.generateHollowLisecFile(flowCardId, cell, isForce));
+ }
+
}
--
Gitblit v1.8.0