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/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java index ee87a6f..5e56064 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java @@ -114,6 +114,17 @@ } } + @ApiOperation("鍙栨秷褰撳墠閽㈠寲") + @PostMapping("/cancelTemperingTask") + public Result<Boolean> cancelTemperingTask() { + boolean result = bigStorageCageDetailsService.cancelTemperingTask(); + if (result == true) { + return Result.build(200, "鍙栨秷褰撳墠閽㈠寲鎴愬姛", result); + } else { + return Result.build(200, "鍙栨秷褰撳墠閽㈠寲澶辫触", result); + } + } + @ApiOperation("閽㈠寲/闈為挗鍖栨煡璇細0 闈為挗鍖� 1锛氶挗鍖�") @PostMapping("/selectTemperingGlass") public Result<List<TemperingGlassCountDTO>> selectTemperingGlass(int isTempering) { -- Gitblit v1.8.0