From 3f23422c13226ce37150afed0b4d8d0309da45d3 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期二, 25 三月 2025 19:24:40 +0800
Subject: [PATCH] 修改
---
billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java b/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java
index 2482d7f..662940b 100644
--- a/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java
+++ b/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java
@@ -1,6 +1,7 @@
package com.billion.main.plcServer;
import com.billion.main.bs.service.IBsBomChildInfoService;
+import com.billion.main.bs.service.IBsLineInfoService;
import com.billion.main.constant.Constants;
import com.billion.main.da.service.IDaCollectionParamConfService;
import com.billion.main.da.service.IDaMaterialCollectionService;
@@ -38,7 +39,8 @@
public IDaMaterialCollectionService daMaterialCollectionService;
@Autowired
public ISysCountService sysCountService;
-
+ @Autowired
+ public IBsLineInfoService bsLineInfoService;
@Override
public void run(ApplicationArguments args) throws Exception {
@@ -104,14 +106,16 @@
Constants.PLC4.add(Constants.OP030);
Constants.PLC4.add(Constants.OP050);
Constants.PLC4.add(Constants.OP110);
- Constants.PLC4.add(Constants.OP070_1);
+ Constants.PLC4.add(Constants.OP070);
+ Constants.PLC4.add(Constants.OP075);
+ Constants.PLC4.add(Constants.OP080);
Constants.PLC4.add(Constants.OP140);
//涓婄嚎宸ヤ綅
Constants.ONLINE.add(Constants.C005);
Constants.ONLINE.add(Constants.OP005);
//涓嬬嚎宸ヤ綅
Constants.OFFLINE.add(Constants.C060);
- Constants.OFFLINE.add(Constants.OP300);
+ Constants.OFFLINE.add(Constants.OP310);
@@ -125,11 +129,12 @@
bsBomChildInfoService,
daCollectionParamConfService,
daMaterialCollectionService,
- sysCountService);
+ sysCountService,
+ bsLineInfoService);
List<String> lists = getList();
System.out.println("璁㈤槄鍐呭锛�"+lists);
- miloService.subscriptionFromOpcUa(lists,OPCUaSubscription);
+ miloService.subscriptionFromOpcUa(lists,50,OPCUaSubscription);
}
@@ -203,20 +208,22 @@
lists.add("PLC4.C040.RecordData");
lists.add("PLC4.OP030.RecordData");
lists.add("PLC4.OP050.RecordData");
- lists.add("PLC4.OP070_1.RecordData");
- lists.add("PLC3.OP110.RecordData");
- lists.add("PLC3.OP140.RecordData");
+ lists.add("PLC4.OP070.RecordData");
+ lists.add("PLC4.OP075.RecordData");
+ lists.add("PLC4.OP080.RecordData");
+ lists.add("PLC4.OP110.RecordData");
+ lists.add("PLC4.OP140.RecordData");
-// //TEST
-// lists.add("TEST.C005.RecordData");
-// lists.add("TEST.C005.WorkOrderRequest");
-// lists.add("TEST.C060.RecordData");
-// lists.add("TEST.OP005.RecordData");
-// lists.add("TEST.OP005.WorkOrderRequest");
-// lists.add("TEST.OP010.RecordData");
-// lists.add("TEST.OP310.RecordData");
-// lists.add("TEST.P010.RecordData");
-// lists.add("TEST.P010.WorkOrderRequest");
+ //TEST
+ lists.add("TEST.C005.RecordData");
+ lists.add("TEST.C005.WorkOrderRequest");
+ lists.add("TEST.C060.RecordData");
+ lists.add("TEST.OP005.RecordData");
+ lists.add("TEST.OP005.WorkOrderRequest");
+ lists.add("TEST.OP010.RecordData");
+ lists.add("TEST.OP300.RecordData");
+ lists.add("TEST.P010.RecordData");
+ lists.add("TEST.P010.WorkOrderRequest");
return lists;
}
--
Gitblit v1.9.3