From 63b2548414682dd0127f0bffe3313ea465046957 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期一, 15 四月 2024 14:06:43 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index 25de3cd..411e780 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -31,8 +31,10 @@
//鑷姩宸ヤ綅
public List<String> automaticList = Arrays.asList("OP300","OP280", "OP320", "OP340", "OP350", "OP360","OP370", "OP390", "OP470", "OP530", "OP540");
- public List<String> moduleCodeList = Arrays.asList("OP300","OP310", "OP320", "OP340", "OP350", "OP33");
+ //閲囬泦妯＄粍宸ヤ綅
+ public List<String> moduleCodeList = Arrays.asList("OP300","OP310", "OP320", "OP340", "OP350", "OP330");
+ //绌虹殑
public List<String> nullList = Arrays.asList("OP250","OP260");
@@ -90,11 +92,17 @@
//鏍￠獙鍏ョ珯鏄惁鍙互宸ヤ綔
//plc缁欐垜浠竴涓猵ack鐮侊紝鎷縫ack鐮佹牎楠屽嚭鍨嬪彿
-
+ if(moduleCodeList.stream().anyMatch(s -> s.equals(device))){
+ //璇绘ā缁勭爜
+ String moduleCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue().toString();
+ String productTye = thoroughfare + "." + device + ".ProductType";
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(productTye).value(Integer.valueOf(moduleCode.substring(7,8))).build());
+ }
//杩涚珯淇濆瓨鏁版嵁
// inSaveDate(thoroughfare,device)
//璁板綍鏁版嵁瀹屾垚
String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
+
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
if(automaticList.stream().noneMatch(s -> s.equals(device))){
--
Gitblit v1.9.3