From 16714e1a824acd878b105e6ac433866cfc50ed89 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期三, 05 六月 2024 16:44:47 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 86 ++++++++++++++++++++++---------------------
1 files changed, 44 insertions(+), 42 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 18c3ed1..d432dc1 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
@@ -251,7 +251,7 @@
}
} catch (Exception e) {
logger.info("璁㈤槄鏂规硶鎶ラ敊:{}"+e.getMessage());
- e.printStackTrace();
+ logger.error("璁㈤槄鏂规硶鎶ラ敊",e);
}
}
@@ -279,51 +279,53 @@
read = read + "ModuleCode";
if(device.equals("OP365")){
try {
- saveStationInfo365(thoroughfare,device);
+ result = saveStationInfo365(thoroughfare,device);
+ return result;
}catch (Exception e){
e.printStackTrace();
}
}
}else {
read = read + "PACKCode";
+ snCode = miloService.readFromOpcUa(read).getValue().toString();
+
+ if(null == snCode || "".equals(snCode)){
+ result = "22";
+ }else{
+
+ String workOrderNo = "";
+ String productCode = "";
+ //2銆佷繚瀛樿繃绔欓噰闆嗘暟鎹�
+ Object orderNumberObject = miloService.readFromOpcUa(thoroughfare + "." + device + "." + "WorkOrderNumber").getValue();
+ if(orderNumberObject!=null){
+ workOrderNo = orderNumberObject.toString();
+ }
+
+ Object productCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + "." + "ProductType").getValue();
+ if(productCodeObject!=null){
+ productCode = productCodeObject.toString();
+ }
+
+ saveStationInfo(snCode,thoroughfare,device,workOrderNo,productCode);
+ //3銆佷繚瀛樺弬鏁伴噰闆嗘暟鎹�
+ SaveParamData(snCode,thoroughfare,device,workOrderNo,productCode);
+
+ //濡傛灉鏄湯灏惧伐绔欒鎶ュ伐
+ if(device.equals("OP500")){
+ RestfulService.getWorkReportResultFeedback(snCode,device,format.format(new Date()));
+ //1銆佹洿鏂板伐鍗曚俊鎭�
+ updateOrderInfo(snCode);
+ }
+ try{
+ daParamCollectionService.pushGeelycvMesFeedback(snCode,device);
+ }catch (Exception e){
+ }
+ result = "21";
+
+ }
}
}
- snCode = miloService.readFromOpcUa(read).getValue().toString();
- if(null == snCode || "".equals(snCode)){
- result = "22";
- }else{
-
- String workOrderNo = "";
- String productCode = "";
- //2銆佷繚瀛樿繃绔欓噰闆嗘暟鎹�
- Object orderNumberObject = miloService.readFromOpcUa(thoroughfare + "." + device + "." + "WorkOrderNumber").getValue();
- if(orderNumberObject!=null){
- workOrderNo = orderNumberObject.toString();
- }
-
- Object productCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + "." + "ProductType").getValue();
- if(productCodeObject!=null){
- productCode = productCodeObject.toString();
- }
-
- saveStationInfo(snCode,thoroughfare,device,workOrderNo,productCode);
- //3銆佷繚瀛樺弬鏁伴噰闆嗘暟鎹�
- SaveParamData(snCode,thoroughfare,device,workOrderNo,productCode);
-
- //濡傛灉鏄湯灏惧伐绔欒鎶ュ伐
- if(device.equals("OP500")){
- RestfulService.getWorkReportResultFeedback(snCode,device,format.format(new Date()));
- //1銆佹洿鏂板伐鍗曚俊鎭�
- updateOrderInfo(snCode);
- }
- try{
- daParamCollectionService.pushGeelycvMesFeedback(snCode,device);
- }catch (Exception e){
- }
- result = "21";
-
- }
}catch (Exception e) {
System.out.println(e.getMessage());
@@ -551,7 +553,7 @@
/**
* 淇濆瓨杩囩珯閲囬泦
*/
- public void saveStationInfo365(String thoroughfare,String device) throws Exception {
+ public String saveStationInfo365(String thoroughfare,String device) throws Exception {
String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
String prefix = thoroughfare+"."+device+".";
List<DaPassingStationCollection> passingStationCollections = new ArrayList<>();
@@ -588,11 +590,11 @@
passingStationCollections.add(daPassingStationCollection);
}
daPassingStationCollectionService.saveBeachDaPassingStationCollection(passingStationCollections);
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
- return;
+ //miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
+ return "21";
}else {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(22).build());
- return;
+ //miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(22).build());
+ return "22";
}
}
--
Gitblit v1.9.3