From 7451ba882c5c2dd895fc646e787022301c672916 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期三, 26 三月 2025 18:32:43 +0800
Subject: [PATCH] 修改
---
billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java | 138 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 120 insertions(+), 18 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 a21cb4a..7d0b0b8 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
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.billion.main.bs.domain.BsBomChildInfo;
+import com.billion.main.bs.domain.BsLineInfo;
import com.billion.main.bs.service.IBsBomChildInfoService;
+import com.billion.main.bs.service.IBsLineInfoService;
import com.billion.main.constant.Constants;
import com.billion.main.da.domain.DaCollectionParamConf;
import com.billion.main.da.domain.DaMaterialCollection;
@@ -23,6 +25,7 @@
import com.kangaroohy.milo.runner.subscription.SubscriptionCallback;
import com.kangaroohy.milo.service.MiloService;
import lombok.extern.slf4j.Slf4j;
+import org.eclipse.milo.opcua.sdk.client.nodes.UaNode;
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
@@ -45,6 +48,7 @@
public IDaCollectionParamConfService daCollectionParamConfService;
public IDaMaterialCollectionService daMaterialCollectionService;
public ISysCountService sysCountService;
+ public IBsLineInfoService bsLineInfoService;
public OPCUaSubscription(MiloService miloService,
@@ -55,7 +59,8 @@
IBsBomChildInfoService bsBomChildInfoService,
IDaCollectionParamConfService daCollectionParamConfService,
IDaMaterialCollectionService daMaterialCollectionService,
- ISysCountService sysCountService
+ ISysCountService sysCountService,
+ IBsLineInfoService bsLineInfoService
) {
OPCUaSubscription.miloService = miloService;
this.daParamCollectionService = daParamCollectionService;
@@ -66,6 +71,7 @@
this.daCollectionParamConfService = daCollectionParamConfService;
this.daMaterialCollectionService = daMaterialCollectionService;
this.sysCountService = sysCountService;
+ this.bsLineInfoService = bsLineInfoService;
}
@Override
@@ -95,13 +101,14 @@
if (Constants.ZERO.equals(valueString)){
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(0).build());
//璇锋眰杩涚珯
- } else if (Constants.ONE.equals(valueString)){
+ } if (Constants.ONE.equals(valueString)){
//1.1//棣栧伐绔�
if(Constants.ONLINE.contains(device)){
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
}
//1.2//闄ら宸ョ珯鎵�鏈夊伐绔�
else if(
+// Constants.TEST.contains(device) ||
Constants.PLC1.contains(device) ||
Constants.PLC2.contains(device) ||
Constants.PLC3.contains(device) ||
@@ -124,6 +131,44 @@
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".EngineType").value(EngineType).build());
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SerialNumber").value(SerialNumber).build());
}
+ //9L鍙戝姩鏈烘秱鑳惰建杩逛笅鍙�
+ else if(Constants.OP080.equals(device) && Constants.PLC_4.equals(thoroughfare)){
+ // 1. 鍒濆鍖栧伐鍗曞璞″苟鏌ヨ宸ュ崟淇℃伅
+ String workOrderNo = resultList.get(0).getWorkOrderNo();
+ OmProductionOrderInfo queryOrder = new OmProductionOrderInfo();
+ queryOrder.setWorkOrderNo(workOrderNo);
+ List<OmProductionOrderInfo> orderList = omProductionOrderInfoService.selectOmProductionOrderInfoList(queryOrder);
+ // 2. 鍒ゆ柇绫诲瀷鍒嗘敮閫昏緫
+ String engineName = orderList.get(0).getEngineName();
+ if (!"9L".equals(engineName)) {
+ // 闈�9L鐩存帴鍐�0
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".GlueType").value(0).build());
+ } else {
+ // 3. 鏌ヨ浜х嚎閰嶇疆鐨勪袱鏉￠缃暟鎹�
+ BsLineInfo lineQuery = new BsLineInfo();
+ lineQuery.setLineCode(engineName); // 鍋囪閫氳繃lineCode=9L鑾峰彇涓ゆ潯鏁版嵁
+ List<BsLineInfo> configuredLines = bsLineInfoService.selectBsLineInfoList(lineQuery);
+ // 绗竴鏉￠厤缃暟鎹殑鏍￠獙
+ BsLineInfo firstLine = configuredLines.get(0);
+ BsBomChildInfo checkFirst = new BsBomChildInfo();
+ checkFirst.setMaterialCode(firstLine.getLineName());
+ checkFirst.setBomCode(workOrderNo);
+ List<BsBomChildInfo> firstCheckList = bsBomChildInfoService.selectBsBomChildInfoList(checkFirst);
+ if (firstCheckList.size() == 1) {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".GlueType").value(1).build());
+ } else {
+ // 绗簩鏉￠厤缃暟鎹殑鏍￠獙
+ BsLineInfo secondLine = configuredLines.get(1);
+ BsBomChildInfo checkSecond = new BsBomChildInfo();
+ checkSecond.setMaterialCode(secondLine.getLineName());
+ checkSecond.setBomCode(workOrderNo);
+ List<BsBomChildInfo> secondCheckList = bsBomChildInfoService.selectBsBomChildInfoList(checkSecond);
+ if (secondCheckList.size() == 1) {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".GlueType").value(2).build());
+ }
+ }
+ }
+ }
String getWorkOrderNo = resultList.get(0).getWorkOrderNo();
BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
bsbomChildInfo.setLocationCode(device);
@@ -138,7 +183,7 @@
}
}
//鍑虹珯淇濆瓨鏁版嵁
- } else if (Constants.TWO.equals(valueString)) {
+ } if (Constants.TWO.equals(valueString)) {
OmProductionOrderInfo omProductionOrderInfo = new OmProductionOrderInfo();
OmOrderScheduling omOrderScheduling = new OmOrderScheduling();
Object SFCCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".SFCCode").getValue();
@@ -237,6 +282,56 @@
if (Objects.equals(nowQty, getPreOrder2.getPlanQty().toString())){
omProductionOrderInfoService.updatePreStatus2();
}
+// }else if (Constants.OP020.equals(device)){
+// final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+// // 閬嶅巻 MaterialCode35 鍒� MaterialCode40 鍏�6缁勬暟鎹�
+// for (int i = 35; i <= 40; i++) { // 淇敼寰幆鑼冨洿
+// // 鏋勫缓OPC UA鑺傜偣鍦板潃锛堜緥濡傦細PLC1.OP020.MaterialCode35锛�
+// String nodeId = "PLC2." + device + ".MaterialCode" + i;
+// // 鍒涘缓閲囬泦瀵硅薄
+// DaMaterialCollection materialCollection = new DaMaterialCollection();
+// materialCollection.setSfcCode(SFCCode.toString());
+// materialCollection.setLocationCode(device);
+// // 璁剧疆鍙傛暟鍚嶇О锛堟椿濉�1鍒版椿濉�6锛�
+// int pistonNumber = i - 34; // 35鈫�1, 36鈫�2...40鈫�6
+// materialCollection.setParamName("娲诲" + pistonNumber);
+// // 閫氳繃OPC UA璇诲彇鍙傛暟鍊�
+// ReadWriteEntity dataRead = miloService.readFromOpcUa(nodeId);
+// if (dataRead != null && dataRead.getValue() != null && !Objects.equals(dataRead.getValue(), " ")) {
+// materialCollection.setParamValue(dataRead.getValue().toString());
+// Date collectTime = new Date();
+// ReadWriteEntity collectTimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StopTime");//杩涚珯鏃堕棿
+// collectTime = format.parse(TimeUtil.test(TimeUtil.stringProcessing(collectTimeRead.getValue().toString())));
+// materialCollection.setCollectTime( collectTime);
+// // 鎻掑叆鏁版嵁搴�
+// daMaterialCollectionService.insertDaMaterialCollection(materialCollection);
+// } else {
+// log.info("娲诲鍙蜂负绌�: {}",materialCollection.getParamName() );
+// }
+// }
+// }else if (Constants.OP130.equals(device)){
+// final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+// // 閬嶅巻 MaterialCode35 鍒� MaterialCode40 鍏�6缁勬暟鎹�
+// String nodeId = "PLC3." + device + ".MaterialCode35" ;
+// // 鍒涘缓閲囬泦瀵硅薄
+// DaMaterialCollection materialCollection = new DaMaterialCollection();
+// materialCollection.setSfcCode(SFCCode.toString());
+// materialCollection.setLocationCode(device);
+// materialCollection.setParamName("缂哥洊鐮�");
+// // 閫氳繃OPC UA璇诲彇鍙傛暟鍊�
+// ReadWriteEntity dataRead = miloService.readFromOpcUa(nodeId);
+// if (dataRead != null && dataRead.getValue() != null && !Objects.equals(dataRead.getValue(), " ")) {
+// materialCollection.setParamValue(dataRead.getValue().toString());
+// Date collectTime = new Date();
+// ReadWriteEntity collectTimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StopTime");//杩涚珯鏃堕棿
+// collectTime = format.parse(TimeUtil.test(TimeUtil.stringProcessing(collectTimeRead.getValue().toString())));
+// materialCollection.setCollectTime( collectTime);
+// // 鎻掑叆鏁版嵁搴�
+// daMaterialCollectionService.insertDaMaterialCollection(materialCollection);
+// } else {
+// log.info("缂哥洊鐮佷负绌�: {}",materialCollection.getParamName() );
+// }
+
}
//鍑虹珯淇濆瓨
DaStationCollection daStationCollection = new DaStationCollection();
@@ -260,6 +355,7 @@
daCollectionParamConf1.setDescriptive("1");
List<DaCollectionParamConf> daCollectionParamConfList1 = daCollectionParamConfService.selectDaCollectionParamConfList(daCollectionParamConf1);
for (DaCollectionParamConf conf : daCollectionParamConfList1) {
+ String index = String.valueOf(daCollectionParamConfList1.indexOf(conf));
String gatherAddress = conf.getGatherAddress();
String valueObj = null;
ReadWriteEntity entity = miloService.readFromOpcUa(gatherAddress);
@@ -269,6 +365,7 @@
valueObj = value.toString(); // 鏈�缁堣祴鍊�
if (!Objects.equals(valueObj, " ")) {
DaMaterialCollection materialCollection = new DaMaterialCollection();
+ materialCollection.setRemark(index);
materialCollection.setSfcCode(SFCCode.toString());
materialCollection.setLocationCode(device);
materialCollection.setParamName(conf.getParameterSetName());
@@ -292,22 +389,27 @@
List<DaCollectionParamConf> daCollectionParamConfList2 = daCollectionParamConfService.selectDaCollectionParamConfList(daCollectionParamConf2);
for (DaCollectionParamConf conf : daCollectionParamConfList2) {
String gatherAddress = conf.getGatherAddress();
- String valueObj = miloService.readFromOpcUa(gatherAddress).getValue().toString(); // 鑾峰彇鍘熷鍊煎璞♀��:ml-citation{ref="4" data="citationList"}
- if (!Objects.equals(valueObj, "0.0") && !Objects.equals(valueObj, "0")) {
- DaParamCollection paramCollection = new DaParamCollection();
- paramCollection.setSfcCode(SFCCode.toString());
- paramCollection.setLocationCode(device);
- paramCollection.setParamName(conf.getParameterSetName());
- paramCollection.setParamValue(miloService.readFromOpcUa(gatherAddress).getValue().toString());
- Date Time = new Date();
- ReadWriteEntity TimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StopTime");
- Time = format.parse(TimeUtil.test(TimeUtil.stringProcessing(TimeRead.getValue().toString())));
- paramCollection.setCollectTime(Time);
- daParamCollectionService.insertDaParamCollection(paramCollection);
+ try{
+ Object valueObj = miloService.readFromOpcUa(gatherAddress).getValue(); // 鑾峰彇鍘熷鍊煎璞♀��:ml-citation{ref="4" data="citationList"}
+ if (!Objects.equals(valueObj, "0.0") && !Objects.equals(valueObj, "0") && valueObj != null ) {
+ DaParamCollection paramCollection = new DaParamCollection();
+ paramCollection.setSfcCode(SFCCode.toString());
+ paramCollection.setLocationCode(device);
+ paramCollection.setParamName(conf.getParameterSetName());
+ paramCollection.setParamValue(miloService.readFromOpcUa(gatherAddress).getValue().toString());
+ Date Time = new Date();
+ ReadWriteEntity TimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StopTime");
+ Time = format.parse(TimeUtil.test(TimeUtil.stringProcessing(TimeRead.getValue().toString())));
+ paramCollection.setCollectTime(Time);
+ daParamCollectionService.insertDaParamCollection(paramCollection);
+ }
+ else {
+ log.info("閲囬泦椤逛负绌�: {}", gatherAddress);
+ }
+ }catch (Exception e){
+ log.error(e.getMessage());
}
- else {
- log.info("閲囬泦椤逛负绌�: {}", gatherAddress);
- }
+
}
}
}
--
Gitblit v1.9.3