From dd60bcc7b38c2a19c02a20550a393987fc5a5a27 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 07 八月 2024 16:26:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
index 2c15c6c..2f2a7aa 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
@@ -77,17 +77,9 @@
// 璋冪敤 DownWorkstationService 涓殑鏂规硶娓呴櫎鎸囧畾宸ヤ綅ID鐨勪俊鎭�
int workstationId = (int) requestData.get("workstationId");
- int totalWorkstations = downWorkstationService.getTotalQuantity(workstationId);
- int downWorkstations = downWorkstationService.getRacksNumber(workstationId);
-
-
- if (downWorkstations == totalWorkstations) {
downWorkstationService.clearFlowCardId(workstationId);
return Result.build(200, "娓呴櫎宸ヤ綅淇℃伅鎴愬姛", 1);
- } else {
- // 濡傛灉鎬绘暟閲忓拰钀芥灦鏁伴噺涓嶄竴鑷达紝杩斿洖閿欒鍝嶅簲
- return Result.build(500, "娓呴櫎宸ヤ綅淇℃伅澶辫触", 1);
- }
+
// 鏋勫缓鍝嶅簲鏁版嵁
@@ -128,6 +120,13 @@
return Result.build(200, "鏇存崲鎴愬姛", isSucess);
}
+ @ApiOperation("鍏抽棴宸ヤ綅宸叉弧璀︽姤")
+ @PostMapping("/closeAlarmSignal")
+ @ResponseBody
+ public Result<String> closeAlarmSignal() {
+ return Result.build(200, "鏇存崲鎴愬姛", downWorkstationService.closeAlarmSignal());
+ }
+
}
--
Gitblit v1.8.0