From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/controller/HollowGlassQueueInfoController.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 f28fd93..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;
@@ -23,10 +24,24 @@
@Resource
HollowGlassQueueInfoService hollowGlassQueueInfoService;
- @ApiOperation("鎸夌収绾胯矾鏌ヨ姝ｅ湪鍑虹墖鐨勭幓鐠冮槦鍒�")
- @PostMapping("/queryHollowGlassQueueInfo")
- public Result<List<HollowGlassQueueInfo>> queryHollowGlassQueueInfo(int cell) {
- return Result.success(hollowGlassQueueInfoService.queryHollowGlassQueueInfo(cell));
+
+ @ApiOperation("鎸夌収浠诲姟id鑾峰彇瀵瑰簲鐨勪换鍔￠槦鍒楁暟鎹�")
+ @PostMapping("/queryHollowGlassQueueInfoByTask")
+ 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