From 880d2fb2f1082ed63b3f21259710ed683b14ae51 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 02 四月 2025 10:30:21 +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..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