From 9ecf2257e5cbe2c45a3adae4a56531e5065b5e5a Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期一, 17 三月 2025 14:27:43 +0800
Subject: [PATCH] 修改
---
billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java b/billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java
index e5d9d17..d66e297 100644
--- a/billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java
+++ b/billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java
@@ -99,7 +99,7 @@
if(Constants.ONLINE.contains(device)){
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
}
- //闄ら宸ョ珯鎵�鏈夊伐绔�
+ //1.2//闄ら宸ョ珯鎵�鏈夊伐绔�
else if(
Constants.PLC1.contains(device) ||
Constants.PLC2.contains(device) ||
@@ -228,6 +228,22 @@
omProductionOrderInfoService.updatePreStatus2();
}
}
+ //鍑虹珯淇濆瓨
+ DaStationCollection daStationCollection = new DaStationCollection();
+ daStationCollection.setLocationCode(device);
+ daStationCollection.setSfcCode(SFCCode.toString());
+ Object StationStatus = miloService.readFromOpcUa(thoroughfare + "." + device + ".StationStatus").getValue();
+ Date startTime = new Date();
+ ReadWriteEntity startTimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StartTime");//杩涚珯鏃堕棿
+ startTime = format.parse(TimeUtil.test(TimeUtil.stringProcessing(startTimeRead.getValue().toString())));
+ daStationCollection.setInboundTime( startTime);
+ Date stopTime = new Date();
+ ReadWriteEntity stopTimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StopTime");//杩涚珯鏃堕棿
+ stopTime = format.parse(TimeUtil.test(TimeUtil.stringProcessing(stopTimeRead.getValue().toString())));
+ daStationCollection.setOutboundTime( stopTime);
+ daStationCollection.setStatus(StationStatus.toString());
+ daStationCollectionService.insertDaStationCollection(daStationCollection);
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(21).build());
//鏌ヨdescriptive瀛楁绛変簬1鐨勯噰闆嗛」淇濆瓨鍒版壂鐮佷繚瀛樺埌da_material_collection琛ㄩ噷
DaCollectionParamConf daCollectionParamConf1 = new DaCollectionParamConf();
daCollectionParamConf1.setProcessesCode(device);
@@ -283,21 +299,6 @@
log.debug("閲囬泦椤逛负绌�: {}", gatherAddress);
}
}
- DaStationCollection daStationCollection = new DaStationCollection();
- daStationCollection.setLocationCode(device);
- daStationCollection.setSfcCode(SFCCode.toString());
- Object StationStatus = miloService.readFromOpcUa(thoroughfare + "." + device + ".StationStatus").getValue();
- Date startTime = new Date();
- ReadWriteEntity startTimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StartTime");//杩涚珯鏃堕棿
- startTime = format.parse(TimeUtil.test(TimeUtil.stringProcessing(startTimeRead.getValue().toString())));
- daStationCollection.setInboundTime( startTime);
- Date stopTime = new Date();
- ReadWriteEntity stopTimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StopTime");//杩涚珯鏃堕棿
- stopTime = format.parse(TimeUtil.test(TimeUtil.stringProcessing(stopTimeRead.getValue().toString())));
- daStationCollection.setOutboundTime( stopTime);
- daStationCollection.setStatus(StationStatus.toString());
- daStationCollectionService.insertDaStationCollection(daStationCollection);
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(21).build());
}
}
}
--
Gitblit v1.9.3