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/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceController.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceController.java index 39fb4b2..3355e67 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceController.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceController.java @@ -26,7 +26,7 @@ @Resource private EdgStorageDeviceTaskService edgStorageDeviceTaskService; - @ApiOperation(value = "閲嶇疆浠诲姟锛氭寜鐓ц澶噄d閲嶇疆浠诲姟") + @ApiOperation(value = "閲嶇疆浠诲姟/浠诲姟澶辫触澶勭悊锛氭寜鐓ц澶噄d閲嶇疆浠诲姟") @PostMapping("/resetTask") public Result<Boolean> resetTask(Integer deviceId) { Boolean flag = edgStorageDeviceTaskService.resetTask(deviceId); @@ -36,4 +36,10 @@ return Result.build(200, "鏃犱换鍔★紝鏃犻渶閲嶇疆", flag); } } + + @ApiOperation("浠诲姟鎴愬姛澶勭悊") + @PostMapping("/taskSuccess") + public Result<Boolean> taskSuccess(Integer deviceId) { + return Result.build(200, "澶勭悊鎴愬姛", edgStorageDeviceTaskService.taskSuccess(deviceId)); + } } -- Gitblit v1.8.0