From 31960ffca93463cf4f6d417576c8694aed84138e Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期五, 07 三月 2025 12:40:31 +0800
Subject: [PATCH] 修改
---
billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 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 ae93b4b..00ed36a 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
@@ -93,19 +93,22 @@
//璇锋眰杩涚珯
} else if (Constants.ONE.equals(valueString)){
//1.1//棣栧伐绔�
- if(Constants.C005.equals(device) || Constants.OP005.equals(device) || Constants.P010.equals(device)){
+ if(Constants.ONLINE.contains(device)){
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("11").build());
}
- ///////闄ら宸ョ珯鎵�鏈夊伐绔�
- else if(Constants.PLC1.contains(device) && Constants.OP310.contains(device)){
+ //闄ら宸ョ珯鎵�鏈夊伐绔�
+ else if(Constants.PLC1.contains(device) ||
+ Constants.PLC2.contains(device) ||
+ Constants.PLC3.contains(device) ||
+ Constants.PLC4.contains(device) ||
+ Constants.OFFLINE.contains(device)
+ ){
//鏍￠獙SFCCode鏄惁瀛樺湪
Object SFCCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".SFCCode").getValue();
- Object PalletID = miloService.readFromOpcUa(thoroughfare + "." + device + ".PalletID").getValue();
if (SFCCode == null ) {
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("23").build());
} else {
OmOrderScheduling omOrderScheduling = new OmOrderScheduling();
- omOrderScheduling.setRemarks(PalletID.toString());
List<OmOrderScheduling> resultList = omOrderSchedulingService.selectOmOrderSchedulingList(omOrderScheduling);
log.info("鏌ヨ缁撴灉鏁伴噺: {}", resultList);
BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
@@ -114,7 +117,6 @@
//涓嬪彂閰嶆柟
formula(thoroughfare, device, bsbomChildInfo);
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("11").build());
-
}
}
//鍑虹珯淇濆瓨鏁版嵁
@@ -148,12 +150,9 @@
List<OmProductionOrderInfo> omProductionOrderInfoList = omProductionOrderInfoService.selectOmProductionOrderInfoList(omProductionOrderInfo);
Object headQty = omProductionOrderInfoList.get(0).getHeadQty();
if (nowQty == headQty){
-// omProductionOrderInfoList.get(0).setHeadStatus("3");
-// omProductionOrderInfoService.updateOmProductionOrderInfo(omProductionOrderInfoList.get(0));
-
UpdateWrapper<OmProductionOrderInfo> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("work_order_no", omProductionOrderInfoList.get(0).getWorkOrderNo());
- updateWrapper.set("body_status", "3");
+ updateWrapper.set("head_status", "3");
omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
}
} else if (Constants.OP310.equals(device)) {
@@ -166,10 +165,10 @@
List<OmProductionOrderInfo> omProductionOrderInfoList = omProductionOrderInfoService.selectOmProductionOrderInfoList(omProductionOrderInfo);
Object bodyQty = omProductionOrderInfoList.get(0).getBodyQty();
if (nowQty == bodyQty){
- omProductionOrderInfoList.get(0).setBodyStatus("3");
-
-
- omProductionOrderInfoService.updateOmProductionOrderInfo(omProductionOrderInfoList.get(0));
+ UpdateWrapper<OmProductionOrderInfo> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("work_order_no", omProductionOrderInfoList.get(0).getWorkOrderNo());
+ updateWrapper.set("body_status", "3");
+ omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
}
}
} else if (Constants.P010.equals(device)) {
@@ -186,11 +185,10 @@
List<OmProductionOrderInfo> omProductionOrderInfoList = omProductionOrderInfoService.selectOmProductionOrderInfoList(omProductionOrderInfo);
Object preQty = omProductionOrderInfoList.get(0).getPreQty();
if (nowQty == preQty){
- omProductionOrderInfoList.get(0).setPreStatus("3");
-
-
- omProductionOrderInfoService.updateOmProductionOrderInfo(omProductionOrderInfoList.get(0));
-
+ UpdateWrapper<OmProductionOrderInfo> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("work_order_no", omProductionOrderInfoList.get(0).getWorkOrderNo());
+ updateWrapper.set("pre_status", "3");
+ omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
}
}
//鏌ヨdescriptive瀛楁绛変簬1鐨勯噰闆嗛」淇濆瓨鍒版壂鐮佷繚瀛樺埌da_material_collection琛ㄩ噷
@@ -389,7 +387,6 @@
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MESSFCCode").value(SFCCode).build());
sysCountService.updateHeadNumber();
}
-
// 鏇存柊 WorkOrderRequestDone 鍦板潃鍧�
BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
bsbomChildInfo.setLocationCode(device);
--
Gitblit v1.9.3