From 8b24fb7dc4040372e4e785e96ea8eb487cf65207 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 21 四月 2025 10:45:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/controller/HollowGlassQueueInfoController.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/controller/HollowGlassQueueInfoController.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/controller/HollowGlassQueueInfoController.java
index eb24e9e..36a2f78 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/controller/HollowGlassQueueInfoController.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/controller/HollowGlassQueueInfoController.java
@@ -5,6 +5,7 @@
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -29,5 +30,18 @@
public Result<List<HollowGlassQueueInfo>> queryHollowGlassQueueInfoByTask(int taskId) {
return Result.success(hollowGlassQueueInfoService.queryHollowGlassQueueInfoByTask(taskId));
}
+
+ @ApiOperation("閾濇纭/鐮存崯")
+ @PostMapping("/confirmBorder")
+ public Result confirmBorder(@RequestBody HollowGlassQueueInfo hollowGlassQueueInfo) {
+ hollowGlassQueueInfoService.confirmBorder(hollowGlassQueueInfo);
+ return Result.build(200, "淇敼鎴愬姛", 1);
+ }
+
+ @ApiOperation("閾濇鏌ヨ")
+ @PostMapping("/queryHollowGlassQueueInfoByLine")
+ public Result queryHollowGlassQueueInfoByLine(@RequestBody HollowGlassQueueInfo hollowGlassQueueInfo) {
+ return Result.build(200, "鎿嶄綔鎴愬姛", hollowGlassQueueInfoService.queryHollowGlassQueueInfoByLine(hollowGlassQueueInfo.getCell()));
+ }
}
--
Gitblit v1.8.0