From eaf25c57276ebaf28141418199c92e9502884ccf Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 09 三月 2025 23:51:28 +0800
Subject: [PATCH] 1、原片仓储新增任务完成/任务失败接口供用户异常情况恢复处理 2、原片仓储新增历史任务查询按钮 3、卧式理片新增任务完成/任务失败接口供用户异常情况恢复处理 4、大理片笼临时修改：10mm及以上厚度的玻璃走直通任务，厚度可按照实际情况进行配置 5、fixbug:中空理片笼10mm厚度玻璃进入理片笼小格子异常问题查询，同一个流程卡同一层出现2种厚度，导致厚度赋值异常，目前已改为查询最后一次导入的为准
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java
index 979e67f..4ba357c 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java
@@ -12,23 +12,47 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍘熺墖浠诲姟鎺у埗鍣�
* </p>
*
* @author wf
* @since 2024-09-10
*/
@RestController
-@RequestMapping("/raw_glass_storage_task")
+@RequestMapping("/rawGlassStorageTask")
public class RawGlassStorageTaskController {
+
@Autowired
- private RawGlassStorageTaskService rwService; //杩欓噷鏄綘瀹氫箟璋冪敤鐨剆ervice锛岃繖涓槸鎶ュ伐鐨�
- @ApiOperation("鍘熺墖浠撳偍鏁版嵁鏌ヨ")
- @PostMapping("/selectRawglasstask")
- public Result selectDamage(@RequestBody RawGlassTaskRequest rw) {
- return Result.build(200,"鏌ヨ鎴愬姛", rwService.setRawGlassTaskRequest(rw));
+ private RawGlassStorageTaskService rawGlassStorageTaskService;
+
+ @ApiOperation("璁剧疆鍘熺墖浠撳偍鏌ヨ鏉′欢")
+ @PostMapping("/setRawGlassTaskRequest")
+ public Result setRawGlassTaskRequest(@RequestBody RawGlassTaskRequest request) {
+ return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageTaskService.setRawGlassTaskRequest(request));
}
+
+ @ApiOperation("鎸夌収鏉′欢鏌ョ湅浠撳偍鍘嗗彶浠诲姟")
+ @PostMapping("/queryRawGlassHistoryTask")
+ public Result<List<RawGlassStorageTask>> queryRawGlassHistoryTask(@RequestBody RawGlassTaskRequest request) {
+ return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageTaskService.queryRawGlassHistoryTask(request));
+ }
+
+ @ApiOperation("浠诲姟鎴愬姛澶勭悊")
+ @PostMapping("/taskSuccess")
+ public Result<Boolean> taskSuccess(@RequestBody Long taskId) {
+ return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageTaskService.taskSuccess(taskId));
+ }
+
+ @ApiOperation("浠诲姟澶辫触澶勭悊")
+ @PostMapping("/taskError")
+ public Result<Boolean> taskError(@RequestBody Long taskId) {
+ return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageTaskService.taskError(taskId));
+ }
+
+
}
--
Gitblit v1.8.0