From 3614b4f694d9d40708df6477d56a40b9311ad48a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 31 一月 2024 14:50:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
index ada22ca..e9f8a63 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
@@ -1,11 +1,13 @@
package com.example.springboot.component;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import com.example.springboot.service.JdbcConnections;
import com.example.springboot.service.SpianService;
import com.example.springboot.entity.north_glass_buffer1;
+import com.example.springboot.entity.device.PlcParameterObject;
import com.example.springboot.mapper.AlarmMapper;
import com.example.springboot.mapper.SpianMapper;
@@ -43,13 +45,21 @@
// // TODO Auto-generated catch block
// e.printStackTrace();
// }
-
- // 鍑虹墖浠诲姟////////////////////////////////
- List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖杞︾姸鎬�
- List<Short> outlist1 = S7control.getinstance().ReadWord("DB105.18", 1); // 鍑虹墖浠诲姟鏄惁鍚姩
-
- boolean Plcout = spianService.listbool("DB106.64"); // 鍑虹墖璇锋眰瀛�
- boolean Plcout2 = spianService.listbool("DB105.18"); // 鍑虹墖鍚姩
+ //璇诲彇DB105鍖烘枃浠�
+ PlcParameterObject plcParameterObjects=PLCAutoMes.PlcMesObject;
+ //璇�106
+ PlcParameterObject plcParameterObjects2=PLCAutoMes.PlcReadObject;
+ // List<String> addresses105 = new ArrayList<>();
+ // addresses105.add("OutRequest");// 鍑虹墖璇锋眰瀛�
+ // List<String> addresses106 = new ArrayList<>();
+ // addresses106.add("OutActivate");// 鍑虹墖鍚姩
+
+ String OutActivate=plcParameterObjects2.getPlcParameter("OutActivate").getValue();
+
+ // 鍑虹墖浠诲姟
+ boolean Plcout = spianService.listbool("DB106.64");
+ boolean Plcout2 = spianService.listbool("DB105.18");
+
if (Plcout == false&&Plcout2==true) {
S7control.getinstance().WriteWord("DB105.18", (short) 0);// 鍑虹墖浠诲姟鍚姩鏀逛负0
System.out.println("鍏抽棴鍑虹墖鍚姩" + LocalDateTime.now());// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负0
@@ -98,6 +108,7 @@
List<Short> datas1List = S7control.getinstance().ReadWord("DB106.24", 1);// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 鑾峰彇杩涚墖杞︾姸鎬�
List<Short> datas1ListState2 = S7control.getinstance().ReadWord("DB105.16", 1);// 鑾峰彇杩涚墖杞︿换鍔℃槸鍚﹀惎鍔�
+
boolean B01backs = spianService.listbool("DB106.60");// b01姹囨姤
boolean B02backs = spianService.listbool("DB106.62");// b02姹囨姤
--
Gitblit v1.8.0