From e3b98d055308762c55fd77bd79e332a3d2fd5606 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 08 一月 2025 13:39:21 +0800
Subject: [PATCH] 1、中空李赛克对接 订单号必须为10位且首位为0 2、除膜对接查询配方信息sql异常
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 6674652..0e46ce4 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
@@ -6,12 +6,14 @@
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;
/**
@@ -20,6 +22,7 @@
* @author makejava
* @since 2024-11-30 13:57:28
*/
+@Api(tags = "涓┖浠诲姟鍏崇郴")
@RestController
@RequestMapping("hollowGlassOutRelationInfo")
public class HollowGlassOutRelationInfoController {
@@ -32,7 +35,7 @@
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);
}
@@ -43,7 +46,7 @@
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);
}
@@ -91,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, 1));
+ }
+
}
--
Gitblit v1.8.0