From 0bb9ea08c62cc463203def30429fec3b66f9513d Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期一, 11 九月 2023 17:42:30 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.150:10101/r/CanadaMes
---
springboot-vue3/package-lock.json | 6 ++++++
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 2 +-
springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/springboot-vue3/package-lock.json b/springboot-vue3/package-lock.json
new file mode 100644
index 0000000..b9a900f
--- /dev/null
+++ b/springboot-vue3/package-lock.json
@@ -0,0 +1,6 @@
+{
+ "name": "springboot-vue3",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {}
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
index c2a74e1..68fc478 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -24,7 +24,7 @@
}
spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
//spianService.selectout("112");
-
+
//鍒ゆ柇杩涚墖璇锋眰
List<Short> datas1List=S7control.getinstance().ReadWord("DB106.24", 1);
List<Short> datas1ListState=S7control.getinstance().ReadWord("DB106.8", 1);
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java
index 9a7de54..c6fea0c 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java
@@ -31,7 +31,7 @@
@GetMapping("/all2")
public void selectdd(String orderid){
SpianService service=new SpianService();
- service.selectadd(orderid);
+ service.selectout(orderid);
}
--
Gitblit v1.8.0