From bf5dcc46de28c2ca664be4c6c3566e0a82c1ecd6 Mon Sep 17 00:00:00 2001 From: hdy <1105738590@qq.com> Date: 星期四, 27 二月 2025 09:11:08 +0800 Subject: [PATCH] 修改 --- billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java | 238 +++++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 174 insertions(+), 64 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 1ab1bbf..1603060 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,8 +1,14 @@ package com.billion.main.plcServer.sub; - +import com.billion.common.utils.StringUtils; import com.billion.main.bs.domain.BsBomChildInfo; import com.billion.main.bs.service.IBsBomChildInfoService; import com.billion.main.constant.Constants; +import com.billion.main.da.domain.DaCollectionParamConf; +import com.billion.main.da.domain.DaMaterialCollection; +import com.billion.main.da.domain.DaParamCollection; +import com.billion.main.da.domain.DaStationCollection; +import com.billion.main.da.service.IDaCollectionParamConfService; +import com.billion.main.da.service.IDaMaterialCollectionService; import com.billion.main.da.service.IDaParamCollectionService; import com.billion.main.da.service.IDaStationCollectionService; import com.billion.main.om.domain.OmOrderScheduling; @@ -14,9 +20,9 @@ import com.kangaroohy.milo.service.MiloService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; - import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.concurrent.CompletableFuture; @Slf4j @@ -27,21 +33,28 @@ public IDaStationCollectionService daStationCollectionService; public IOmProductionOrderInfoService omProductionOrderInfoService; public IOmOrderSchedulingService omOrderSchedulingService; - public IBsBomChildInfoService bomChildInfoService; + public IBsBomChildInfoService bsBomChildInfoService; + public IDaCollectionParamConfService daCollectionParamConfService; + public IDaMaterialCollectionService daMaterialCollectionService; + public OPCUaSubscription(MiloService miloService, IDaParamCollectionService daParamCollectionService, IDaStationCollectionService daStationCollectionService, IOmProductionOrderInfoService omProductionOrderInfoService, IOmOrderSchedulingService omOrderSchedulingService, - IBsBomChildInfoService bomChildInfoService + IBsBomChildInfoService bsBomChildInfoService, + IDaCollectionParamConfService daCollectionParamConfService, + IDaMaterialCollectionService daMaterialCollectionService ) { OPCUaSubscription.miloService = miloService; this.daParamCollectionService = daParamCollectionService; this.daStationCollectionService = daStationCollectionService; this.omProductionOrderInfoService = omProductionOrderInfoService; this.omOrderSchedulingService = omOrderSchedulingService; - this.bomChildInfoService = bomChildInfoService; + this.bsBomChildInfoService = bsBomChildInfoService; + this.daCollectionParamConfService = daCollectionParamConfService; + this.daMaterialCollectionService = daMaterialCollectionService; } @Override public void onSubscribe(String identifier, Object value) { @@ -113,11 +126,103 @@ omOrderScheduling.setSfcCode(SFCCode.toString()); omOrderSchedulinglist.add(omOrderScheduling); omOrderSchedulingService.saveBatch(omOrderSchedulinglist); - // 缂哄皯淇濆瓨鏁版嵁鐨勬柟娉� + //鏌ヨ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 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"} + } + 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琛ㄩ噷 + 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"} + } + 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()); - }else if(Constants.PLC.contains(device) && Constants.OP310.contains(device)){ - + }else if(Constants.PLC.contains(device) && Constants.OP310.contains(device) ){ + Object SFCCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".SFCCode").getValue(); + //鏌ヨ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 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"} + } + 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琛ㄩ噷 + 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"} + } + 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()); } } } @@ -131,28 +236,65 @@ 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()); - } else if (Constants.ONE.equals(valueString)) { - // 鏌ヨ鏁版嵁搴撹幏鍙栫鍚堟潯浠剁殑璁㈠崟淇℃伅 - OmProductionOrderInfo getEarliestOrder = omProductionOrderInfoService.getEarliestOrder(); - if (getEarliestOrder != null) { - //鍒ゆ柇褰撳墠涓嬪彂鏁伴噺 - if(getEarliestOrder.getRemarks() >= getEarliestOrder.getPlanQty()){ - //鏇存柊宸ュ崟鐘舵�� - omProductionOrderInfoService.updateOrderStatus5(); - //鏌ヨ鏂版弧瓒崇殑宸ュ崟 - OmProductionOrderInfo getEarliestOrder2 = omProductionOrderInfoService.getEarliestOrder(); - if (getEarliestOrder2 != null) { - // 灏嗘暟鎹啓鍏ュ埌鍦板潃鍧椾腑 - miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(getEarliestOrder2.getWorkOrderNo()).build()); - miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ProductionPlan").value(String.valueOf(getEarliestOrder2.getPlanQty())).build()); - miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".EngineType").value(getEarliestOrder2.getEngineType()).build()); + if(Constants.OP010.equals(device)){ + if (Constants.ZERO.equals(valueString)) { + miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("0").build()); + } else if (Constants.ONE.equals(valueString)) { + // 鏌ヨ鏁版嵁搴撹幏鍙栫鍚堟潯浠剁殑璁㈠崟淇℃伅 + OmProductionOrderInfo getEarliestOrder = omProductionOrderInfoService.getEarliestOrder(); + if (getEarliestOrder != null) { + //鍒ゆ柇褰撳墠涓嬪彂鏁伴噺 + if(getEarliestOrder.getRemarks() >= getEarliestOrder.getPlanQty()){ + //鏇存柊宸ュ崟鐘舵�� + omProductionOrderInfoService.updateOrderStatus5(); + //鏌ヨ鏂版弧瓒崇殑宸ュ崟 + OmProductionOrderInfo getEarliestOrder2 = omProductionOrderInfoService.getEarliestOrder(); + if (getEarliestOrder2 != null) { + // 灏嗘暟鎹啓鍏ュ埌鍦板潃鍧椾腑 + miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(getEarliestOrder2.getWorkOrderNo()).build()); + miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ProductionPlan").value(String.valueOf(getEarliestOrder2.getPlanQty())).build()); + miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".EngineType").value(getEarliestOrder2.getEngineType()).build()); + //鐢熸垚sn鐮� + OmProductionOrderInfo serialNumber = omProductionOrderInfoService.getSerialNumber(); + String A3 = String.valueOf(LocalDateTime.now().getYear()).substring(2); + if(A3.equals(String.valueOf(serialNumber.getRemarks()))){ + String A1 = getEarliestOrder2.getEngineType();//鑾峰彇浜у搧鍨嬪彿 + String A2 = "3"; + String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 鑾峰彇褰撳墠鏈堜唤锛�1-12锛� + String A5 = String.format("%05d", serialNumber.getPlanQty()); + String SFCCode = A1 + A2 + A3+ A4 + A5; + miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build()); + omProductionOrderInfoService.updateSerialNumber(); + }else{ + OmProductionOrderInfo newNumber = omProductionOrderInfoService.updateYear(); + String A1 = getEarliestOrder2.getEngineType();//鑾峰彇浜у搧鍨嬪彿 + String A2 = "3"; + String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 鑾峰彇褰撳墠鏈堜唤锛�1-12锛� + String A5 = String.format("%05d", newNumber.getPlanQty()); + String SFCCode = A1 + A2 + A3+ A4 + A5; + miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build()); + omProductionOrderInfoService.updateSerialNumber(); + } + // 鏇存柊 WorkOrderRequestDone 鍦板潃鍧� + miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("11").build()); + BsBomChildInfo bsbomChildInfo= new BsBomChildInfo(); + bsbomChildInfo.setLocationCode(device); + bsbomChildInfo.setBomCode(getEarliestOrder2.getWorkOrderNo()); + //鍙戜笅宸ヨ壓閰嶆柟 + formula(thoroughfare, device, bsbomChildInfo); + omProductionOrderInfoService.updateOrderStatus2(); + + } + } else if (getEarliestOrder.getRemarks() < getEarliestOrder.getPlanQty()) { + //鏇存柊宸ュ崟鐘舵�� + miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(getEarliestOrder.getWorkOrderNo()).build()); + miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ProductionPlan").value(String.valueOf(getEarliestOrder.getPlanQty())).build()); + miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".EngineType").value(getEarliestOrder.getEngineType()).build()); //鐢熸垚sn鐮� OmProductionOrderInfo serialNumber = omProductionOrderInfoService.getSerialNumber(); String A3 = String.valueOf(LocalDateTime.now().getYear()).substring(2); if(A3.equals(String.valueOf(serialNumber.getRemarks()))){ - String A1 = getEarliestOrder2.getEngineType();//鑾峰彇浜у搧鍨嬪彿 + String A1 = getEarliestOrder.getEngineType();//鑾峰彇浜у搧鍨嬪彿 String A2 = "3"; String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 鑾峰彇褰撳墠鏈堜唤锛�1-12锛� String A5 = String.format("%05d", serialNumber.getPlanQty()); @@ -161,7 +303,7 @@ omProductionOrderInfoService.updateSerialNumber(); }else{ OmProductionOrderInfo newNumber = omProductionOrderInfoService.updateYear(); - String A1 = getEarliestOrder2.getEngineType();//鑾峰彇浜у搧鍨嬪彿 + String A1 = getEarliestOrder.getEngineType();//鑾峰彇浜у搧鍨嬪彿 String A2 = "3"; String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 鑾峰彇褰撳墠鏈堜唤锛�1-12锛� String A5 = String.format("%05d", newNumber.getPlanQty()); @@ -173,49 +315,17 @@ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("11").build()); BsBomChildInfo bsbomChildInfo= new BsBomChildInfo(); bsbomChildInfo.setLocationCode(device); - bsbomChildInfo.setBomCode(getEarliestOrder2.getWorkOrderNo()); + bsbomChildInfo.setBomCode(getEarliestOrder.getWorkOrderNo()); //鍙戜笅宸ヨ壓閰嶆柟 formula(thoroughfare, device, bsbomChildInfo); omProductionOrderInfoService.updateOrderStatus2(); - } - } else if (getEarliestOrder.getRemarks() < getEarliestOrder.getPlanQty()) { - //鏇存柊宸ュ崟鐘舵�� - miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(getEarliestOrder.getWorkOrderNo()).build()); - miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ProductionPlan").value(String.valueOf(getEarliestOrder.getPlanQty())).build()); - miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".EngineType").value(getEarliestOrder.getEngineType()).build()); - //鐢熸垚sn鐮� - OmProductionOrderInfo serialNumber = omProductionOrderInfoService.getSerialNumber(); - String A3 = String.valueOf(LocalDateTime.now().getYear()).substring(2); - if(A3.equals(String.valueOf(serialNumber.getRemarks()))){ - String A1 = getEarliestOrder.getEngineType();//鑾峰彇浜у搧鍨嬪彿 - String A2 = "3"; - String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 鑾峰彇褰撳墠鏈堜唤锛�1-12锛� - String A5 = String.format("%05d", serialNumber.getPlanQty()); - String SFCCode = A1 + A2 + A3+ A4 + A5; - miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build()); - omProductionOrderInfoService.updateSerialNumber(); - }else{ - OmProductionOrderInfo newNumber = omProductionOrderInfoService.updateYear(); - String A1 = getEarliestOrder.getEngineType();//鑾峰彇浜у搧鍨嬪彿 - String A2 = "3"; - String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 鑾峰彇褰撳墠鏈堜唤锛�1-12锛� - String A5 = String.format("%05d", newNumber.getPlanQty()); - String SFCCode = A1 + A2 + A3+ A4 + A5; - miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build()); - omProductionOrderInfoService.updateSerialNumber(); - } - // 鏇存柊 WorkOrderRequestDone 鍦板潃鍧� - miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("11").build()); - BsBomChildInfo bsbomChildInfo= new BsBomChildInfo(); - bsbomChildInfo.setLocationCode(device); - bsbomChildInfo.setBomCode(getEarliestOrder.getWorkOrderNo()); - //鍙戜笅宸ヨ壓閰嶆柟 - formula(thoroughfare, device, bsbomChildInfo); - omProductionOrderInfoService.updateOrderStatus2(); } } + } else if (Constants.C005.equals(device)) { + } + } } catch (Exception e) { log.error(e.getMessage()); @@ -224,7 +334,7 @@ //鍙戜笅宸ヨ壓閰嶆柟鏂规硶 private void formula(String thoroughfare, String device, BsBomChildInfo bsbomChildInfo) throws Exception { - List<BsBomChildInfo> bomChildList = bomChildInfoService.selectBsBomChildInfoList(bsbomChildInfo); + 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()); -- Gitblit v1.9.3