From 5c4c78563bc55ac7a18e029a211f4a6be14b047a Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期二, 18 三月 2025 14:23:03 +0800
Subject: [PATCH] 修改
---
billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java | 145 +++++++++++++++++++++++++++++++-----------------
1 files changed, 93 insertions(+), 52 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 15e7766..a21cb4a 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
@@ -67,6 +67,7 @@
this.daMaterialCollectionService = daMaterialCollectionService;
this.sysCountService = sysCountService;
}
+
@Override
public void onSubscribe(String identifier, Object value) {
log.info("鍦板潃锛�"+identifier+"鍊硷細"+value);
@@ -99,7 +100,7 @@
if(Constants.ONLINE.contains(device)){
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
}
- //闄ら宸ョ珯鎵�鏈夊伐绔�
+ //1.2//闄ら宸ョ珯鎵�鏈夊伐绔�
else if(
Constants.PLC1.contains(device) ||
Constants.PLC2.contains(device) ||
@@ -110,12 +111,19 @@
//鏍￠獙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());
+ }
String getWorkOrderNo = resultList.get(0).getWorkOrderNo();
BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
bsbomChildInfo.setLocationCode(device);
@@ -124,6 +132,7 @@
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());
}
}
@@ -134,24 +143,37 @@
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(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)){
@@ -163,12 +185,12 @@
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");
@@ -178,12 +200,12 @@
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");
@@ -203,13 +225,35 @@
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");
omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
}
+ sysCountService.updatePreNumber();
+ omProductionOrderInfoService.updatePreStatus1();
+ OmProductionOrderInfo getPreOrder2 = omProductionOrderInfoService.getPreOrder();
+ if (Objects.equals(nowQty, getPreOrder2.getPlanQty().toString())){
+ omProductionOrderInfoService.updatePreStatus2();
+ }
}
+ //鍑虹珯淇濆瓨
+ 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);
@@ -217,7 +261,6 @@
List<DaCollectionParamConf> daCollectionParamConfList1 = daCollectionParamConfService.selectDaCollectionParamConfList(daCollectionParamConf1);
for (DaCollectionParamConf conf : daCollectionParamConfList1) {
String gatherAddress = conf.getGatherAddress();
-
String valueObj = null;
ReadWriteEntity entity = miloService.readFromOpcUa(gatherAddress);
if (entity != null) {
@@ -237,7 +280,7 @@
daMaterialCollectionService.insertDaMaterialCollection(materialCollection);
}
else {
- log.debug("閲囬泦椤逛负绌�: {}", gatherAddress);
+ log.info("閲囬泦椤逛负绌�: {}", gatherAddress);
}
}
}
@@ -263,24 +306,9 @@
daParamCollectionService.insertDaParamCollection(paramCollection);
}
else {
- log.debug("閲囬泦椤逛负绌�: {}", gatherAddress);
+ log.info("閲囬泦椤逛负绌�: {}", gatherAddress);
}
}
- 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());
}
}
}
@@ -288,6 +316,9 @@
log.error(e.getMessage());
}
}
+
+
+
//棣栧伐绔欎笅鍙戝伐鍗�,骞剁敓鎴怱N鐮�
private static final String[] MONTH = {"A","B","C","D","E","F","G","H","I","J","K","L"};
@@ -315,9 +346,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();
@@ -327,9 +360,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();
@@ -337,17 +372,19 @@
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();
- }
- String PalletID = getBodyOrder2.getBodyQty().toString();
+// 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)) {
@@ -370,7 +407,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();
@@ -382,7 +419,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();
@@ -390,17 +427,19 @@
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();
- }
- String PalletID = getHeadOrder2.getHeadQty().toString();
+// 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)) {
@@ -422,7 +461,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();
@@ -434,7 +473,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();
@@ -442,17 +481,19 @@
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();
- }
- String PalletID = getPreOrder2.getPreQty().toString();
+// 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());
}
}
--
Gitblit v1.9.3