From 1717a12c83db01e3b31ea9ed913e5bacaf9edbf3 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期六, 29 三月 2025 14:24:06 +0800
Subject: [PATCH] 修改
---
billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java | 197 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 165 insertions(+), 32 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 d66e297..e92c791 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,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);
@@ -94,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) ||
@@ -110,12 +118,60 @@
//鏍￠獙SFCCode鏄惁瀛樺湪
Object SFCCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".SFCCode").getValue();
if (SFCCode == null ) {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(13).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);
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鍙戝姩鏈烘秱鑳惰建杩逛笅鍙�
+ if(Constants.OP080.equals(device) ){
+ if(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);
@@ -124,35 +180,37 @@
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) || Constants.TEST.equals(device) ){
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(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);
- omOrderScheduling.setStatus("1");
//鎵樼洏缁戝畾SFCCode鍜屽伐鍗曞拰浜х嚎
if(Constants.OP005.equals(device)){
omProductionOrderInfoService.updateBodyStatus1();
omOrderScheduling.setRemarks("Body");
sysCountService.updateSerialNumber();
OmProductionOrderInfo getBodyOrder2 = omProductionOrderInfoService.getBodyOrder();
- if (Objects.equals(getBodyOrder2.getBodyQty(), getBodyOrder2.getPlanQty())){
+ if (Objects.equals(nowQty, getBodyOrder2.getPlanQty().toString())){
omProductionOrderInfoService.updateBodyStatus2();
}
}
@@ -161,7 +219,7 @@
omOrderScheduling.setRemarks("Head");
sysCountService.updateHeadNumber();
OmProductionOrderInfo getHeadOrder2 = omProductionOrderInfoService.getHeadOrder();
- if (Objects.equals(getHeadOrder2.getHeadQty(), getHeadOrder2.getPlanQty())){
+ if (Objects.equals(nowQty, getHeadOrder2.getPlanQty().toString())){
omProductionOrderInfoService.updateHeadStatus2();
}
}
@@ -175,27 +233,27 @@
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", "2");
omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
}
- } else if (Constants.OP300.equals(device)) {
+ } 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", "2");
@@ -215,7 +273,7 @@
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", "2");
@@ -224,9 +282,59 @@
sysCountService.updatePreNumber();
omProductionOrderInfoService.updatePreStatus1();
OmProductionOrderInfo getPreOrder2 = omProductionOrderInfoService.getPreOrder();
- if (Objects.equals(getPreOrder2.getPreQty(), getPreOrder2.getPlanQty())){
+ 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.plusSave(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.plusSave(materialCollection);
+ } else {
+ log.info("缂哥洊鐮佷负绌�: {}",materialCollection.getParamName() );
+ }
}
//鍑虹珯淇濆瓨
DaStationCollection daStationCollection = new DaStationCollection();
@@ -259,6 +367,7 @@
valueObj = value.toString(); // 鏈�缁堣祴鍊�
if (!Objects.equals(valueObj, " ")) {
DaMaterialCollection materialCollection = new DaMaterialCollection();
+
materialCollection.setSfcCode(SFCCode.toString());
materialCollection.setLocationCode(device);
materialCollection.setParamName(conf.getParameterSetName());
@@ -270,7 +379,7 @@
daMaterialCollectionService.insertDaMaterialCollection(materialCollection);
}
else {
- log.debug("閲囬泦椤逛负绌�: {}", gatherAddress);
+ log.info("閲囬泦椤逛负绌�: {}", gatherAddress);
}
}
}
@@ -282,22 +391,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.debug("閲囬泦椤逛负绌�: {}", gatherAddress);
- }
+
}
}
}
@@ -306,6 +420,9 @@
log.error(e.getMessage());
}
}
+
+
+
//棣栧伐绔欎笅鍙戝伐鍗�,骞剁敓鎴怱N鐮�
private static final String[] MONTH = {"A","B","C","D","E","F","G","H","I","J","K","L"};
@@ -333,8 +450,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());
+ log.info("SFCCode锛歿}涓嬪彂鎴愬姛",SFCCode);
}else{
sysCountService.clean();
sysCountService.updateYear();
@@ -344,8 +464,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());
+ log.info("SFCCode锛歿}涓嬪彂鎴愬姛",SFCCode);
}
// 鏇存柊 WorkOrderRequestDone 鍦板潃鍧�
BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
@@ -362,8 +485,10 @@
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)) {
@@ -386,6 +511,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());
+ log.info("SFCCode锛歿}涓嬪彂鎴愬姛",SFCCode);
}else{
sysCountService.clean();
sysCountService.updateYear();
@@ -397,6 +523,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());
+ log.info("SFCCode锛歿}涓嬪彂鎴愬姛",SFCCode);
}
// 鏇存柊 WorkOrderRequestDone 鍦板潃鍧�
BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
@@ -413,8 +540,10 @@
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)) {
@@ -436,6 +565,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());
+ log.info("SFCCode锛歿}涓嬪彂鎴愬姛",SFCCode);
}else{
sysCountService.clean();
sysCountService.updateYear();
@@ -447,6 +577,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());
+ log.info("SFCCode锛歿}涓嬪彂鎴愬姛",SFCCode);
}
// 鏇存柊 WorkOrderRequestDone 鍦板潃鍧�
BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
@@ -463,8 +594,10 @@
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());
}
}
--
Gitblit v1.9.3