From a52b87449e493d4312cc81c33a4169eb6be3c144 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 01 四月 2025 09:14:19 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

---
 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..c8661f6 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