From 89f41617d8c15a43029629f9f097238e04a78a63 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 11 四月 2024 13:59:45 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java | 5 +++++
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 2 ++
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 9 ++++++---
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
index 22104fd..cbff0e6 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -64,6 +64,8 @@
lists.add(OPCElement.PACK_OP300_AngleResult);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP270_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP270_AngleResult);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP370_Grade);//璇锋眰璁板綍鏁版嵁
+
return lists;
}
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
index 2b7fbf9..b0fe56f 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
@@ -46,6 +46,11 @@
public static final String PACK_OP270_RecordData = "PACK.OP270.RecordData";//璇锋眰璁板綍鏁版嵁
public static final String PACK_OP270_AngleResult = "PACK.OP270.AngleResult";//璇锋眰鎷х揣鏁版嵁
+ /**
+ * OP270
+ */
+ public static final String PACK_OP370_Grade = "PACK.OP370.Grade";//璇锋眰璁板綍鏁版嵁
+
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 7570daa..d73865a 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
@@ -80,12 +80,14 @@
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(recordSNDoneAddress).value(1).build());
}
//璇锋眰璁板綍鏁版嵁
- else if (("RecordData").equals(tab)) {
+ else if (("Grade").equals(tab)) {
String recordDataDoneValue = "";
if("1".equals(tabVlaue)){
recordDataDoneValue = "11";
//鏍￠獙鍏ョ珯鏄惁鍙互宸ヤ綔
+
+ //plc缁欐垜浠竴涓猵ack鐮侊紝鎷縫ack鐮佹牎楠屽嚭鍨嬪彿
//杩涚珯淇濆瓨鏁版嵁
// inSaveDate(thoroughfare,device)
@@ -174,6 +176,7 @@
String workOrderNo = miloService.readFromOpcUa(thoroughfare + "." + device + "." + "WorkOrderNumber").getValue().toString();
String productCode = miloService.readFromOpcUa(thoroughfare + "." + device + "." + "ProductType").getValue().toString();
+
saveStationInfo(snCode,thoroughfare,device,workOrderNo,productCode);
//3銆佷繚瀛樺弬鏁伴噰闆嗘暟鎹�
SaveParamData(snCode,thoroughfare,device,workOrderNo,productCode);
@@ -224,8 +227,8 @@
*/
public void saveStationInfo(String packCode,String thoroughfare,String device,String workOrderNo,String productCode) throws Exception {
String prefix = thoroughfare+"."+device+".";
- String startTime = miloService.readFromOpcUa(prefix + "StartTime").getValue().toString();
- String stopTime = miloService.readFromOpcUa(prefix + "StopTime").getValue().toString();
+// String startTime = miloService.readFromOpcUa(prefix + "StartTime").getValue().toString();
+// String stopTime = miloService.readFromOpcUa(prefix + "StopTime").getValue().toString();
String stationStatus = miloService.readFromOpcUa(prefix + "StationStatus").getValue().toString();
DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
--
Gitblit v1.9.3