From 505237e928b3518483f3a49080a4e0b266bd7e7d Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 11 四月 2024 14:01:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 7be7645..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)
@@ -117,7 +119,7 @@
}
//淇濆瓨鎷х揣鏁版嵁
else if (("AngleResult").equals(tab)) {
- if("OK".equals(tabVlaue)||"NG".equals(tabVlaue)){
+ if("1".equals(tabVlaue)||"2".equals(tabVlaue)){
List<String> list = new ArrayList<>();
String[] suffixes = {"Torque", "Angle", "TorqueResult", "AngleResult"};
@@ -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