From 5e0888a8dc804a4df27ce033b6c3429e530a9ef9 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期三, 26 三月 2025 19:05:24 +0800
Subject: [PATCH] -
---
billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java | 378 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 287 insertions(+), 91 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 00ed36a..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
@@ -1,9 +1,10 @@
package com.billion.main.plcServer.sub;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.billion.common.utils.StringUtils;
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;
@@ -17,14 +18,17 @@
import com.billion.main.om.domain.OmProductionOrderInfo;
import com.billion.main.om.service.IOmOrderSchedulingService;
import com.billion.main.om.service.IOmProductionOrderInfoService;
+import com.billion.main.plcServer.util.TimeUtil;
import com.billion.main.sys.domain.SysCount;
import com.billion.main.sys.service.ISysCountService;
import com.kangaroohy.milo.model.ReadWriteEntity;
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;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
@@ -33,6 +37,8 @@
@Slf4j
@Component
public class OPCUaSubscription implements SubscriptionCallback {
+
+ public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
public static MiloService miloService;
public IDaParamCollectionService daParamCollectionService;
public IDaStationCollectionService daStationCollectionService;
@@ -42,6 +48,7 @@
public IDaCollectionParamConfService daCollectionParamConfService;
public IDaMaterialCollectionService daMaterialCollectionService;
public ISysCountService sysCountService;
+ public IBsLineInfoService bsLineInfoService;
public OPCUaSubscription(MiloService miloService,
@@ -52,7 +59,8 @@
IBsBomChildInfoService bsBomChildInfoService,
IDaCollectionParamConfService daCollectionParamConfService,
IDaMaterialCollectionService daMaterialCollectionService,
- ISysCountService sysCountService
+ ISysCountService sysCountService,
+ IBsLineInfoService bsLineInfoService
) {
OPCUaSubscription.miloService = miloService;
this.daParamCollectionService = daParamCollectionService;
@@ -63,7 +71,9 @@
this.daCollectionParamConfService = daCollectionParamConfService;
this.daMaterialCollectionService = daMaterialCollectionService;
this.sysCountService = sysCountService;
+ this.bsLineInfoService = bsLineInfoService;
}
+
@Override
public void onSubscribe(String identifier, Object value) {
log.info("鍦板潃锛�"+identifier+"鍊硷細"+value);
@@ -89,15 +99,17 @@
if (Constants.RecordData.equals(tab)){
//宸ョ珯浜や簰鍒濆鍖�
if (Constants.ZERO.equals(valueString)){
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("0").build());
+ 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.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("11").build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
}
- //闄ら宸ョ珯鎵�鏈夊伐绔�
- else if(Constants.PLC1.contains(device) ||
+ //1.2//闄ら宸ョ珯鎵�鏈夊伐绔�
+ else if(
+// Constants.TEST.contains(device) ||
+ Constants.PLC1.contains(device) ||
Constants.PLC2.contains(device) ||
Constants.PLC3.contains(device) ||
Constants.PLC4.contains(device) ||
@@ -106,68 +118,142 @@
//鏍￠獙SFCCode鏄惁瀛樺湪
Object SFCCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".SFCCode").getValue();
if (SFCCode == null ) {
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("23").build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(13).build());
+ log.info( "杩涚珯澶辫触锛氬湴鍧�SFCCode涓虹┖");
} else {
OmOrderScheduling omOrderScheduling = new OmOrderScheduling();
+ omOrderScheduling.setSfcCode(SFCCode.toString());
List<OmOrderScheduling> resultList = omOrderSchedulingService.selectOmOrderSchedulingList(omOrderScheduling);
- log.info("鏌ヨ缁撴灉鏁伴噺: {}", resultList);
- BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
- bsbomChildInfo.setLocationCode(device);
- bsbomChildInfo.setBomCode(resultList.get(0).getWorkOrderNo());
- //涓嬪彂閰嶆柟
- formula(thoroughfare, device, bsbomChildInfo);
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("11").build());
+ if(resultList != null){
+ if(Constants.OP010.equals(device)||Constants.OP310.equals(device)){
+ String EngineType =resultList.get(0).getProductCode();
+ String SerialNumber = SFCCode.toString().substring(EngineType.length());
+ 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);
+ bsbomChildInfo.setBomCode(getWorkOrderNo);
+ //涓嬪彂閰嶆柟
+ formula(thoroughfare, device, bsbomChildInfo);
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
+ }else {
+ log.info( "杩涚珯澶辫触锛氭湭妫�绱㈠埌SFCCode:{}瀵瑰簲宸ュ崟" ,SFCCode);
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(13).build());
+ }
}
}
//鍑虹珯淇濆瓨鏁版嵁
- } 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();
//涓婄嚎宸ヤ綅
if(Constants.ONLINE.contains(device)){
Object workOrderNumber = miloService.readFromOpcUa(thoroughfare + "." + device + ".WorkOrderNumber").getValue();
- Object nowQty = miloService.readFromOpcUa(thoroughfare + "." + device + ".PalletID").getValue();
+ Object nowQty = miloService.readFromOpcUa(thoroughfare + "." + device + ".PalletID").getValue().toString();
+ Object EngineType = miloService.readFromOpcUa(thoroughfare + "." + device + ".EngineType").getValue().toString();
omOrderScheduling.setWorkOrderNo(workOrderNumber.toString());
- omOrderScheduling.setNowQty((Long) nowQty);
+ omOrderScheduling.setNowQty(nowQty.toString());
omOrderScheduling.setSfcCode(SFCCode.toString());
+ omOrderScheduling.setProductCode(EngineType.toString());
+ omOrderScheduling.setStatus("1");
+ Date Time = new Date();
+ ReadWriteEntity TimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StartTime");
+ Time = format.parse(TimeUtil.test(TimeUtil.stringProcessing(TimeRead.getValue().toString())));
+ omOrderScheduling.setOnlineTime(Time);
//鎵樼洏缁戝畾SFCCode鍜屽伐鍗曞拰浜х嚎
if(Constants.OP005.equals(device)){
+ omProductionOrderInfoService.updateBodyStatus1();
omOrderScheduling.setRemarks("Body");
+ sysCountService.updateSerialNumber();
+ OmProductionOrderInfo getBodyOrder2 = omProductionOrderInfoService.getBodyOrder();
+ if (Objects.equals(nowQty, getBodyOrder2.getPlanQty().toString())){
+ omProductionOrderInfoService.updateBodyStatus2();
+ }
}
if(Constants.C005.equals(device)){
+ omProductionOrderInfoService.updateHeadStatus1();
omOrderScheduling.setRemarks("Head");
+ sysCountService.updateHeadNumber();
+ OmProductionOrderInfo getHeadOrder2 = omProductionOrderInfoService.getHeadOrder();
+ if (Objects.equals(nowQty, getHeadOrder2.getPlanQty().toString())){
+ omProductionOrderInfoService.updateHeadStatus2();
+ }
}
omOrderSchedulingService.insertOmOrderScheduling(omOrderScheduling);
}else if(Constants.OFFLINE.contains(device)){
- if(Constants.C070.equals(device)){
+ Date Time = new Date();
+ ReadWriteEntity TimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StopTime");
+ Time = format.parse(TimeUtil.test(TimeUtil.stringProcessing(TimeRead.getValue().toString())));
+ omOrderScheduling.setOfflineTime(Time);
+ if(Constants.C060.equals(device)){
omOrderScheduling.setRemarks("Head");
omOrderScheduling.setSfcCode(SFCCode.toString());
List<OmOrderScheduling> omOrderSchedulingList = omOrderSchedulingService.selectOmOrderSchedulingList(omOrderScheduling);
- Object nowQty = omOrderSchedulingList.get(0).getNowQty();
+ String nowQty = omOrderSchedulingList.get(0).getNowQty();
Object WorkOrderNumber = omOrderSchedulingList.get(0).getWorkOrderNo();
omProductionOrderInfo.setWorkOrderNo(WorkOrderNumber.toString());
List<OmProductionOrderInfo> omProductionOrderInfoList = omProductionOrderInfoService.selectOmProductionOrderInfoList(omProductionOrderInfo);
Object headQty = omProductionOrderInfoList.get(0).getHeadQty();
- if (nowQty == headQty){
+ if (Objects.equals(nowQty, headQty.toString())){
UpdateWrapper<OmProductionOrderInfo> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("work_order_no", omProductionOrderInfoList.get(0).getWorkOrderNo());
- updateWrapper.set("head_status", "3");
+ updateWrapper.set("head_status", "2");
omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
}
} else if (Constants.OP310.equals(device)) {
omOrderScheduling.setRemarks("Body");
omOrderScheduling.setSfcCode(SFCCode.toString());
List<OmOrderScheduling> omOrderSchedulingList = omOrderSchedulingService.selectOmOrderSchedulingList(omOrderScheduling);
- Object nowQty = omOrderSchedulingList.get(0).getNowQty();
+ String nowQty = omOrderSchedulingList.get(0).getNowQty();
Object WorkOrderNumber = omOrderSchedulingList.get(0).getWorkOrderNo();
omProductionOrderInfo.setWorkOrderNo(WorkOrderNumber.toString());
List<OmProductionOrderInfo> omProductionOrderInfoList = omProductionOrderInfoService.selectOmProductionOrderInfoList(omProductionOrderInfo);
Object bodyQty = omProductionOrderInfoList.get(0).getBodyQty();
- if (nowQty == bodyQty){
+ if (Objects.equals(nowQty, bodyQty.toString())){
UpdateWrapper<OmProductionOrderInfo> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("work_order_no", omProductionOrderInfoList.get(0).getWorkOrderNo());
- updateWrapper.set("body_status", "3");
+ updateWrapper.set("body_status", "2");
omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
}
}
@@ -175,7 +261,7 @@
Object workOrderNumber = miloService.readFromOpcUa(thoroughfare + "." + device + ".WorkOrderNumber").getValue();
Object nowQty = miloService.readFromOpcUa(thoroughfare + "." + device + ".PalletID").getValue();
omOrderScheduling.setWorkOrderNo(workOrderNumber.toString());
- omOrderScheduling.setNowQty((Long) nowQty);
+ omOrderScheduling.setNowQty(nowQty.toString());
omOrderScheduling.setSfcCode(SFCCode.toString());
omOrderScheduling.setRemarks("Pre");
omOrderSchedulingService.insertOmOrderScheduling(omOrderScheduling);
@@ -184,60 +270,147 @@
omProductionOrderInfo.setWorkOrderNo(WorkOrderNumber.toString());
List<OmProductionOrderInfo> omProductionOrderInfoList = omProductionOrderInfoService.selectOmProductionOrderInfoList(omProductionOrderInfo);
Object preQty = omProductionOrderInfoList.get(0).getPreQty();
- if (nowQty == preQty){
+ if (nowQty == preQty.toString()){
UpdateWrapper<OmProductionOrderInfo> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("work_order_no", omProductionOrderInfoList.get(0).getWorkOrderNo());
- updateWrapper.set("pre_status", "3");
+ updateWrapper.set("pre_status", "2");
omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
}
+ sysCountService.updatePreNumber();
+ omProductionOrderInfoService.updatePreStatus1();
+ OmProductionOrderInfo getPreOrder2 = omProductionOrderInfoService.getPreOrder();
+ 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();
+ daStationCollection.setLocationCode(device);
+ daStationCollection.setSfcCode(SFCCode.toString());
+ Object StationStatus = miloService.readFromOpcUa(thoroughfare + "." + device + ".StationStatus").getValue();
+ Date startTime = new Date();
+ ReadWriteEntity startTimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StartTime");//杩涚珯鏃堕棿
+ startTime = format.parse(TimeUtil.test(TimeUtil.stringProcessing(startTimeRead.getValue().toString())));
+ daStationCollection.setInboundTime( startTime);
+ Date stopTime = new Date();
+ ReadWriteEntity stopTimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StopTime");//杩涚珯鏃堕棿
+ stopTime = format.parse(TimeUtil.test(TimeUtil.stringProcessing(stopTimeRead.getValue().toString())));
+ daStationCollection.setOutboundTime( stopTime);
+ daStationCollection.setStatus(StationStatus.toString());
+ daStationCollectionService.insertDaStationCollection(daStationCollection);
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(21).build());
//鏌ヨdescriptive瀛楁绛変簬1鐨勯噰闆嗛」淇濆瓨鍒版壂鐮佷繚瀛樺埌da_material_collection琛ㄩ噷
DaCollectionParamConf daCollectionParamConf1 = new DaCollectionParamConf();
daCollectionParamConf1.setProcessesCode(device);
daCollectionParamConf1.setDescriptive("1");
List<DaCollectionParamConf> daCollectionParamConfList1 = daCollectionParamConfService.selectDaCollectionParamConfList(daCollectionParamConf1);
for (DaCollectionParamConf conf : daCollectionParamConfList1) {
+ String index = String.valueOf(daCollectionParamConfList1.indexOf(conf));
String gatherAddress = conf.getGatherAddress();
- Object valueObj = miloService.readFromOpcUa(gatherAddress).getValue(); // 鑾峰彇鍘熷鍊煎璞♀��:ml-citation{ref="4" data="citationList"}
- if (valueObj == null || StringUtils.isEmpty(valueObj.toString())) {
- log.warn("閲囬泦鍦板潃{}杩斿洖绌哄�硷紝璺宠繃瀛樺偍", gatherAddress);
- continue; // 缁堟褰撳墠寰幆杩唬鈥�:ml-citation{ref="1,2" data="citationList"}
+ String valueObj = null;
+ ReadWriteEntity entity = miloService.readFromOpcUa(gatherAddress);
+ if (entity != null) {
+ Object value = entity.getValue();
+ if (value != null) {
+ 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());
+ materialCollection.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())));
+ materialCollection.setCollectTime(Time);
+ daMaterialCollectionService.insertDaMaterialCollection(materialCollection);
+ }
+ else {
+ log.info("閲囬泦椤逛负绌�: {}", gatherAddress);
+ }
+ }
}
- DaMaterialCollection materialCollection = new DaMaterialCollection();
- materialCollection.setSfcCode(SFCCode.toString());
- materialCollection.setLocationCode(device);
- materialCollection.setParamName(conf.getParameterSetName());
- materialCollection.setParamValue((String) miloService.readFromOpcUa(gatherAddress).getValue());
- materialCollection.setCollectTime(new Date());
- daMaterialCollectionService.insertDaMaterialCollection(materialCollection);
}
- //鏌ヨdescriptive瀛楁绛変簬2鐨勯噰闆嗛」淇濆瓨鍒版壂鐮佷繚瀛樺埌da_param_collection琛ㄩ噷
+// 鏌ヨdescriptive瀛楁绛変簬2鐨勯噰闆嗛」淇濆瓨鍒版壂鐮佷繚瀛樺埌da_param_collection琛ㄩ噷
DaCollectionParamConf daCollectionParamConf2 = new DaCollectionParamConf();
daCollectionParamConf2.setProcessesCode(device);
daCollectionParamConf2.setDescriptive("2");
List<DaCollectionParamConf> daCollectionParamConfList2 = daCollectionParamConfService.selectDaCollectionParamConfList(daCollectionParamConf2);
for (DaCollectionParamConf conf : daCollectionParamConfList2) {
String gatherAddress = conf.getGatherAddress();
- Object valueObj = miloService.readFromOpcUa(gatherAddress).getValue(); // 鑾峰彇鍘熷鍊煎璞♀��:ml-citation{ref="4" data="citationList"}
- if (valueObj == null || StringUtils.isEmpty(valueObj.toString())) {
- log.warn("閲囬泦鍦板潃{}杩斿洖绌哄�硷紝璺宠繃瀛樺偍", gatherAddress);
- continue; // 缁堟褰撳墠寰幆杩唬鈥�:ml-citation{ref="1,2" data="citationList"}
+ 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());
}
- DaParamCollection paramCollection = new DaParamCollection();
- paramCollection.setSfcCode(SFCCode.toString());
- paramCollection.setLocationCode(device);
- paramCollection.setParamName(conf.getParameterSetName());
- paramCollection.setParamValue((String) miloService.readFromOpcUa(gatherAddress).getValue());
- paramCollection.setCollectionTime(new Date());
- daParamCollectionService.insertDaParamCollection(paramCollection);
+
}
- DaStationCollection daStationCollection = new DaStationCollection();
- daStationCollection.setLocationCode(device);
- daStationCollection.setSfcCode(SFCCode.toString());
- daStationCollection.setInboundTime((Date) miloService.readFromOpcUa(thoroughfare + "." + device + ".StartTime").getValue());
- daStationCollection.setOutboundTime((Date) miloService.readFromOpcUa(thoroughfare + "." + device + ".StopTime").getValue());
- daStationCollectionService.insertDaStationCollection(daStationCollection);
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("21").build());
}
}
}
@@ -245,13 +418,17 @@
log.error(e.getMessage());
}
}
+
+
+
+
//棣栧伐绔欎笅鍙戝伐鍗�,骞剁敓鎴怱N鐮�
private static final String[] MONTH = {"A","B","C","D","E","F","G","H","I","J","K","L"};
public void plackWorkOrder(String thoroughfare, String device, String tab, String valueString) {
try {
if (Constants.WorkOrderRequest.equals(tab)) {
if (Constants.ZERO.equals(valueString)) {
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("0").build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value(0).build());
}else if (Constants.ONE.equals(valueString)){
if (Constants.OP005.equals(device)){
// 鏌ヨ鏁版嵁搴撹幏鍙栫鍚堟潯浠剁殑璁㈠崟淇℃伅
@@ -260,7 +437,6 @@
//鍒ゆ柇褰撳墠涓嬪彂鏁伴噺鏄惁婊¤冻璁″垝鏁伴噺
//鏇存柊宸ュ崟鐘舵��
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(getBodyOrder.getWorkOrderNo()).build());
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ProductionPlan").value(String.valueOf(getBodyOrder.getPlanQty())).build());
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".EngineType").value(getBodyOrder.getEngineType()).build());
//鐢熸垚sn鐮�
SysCount serialNumber = sysCountService.getSerialNumber();
@@ -272,9 +448,11 @@
String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 鑾峰彇褰撳墠鏈堜唤锛�1-12锛�
String A5 = String.format("%05d", serialNumber.getSerialNumber());
String SFCCode = A1 + A2 + A3+ A4 + A5;
+ String SerialNumber = A2 + A3+ A4 + A5;
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SerialNumber").value(SerialNumber).build());
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MESSFCCode").value(SFCCode).build());
- sysCountService.updateSerialNumber();
+ log.info("SFCCode锛歿}涓嬪彂鎴愬姛",SFCCode);
}else{
sysCountService.clean();
sysCountService.updateYear();
@@ -284,9 +462,11 @@
String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 鑾峰彇褰撳墠鏈堜唤锛�1-12锛�
String A5 = String.format("%05d", sysCountService.getSerialNumber().getSerialNumber());
String SFCCode = A1 + A2 + newA3+ A4 + A5;
+ String SerialNumber = A2 + newA3+ A4 + A5;
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SerialNumber").value(SerialNumber).build());
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MESSFCCode").value(SFCCode).build());
- sysCountService.updateSerialNumber();
+ log.info("SFCCode锛歿}涓嬪彂鎴愬姛",SFCCode);
}
// 鏇存柊 WorkOrderRequestDone 鍦板潃鍧�
BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
@@ -294,15 +474,21 @@
bsbomChildInfo.setBomCode(getBodyOrder.getWorkOrderNo());
//鍙戜笅宸ヨ壓閰嶆柟
formula(thoroughfare, device, bsbomChildInfo);
- omProductionOrderInfoService.updateBodyStatus1();
+// omProductionOrderInfoService.updateBodyStatus1();
//鍒ゆ柇缂镐綋宸ュ崟瀹屾垚
- OmProductionOrderInfo getBodyOrder2 = omProductionOrderInfoService.getBodyOrder();
- if (Objects.equals(getBodyOrder2.getBodyQty(), getBodyOrder2.getPlanQty())){
- omProductionOrderInfoService.updateBodyStatus2();
- }
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(getBodyOrder2.getBodyQty()).build());
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("11").build());
+// OmProductionOrderInfo getBodyOrder2 = omProductionOrderInfoService.getBodyOrder();
+// if (Objects.equals(getBodyOrder2.getBodyQty(), getBodyOrder2.getPlanQty())){
+// omProductionOrderInfoService.updateBodyStatus2();
+// }
+ String PalletID = String.valueOf(getBodyOrder.getBodyQty() + 1);
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(PalletID).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value(11).build());
+ log.info("宸ヤ綅{}璇锋眰宸ュ崟鎴愬姛",device);
}
+ else{
+ log.info("璇锋眰宸ュ崟澶辫触锛氭湭妫�绱㈠埌宸ュ崟");
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value(12).build());
+ }
} else if (Constants.C005.equals(device)) {
// 鏌ヨ鏁版嵁搴撹幏鍙栫鍚堟潯浠剁殑璁㈠崟淇℃伅
OmProductionOrderInfo getHeadOrder = omProductionOrderInfoService.getHeadOrder();
@@ -310,7 +496,6 @@
//鍒ゆ柇褰撳墠涓嬪彂鏁伴噺鏄惁婊¤冻璁″垝鏁伴噺
//鏇存柊宸ュ崟鐘舵��
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(getHeadOrder.getWorkOrderNo()).build());
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ProductionPlan").value(String.valueOf(getHeadOrder.getPlanQty())).build());
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".EngineType").value(getHeadOrder.getEngineType()).build());
//鐢熸垚sn鐮�
SysCount headNumber = sysCountService.getHeadNumber();
@@ -324,7 +509,7 @@
String SFCCode = A1 + A2 + A3+ A4 + A5;
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MESSFCCode").value(SFCCode).build());
- sysCountService.updateHeadNumber();
+ log.info("SFCCode锛歿}涓嬪彂鎴愬姛",SFCCode);
}else{
sysCountService.clean();
sysCountService.updateYear();
@@ -336,7 +521,7 @@
String SFCCode = A1 + A2 + newA3+ A4 + A5;
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MESSFCCode").value(SFCCode).build());
- sysCountService.updateHeadNumber();
+ log.info("SFCCode锛歿}涓嬪彂鎴愬姛",SFCCode);
}
// 鏇存柊 WorkOrderRequestDone 鍦板潃鍧�
BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
@@ -344,14 +529,20 @@
bsbomChildInfo.setBomCode(getHeadOrder.getWorkOrderNo());
//鍙戜笅宸ヨ壓閰嶆柟
formula(thoroughfare, device, bsbomChildInfo);
- omProductionOrderInfoService.updateHeadStatus1();
+// omProductionOrderInfoService.updateHeadStatus1();
//鍒ゆ柇缂镐綋宸ュ崟瀹屾垚
- OmProductionOrderInfo getHeadOrder2 = omProductionOrderInfoService.getHeadOrder();
- if (Objects.equals(getHeadOrder2.getHeadQty(), getHeadOrder2.getPlanQty())){
- omProductionOrderInfoService.updateHeadStatus2();
- }
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(getHeadOrder2.getHeadQty()).build());
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("11").build());
+// OmProductionOrderInfo getHeadOrder2 = omProductionOrderInfoService.getHeadOrder();
+// if (Objects.equals(getHeadOrder2.getHeadQty(), getHeadOrder2.getPlanQty())){
+// omProductionOrderInfoService.updateHeadStatus2();
+// }
+ String PalletID = String.valueOf(getHeadOrder.getHeadQty() + 1);
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(PalletID).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value(11).build());
+ log.info("宸ヤ綅{}璇锋眰宸ュ崟鎴愬姛",device);
+ }
+ else{
+ log.info("璇锋眰宸ュ崟澶辫触锛氭湭妫�绱㈠埌瀵瑰簲宸ュ崟");
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value(12).build());
}
} else if (Constants.P010.equals(device)) {
// 鏌ヨ鏁版嵁搴撹幏鍙栫鍚堟潯浠剁殑璁㈠崟淇℃伅
@@ -360,7 +551,6 @@
//鍒ゆ柇褰撳墠涓嬪彂鏁伴噺鏄惁婊¤冻璁″垝鏁伴噺
//鏇存柊宸ュ崟鐘舵��
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(getPreOrder.getWorkOrderNo()).build());
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ProductionPlan").value(String.valueOf(getPreOrder.getPlanQty())).build());
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".EngineType").value(getPreOrder.getEngineType()).build());
//鐢熸垚sn鐮�
SysCount preNumber = sysCountService.getPreNumber();
@@ -373,7 +563,7 @@
String SFCCode = A1 + A2 + A3+ A4 + A5;
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MESSFCCode").value(SFCCode).build());
- sysCountService.updatePreNumber();
+ log.info("SFCCode锛歿}涓嬪彂鎴愬姛",SFCCode);
}else{
sysCountService.clean();
sysCountService.updateYear();
@@ -385,7 +575,7 @@
String SFCCode = A1 + A2 + newA3+ A4 + A5;
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MESSFCCode").value(SFCCode).build());
- sysCountService.updateHeadNumber();
+ log.info("SFCCode锛歿}涓嬪彂鎴愬姛",SFCCode);
}
// 鏇存柊 WorkOrderRequestDone 鍦板潃鍧�
BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
@@ -393,14 +583,20 @@
bsbomChildInfo.setBomCode(getPreOrder.getWorkOrderNo());
//鍙戜笅宸ヨ壓閰嶆柟
formula(thoroughfare, device, bsbomChildInfo);
- omProductionOrderInfoService.updatePreStatus1();
+// omProductionOrderInfoService.updatePreStatus1();
//鍒ゆ柇缂镐綋宸ュ崟瀹屾垚
- OmProductionOrderInfo getPreOrder2 = omProductionOrderInfoService.getPreOrder();
- if (Objects.equals(getPreOrder2.getPreQty(), getPreOrder2.getPlanQty())){
- omProductionOrderInfoService.updatePreStatus2();
- }
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(getPreOrder2.getPreQty()).build());
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("11").build());
+// OmProductionOrderInfo getPreOrder2 = omProductionOrderInfoService.getPreOrder();
+// if (Objects.equals(getPreOrder2.getPreQty(), getPreOrder2.getPlanQty())){
+// omProductionOrderInfoService.updatePreStatus2();
+// }
+ String PalletID = String.valueOf(getPreOrder.getPreQty() + 1);
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(PalletID).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value(11).build());
+ log.info("宸ヤ綅{}璇锋眰宸ュ崟鎴愬姛",device);
+ }
+ else{
+ log.info("璇锋眰宸ュ崟澶辫触锛氭湭妫�绱㈠埌瀵瑰簲宸ュ崟");
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value(12).build());
}
}
}
@@ -415,9 +611,9 @@
List<BsBomChildInfo> bomChildList = bsBomChildInfoService.selectBsBomChildInfoList(bsbomChildInfo);
for (int i = 1; i <= bomChildList.size(); i++) {
// 鐢熸垚 MaterialCode 鑺傜偣
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".Material1Code"+ i).value(bomChildList.get(i-1).getMaterialCode()).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".Material"+ i +"Code").value(bomChildList.get(i-1).getMaterialCode()).build());
// 鐢熸垚 MaterialNumber 鑺傜偣
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".Material1Number"+ i).value(bomChildList.get(i-1).getCostQty()).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".Material"+ i +"Number").value(Integer.parseInt(bomChildList.get(i-1).getCostQty())).build());
}
}
--
Gitblit v1.9.3