From 65bed7f78be75f0ba279885de647d76bc91d9336 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 19 一月 2024 14:33:13 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
index 4a86f46..89bddaa 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -400,8 +400,12 @@
// 鎵嬪姩鍐欏叆plc鎵爜浣嶇幓鐠僫d
@PostMapping("/WriteGlassID")
- public void WriteGlassID(String glassid) {
+ public Result WriteGlassID(String glassid) {
// 鎵爜浣嶅啓鍏ョ幓鐠僫d
+ spianService.outmesid(glassid, "DB103.256");
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
}
// 娓呴櫎鎸囧畾浣嶇疆id
@@ -431,20 +435,30 @@
// 杞�ュ仠
@PostMapping("/SoftEmergencyStop")
public Result SoftEmergencyStop(Short num) {
- String position="DB101.11.3";
+ String position = "DB101.11.3";
Map<String, Object> map = new HashMap<>();
- if (S7control.getinstance().CheckConnected() == true) {
- S7control.getinstance().WriteBit(position, false);
- try {
- TimeUnit.MILLISECONDS.sleep(300);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- S7control.getinstance().WriteBit(position, true);
- map.put("message", "200");
- } else {
- map.put("message", "300");
- }
- return Result.success(map);
+ if (S7control.getinstance().CheckConnected() == true) {
+ S7control.getinstance().WriteBit(position, false);
+ try {
+ TimeUnit.MILLISECONDS.sleep(300);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ S7control.getinstance().WriteBit(position, true);
+ map.put("message", "200");
+ } else {
+ map.put("message", "300");
+ }
+ return Result.success(map);
}
+
+ // 鍒囨崲PLC鑾峰彇浜岀淮鐮佹柟寮�
+ @PostMapping("/SwitchScanMethod")
+ public Result SwitchScanMethod(Short scansmethod) {
+ S7control.getinstance().WriteWord("DB103.255", scansmethod);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
}
--
Gitblit v1.8.0