From 27041dc55b967b1e12673b2d1308c85ccd95b799 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 16 八月 2024 14:29:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 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..3c547af 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
@@ -1,6 +1,7 @@
package com.mes.downworkstation.controller;
+import com.mes.common.utils.RedisUtil;
import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.entity.request.DownWorkRequest;
import com.mes.downworkstation.service.DownWorkstationService;
@@ -11,6 +12,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@@ -32,6 +34,8 @@
private DownWorkstationService downWorkstationService;
@Autowired
private GlassInfoService glassInfoService;
+ @Resource
+ private RedisUtil redisUtil;
@ApiOperation("鑾峰彇宸ヤ綅淇℃伅")
@GetMapping("/getone")
@@ -77,17 +81,8 @@
// 璋冪敤 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);
- }
+ downWorkstationService.clearFlowCardId(workstationId);
+ return Result.build(200, "娓呴櫎宸ヤ綅淇℃伅鎴愬姛", 1);
// 鏋勫缓鍝嶅簲鏁版嵁
@@ -128,6 +123,20 @@
return Result.build(200, "鏇存崲鎴愬姛", isSucess);
}
+ @ApiOperation("鍏抽棴宸ヤ綅宸叉弧璀︽姤")
+ @PostMapping("/closeAlarmSignal")
+ @ResponseBody
+ public Result<String> closeAlarmSignal() {
+ return Result.build(200, "鏇存崲鎴愬姛", downWorkstationService.closeAlarmSignal());
+ }
+
+ @ApiOperation("鏄惁鑷姩鎵撳嵃")
+ @PostMapping("/autoPrint")
+ public Result autoPrint(Boolean flag) {
+ downWorkstationService.autoPrint(flag);
+ return Result.build(200, "淇敼鎴愬姛", redisUtil.getCacheObject("autoPrint"));
+ }
+
}
--
Gitblit v1.8.0