From 1c50cb5546715fa21496fbdf2bdacb7ae8836b8a Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期二, 11 三月 2025 13:17:53 +0800
Subject: [PATCH] 修改
---
billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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 8d3663b..84bb29a 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
@@ -100,7 +100,8 @@
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
}
//闄ら宸ョ珯鎵�鏈夊伐绔�
- else if(Constants.PLC1.contains(device) ||
+ else if(
+ Constants.PLC1.contains(device) ||
Constants.PLC2.contains(device) ||
Constants.PLC3.contains(device) ||
Constants.PLC4.contains(device) ||
@@ -109,17 +110,22 @@
//鏍￠獙SFCCode鏄惁瀛樺湪
Object SFCCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".SFCCode").getValue();
if (SFCCode == null ) {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(23).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(13).build());
} 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.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
+ if(resultList != null){
+ 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 {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(13).build());
+ }
}
}
//鍑虹珯淇濆瓨鏁版嵁
--
Gitblit v1.9.3