From 9411b229de115574db769fc103bba0ef06f26732 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期三, 17 七月 2024 16:29:09 +0800
Subject: [PATCH] 修改OP020
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 10 ++++------
jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java | 2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java b/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java
index 0cd9456..56f7df0 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java
@@ -61,7 +61,7 @@
public static final Integer INT_ZERO= 0;
public static final String FACTORY_EMS_UAT_GET_RUL = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/";
public static final String FACTORY_EMS_UAT_POST_RUL = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/interface/";
-/* public static final String FACTORY_EMS_UAT_GET_RUL = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/";
+ /* public static final String FACTORY_EMS_UAT_GET_RUL = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/";
public static final String FACTORY_EMS_UAT_POST_RUL = "https://imes-group.geelycv.com/api/mom-open/restful/interface/";*/
public static final String FACTORY_EMS_SITE_CODE = "3983";
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 fa4b7b9..246955e 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
@@ -119,7 +119,7 @@
// }
}
}else if(Constants.OP030.equals(device)){
- Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Scaner").getValue();
+ Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Scaner").getValue();//鐢佃姱鐮�
if (ObjectUtil.isNotNull(value1)){
String cellCode = value1.toString();
//鍙嶉鐢佃姱ocv妫�娴嬬粨鏋�
@@ -205,7 +205,6 @@
if(ObjectUtil.isNull(cellCodeList) || cellCodeList.size() != 4 ){
result = 23;
}else{
-
String cellCode1 = cellCodeList.get(0);
String cellCode2 = cellCodeList.get(1);
String cellCode3 = cellCodeList.get(2);
@@ -791,15 +790,14 @@
boolean flag = true;
List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
- .eq(DaTestDeviceInterfaceTemp::getStationCode, device)
+ .eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020")
.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode));
if (CollUtil.isNotEmpty(list)){
DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(list.size()-1);
if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(1).build());
+ flag = true;
}else {
flag = false;
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(2).build());
}
daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode);
}else {
@@ -821,7 +819,7 @@
if (ObjectUtil.isNotNull(value1)){
String cellCode = value1.toString();
List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
- .eq(DaTestDeviceInterfaceTemp::getStationCode, device)
+ .eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020")
.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode));
if (CollUtil.isNotEmpty(list)){
DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(list.size()-1);
--
Gitblit v1.9.3