From c8c96e57476968a164ad1889c9d7167fe320982e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 19 三月 2024 08:38:38 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
index 9a47ea2..a584239 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
@@ -20,15 +20,13 @@
public class SpianServiceNew {
@Autowired
private SpianMapper spianMapper;
-
+
// @GetMapping("/all")
public Short selectAll(String glassid) {
-
- //璇诲彇DB105鍖烘枃浠�
- PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- //璇�106
- PlcParameterObject plcread=PLCAutoMes.PlcReadObject;
-
+ //璇诲彇DB105鍖烘枃浠�
+ PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
+ //璇�106
+ PlcParameterObject plcread=PLCAutoMes.PlcReadObject;
int cage1 = 0;
int cells;
int ids;
@@ -132,6 +130,11 @@
}
public Short selectout2(String glassid) {
+ //璇诲彇DB105鍖烘枃浠�
+ PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
+ //璇�106
+ PlcParameterObject plcread=PLCAutoMes.PlcReadObject;
+
char[] a = glassid.toCharArray();
List<Short> datas = new ArrayList<>();
// 鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
@@ -257,6 +260,8 @@
// 娲惧彂浠诲姟鐜荤拑id
public void outmesid(String glassid, String address) {
+ //璇诲彇DB105鍖烘枃浠�
+ PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
// System.out.println("outmesid:" + glassid);
List<Byte> glassidlist = new ArrayList();
char ds[] = glassid.toCharArray();
--
Gitblit v1.8.0