From b9df2fc5c64a1d989991655a9e42e4d1f2ec4075 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期四, 06 三月 2025 18:18:11 +0800
Subject: [PATCH] 修改
---
billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java | 335 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 261 insertions(+), 74 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..aa650f9 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,14 +1,23 @@
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;
import com.billion.main.om.domain.OmProductionOrderInfo;
import com.billion.main.om.service.IOmOrderSchedulingService;
import com.billion.main.om.service.IOmProductionOrderInfoService;
+import com.billion.main.sys.domain.SysCount;
+import com.billion.main.sys.service.ISysCountService;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.runner.subscription.SubscriptionCallback;
import com.kangaroohy.milo.service.MiloService;
@@ -16,8 +25,9 @@
import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
-import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
@@ -27,21 +37,31 @@
public IDaStationCollectionService daStationCollectionService;
public IOmProductionOrderInfoService omProductionOrderInfoService;
public IOmOrderSchedulingService omOrderSchedulingService;
- public IBsBomChildInfoService bomChildInfoService;
+ public IBsBomChildInfoService bsBomChildInfoService;
+ public IDaCollectionParamConfService daCollectionParamConfService;
+ public IDaMaterialCollectionService daMaterialCollectionService;
+ public ISysCountService sysCountService;
+
public OPCUaSubscription(MiloService miloService,
IDaParamCollectionService daParamCollectionService,
IDaStationCollectionService daStationCollectionService,
IOmProductionOrderInfoService omProductionOrderInfoService,
IOmOrderSchedulingService omOrderSchedulingService,
- IBsBomChildInfoService bomChildInfoService
+ IBsBomChildInfoService bsBomChildInfoService,
+ IDaCollectionParamConfService daCollectionParamConfService,
+ IDaMaterialCollectionService daMaterialCollectionService,
+ ISysCountService sysCountService
) {
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;
+ this.sysCountService = sysCountService;
}
@Override
public void onSubscribe(String identifier, Object value) {
@@ -71,12 +91,12 @@
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("0").build());
//璇锋眰杩涚珯
} else if (Constants.ONE.equals(valueString)){
- //棣栧伐绔�
- if(Constants.C005.equals(device)){
+ //1.1//棣栧伐绔�
+ if(Constants.C005.equals(device) || Constants.OP005.equals(device) || Constants.P010.equals(device)){
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("11").build());
}
- //闄ら宸ョ珯鎵�鏈夊伐绔�
- else if(Constants.PLC.contains(device) && Constants.OP310.contains(device)){
+ ///////闄ら宸ョ珯鎵�鏈夊伐绔�
+ else if(Constants.PLC1.contains(device) && Constants.OP310.contains(device)){
//鏍￠獙SFCCode鏄惁瀛樺湪
Object SFCCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".SFCCode").getValue();
Object PalletID = miloService.readFromOpcUa(thoroughfare + "." + device + ".PalletID").getValue();
@@ -93,32 +113,129 @@
//涓嬪彂閰嶆柟
formula(thoroughfare, device, bsbomChildInfo);
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("11").build());
+
}
}
- //
- //
//鍑虹珯淇濆瓨鏁版嵁
} else if (Constants.TWO.equals(valueString)) {
- //棣栧姛绔�
- if(Constants.C005.equals(device)){
- // 鍒ゆ柇鎺ュ崟鏄惁鎴愬姛
- OmOrderScheduling omOrderScheduling = new OmOrderScheduling();
- List<OmOrderScheduling> omOrderSchedulinglist = new ArrayList<>();
+ OmProductionOrderInfo omProductionOrderInfo = new OmProductionOrderInfo();
+ OmOrderScheduling omOrderScheduling = new OmOrderScheduling();
+ Object SFCCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".SFCCode").getValue();
+ //涓婄嚎宸ヤ綅
+ if(Constants.ONLINE.contains(device)){
Object workOrderNumber = miloService.readFromOpcUa(thoroughfare + "." + device + ".WorkOrderNumber").getValue();
- Object PalletID = miloService.readFromOpcUa(thoroughfare + "." + device + ".PalletID").getValue();
- Object SFCCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".SFCCode").getValue();
- //鎵樼洏缁戝畾SFCCode鍜屽伐鍗�
+ Object nowQty = miloService.readFromOpcUa(thoroughfare + "." + device + ".PalletID").getValue();
omOrderScheduling.setWorkOrderNo(workOrderNumber.toString());
- omOrderScheduling.setRemarks(PalletID.toString());
+ omOrderScheduling.setNowQty((Long) nowQty);
omOrderScheduling.setSfcCode(SFCCode.toString());
- omOrderSchedulinglist.add(omOrderScheduling);
- omOrderSchedulingService.saveBatch(omOrderSchedulinglist);
- // 缂哄皯淇濆瓨鏁版嵁鐨勬柟娉�
+ //鎵樼洏缁戝畾SFCCode鍜屽伐鍗曞拰浜х嚎
+ if(Constants.OP005.equals(device)){
+ omOrderScheduling.setRemarks("Body");
+ }
+ if(Constants.C005.equals(device)){
+ omOrderScheduling.setRemarks("Head");
+ }
+ omOrderSchedulingService.insertOmOrderScheduling(omOrderScheduling);
+ }else if(Constants.OFFLINE.contains(device)){
+ if(Constants.C070.equals(device)){
+ omOrderScheduling.setRemarks("Head");
+ omOrderScheduling.setSfcCode(SFCCode.toString());
+ List<OmOrderScheduling> omOrderSchedulingList = omOrderSchedulingService.selectOmOrderSchedulingList(omOrderScheduling);
+ Object 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){
+ omProductionOrderInfoList.get(0).setHeadStatus("3");
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("21").build());
- }else if(Constants.PLC.contains(device) && Constants.OP310.contains(device)){
+ omProductionOrderInfoService.updateOmProductionOrderInfo(omProductionOrderInfoList.get(0));
+ }
+ } 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();
+ 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){
+ omProductionOrderInfoList.get(0).setBodyStatus("3");
+
+
+ omProductionOrderInfoService.updateOmProductionOrderInfo(omProductionOrderInfoList.get(0));
+ }
+ }
+ } else if (Constants.P010.equals(device)) {
+ Object workOrderNumber = miloService.readFromOpcUa(thoroughfare + "." + device + ".WorkOrderNumber").getValue();
+ Object nowQty = miloService.readFromOpcUa(thoroughfare + "." + device + ".PalletID").getValue();
+ omOrderScheduling.setWorkOrderNo(workOrderNumber.toString());
+ omOrderScheduling.setNowQty((Long) nowQty);
+ omOrderScheduling.setSfcCode(SFCCode.toString());
+ omOrderScheduling.setRemarks("Pre");
+ omOrderSchedulingService.insertOmOrderScheduling(omOrderScheduling);
+ List<OmOrderScheduling> omOrderSchedulingList = omOrderSchedulingService.selectOmOrderSchedulingList(omOrderScheduling);
+ Object WorkOrderNumber = omOrderSchedulingList.get(0).getWorkOrderNo();
+ omProductionOrderInfo.setWorkOrderNo(WorkOrderNumber.toString());
+ 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));
+
+ }
}
+ //鏌ヨ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());
}
}
}
@@ -133,86 +250,156 @@
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());
+ }else if (Constants.ONE.equals(valueString)){
+ if (Constants.OP005.equals(device)){
+ // 鏌ヨ鏁版嵁搴撹幏鍙栫鍚堟潯浠剁殑璁㈠崟淇℃伅
+ OmProductionOrderInfo getBodyOrder = omProductionOrderInfoService.getBodyOrder();
+ if (getBodyOrder != null) {
+ //鍒ゆ柇褰撳墠涓嬪彂鏁伴噺鏄惁婊¤冻璁″垝鏁伴噺
+ //鏇存柊宸ュ崟鐘舵��
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(getBodyOrder.getWorkOrderNo()).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ProductionPlan").value(String.valueOf(getBodyOrder.getPlanQty())).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".EngineType").value(getBodyOrder.getEngineType()).build());
//鐢熸垚sn鐮�
- OmProductionOrderInfo serialNumber = omProductionOrderInfoService.getSerialNumber();
+ SysCount serialNumber = sysCountService.getSerialNumber();
String A3 = String.valueOf(LocalDateTime.now().getYear()).substring(2);
- if(A3.equals(String.valueOf(serialNumber.getRemarks()))){
- String A1 = getEarliestOrder2.getEngineType();//鑾峰彇浜у搧鍨嬪彿
- String A2 = "3";
+ //鍒ゆ柇鏄惁璺ㄥ勾
+ if(A3.equals(String.valueOf(serialNumber.getYear()))){
+ String A1 = getBodyOrder.getEngineType();//鑾峰彇浜у搧鍨嬪彿
+ String A2 = "3";//鍥哄畾浜х嚎
String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 鑾峰彇褰撳墠鏈堜唤锛�1-12锛�
- String A5 = String.format("%05d", serialNumber.getPlanQty());
+ String A5 = String.format("%05d", serialNumber.getSerialNumber());
String SFCCode = A1 + A2 + A3+ A4 + A5;
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
- omProductionOrderInfoService.updateSerialNumber();
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MESSFCCode").value(SFCCode).build());
+ sysCountService.updateSerialNumber();
}else{
- OmProductionOrderInfo newNumber = omProductionOrderInfoService.updateYear();
- String A1 = getEarliestOrder2.getEngineType();//鑾峰彇浜у搧鍨嬪彿
+ sysCountService.clean();
+ sysCountService.updateYear();
+ String A1 = getBodyOrder.getEngineType();//鑾峰彇浜у搧鍨嬪彿
String A2 = "3";
+ String newA3 = String.valueOf(LocalDateTime.now().getYear()).substring(2);
String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 鑾峰彇褰撳墠鏈堜唤锛�1-12锛�
- String A5 = String.format("%05d", newNumber.getPlanQty());
- String SFCCode = A1 + A2 + A3+ A4 + A5;
+ String A5 = String.format("%05d", sysCountService.getSerialNumber().getSerialNumber());
+ String SFCCode = A1 + A2 + newA3+ A4 + A5;
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
- omProductionOrderInfoService.updateSerialNumber();
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MESSFCCode").value(SFCCode).build());
+ sysCountService.updateSerialNumber();
}
// 鏇存柊 WorkOrderRequestDone 鍦板潃鍧�
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("11").build());
BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
bsbomChildInfo.setLocationCode(device);
- bsbomChildInfo.setBomCode(getEarliestOrder2.getWorkOrderNo());
+ bsbomChildInfo.setBomCode(getBodyOrder.getWorkOrderNo());
//鍙戜笅宸ヨ壓閰嶆柟
formula(thoroughfare, device, bsbomChildInfo);
- omProductionOrderInfoService.updateOrderStatus2();
-
- }
- } else if (getEarliestOrder.getRemarks() < getEarliestOrder.getPlanQty()) {
+ omProductionOrderInfoService.updateBodyStatus1();
+ //鍒ゆ柇缂镐綋宸ュ崟瀹屾垚
+ OmProductionOrderInfo getBodyOrder2 = omProductionOrderInfoService.getBodyOrder();
+ if (Objects.equals(getBodyOrder2.getBodyQty(), getBodyOrder2.getPlanQty())){
+ omProductionOrderInfoService.updateBodyStatus2();
+ }
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(getBodyOrder2.getBodyQty()).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("11").build());
+ }
+ } else if (Constants.C005.equals(device)) {
+ // 鏌ヨ鏁版嵁搴撹幏鍙栫鍚堟潯浠剁殑璁㈠崟淇℃伅
+ OmProductionOrderInfo getHeadOrder = omProductionOrderInfoService.getHeadOrder();
+ if (getHeadOrder != null) {
+ //鍒ゆ柇褰撳墠涓嬪彂鏁伴噺鏄惁婊¤冻璁″垝鏁伴噺
//鏇存柊宸ュ崟鐘舵��
- 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());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(getHeadOrder.getWorkOrderNo()).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ProductionPlan").value(String.valueOf(getHeadOrder.getPlanQty())).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".EngineType").value(getHeadOrder.getEngineType()).build());
//鐢熸垚sn鐮�
- OmProductionOrderInfo serialNumber = omProductionOrderInfoService.getSerialNumber();
+ SysCount headNumber = sysCountService.getHeadNumber();
String A3 = String.valueOf(LocalDateTime.now().getYear()).substring(2);
- if(A3.equals(String.valueOf(serialNumber.getRemarks()))){
- String A1 = getEarliestOrder.getEngineType();//鑾峰彇浜у搧鍨嬪彿
- String A2 = "3";
+ //鍒ゆ柇鏄惁璺ㄥ勾
+ if(A3.equals(String.valueOf(headNumber.getYear()))){
+ String A1 = getHeadOrder.getEngineType();//鑾峰彇浜у搧鍨嬪彿
+ String A2 = "3";//鍥哄畾浜х嚎
String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 鑾峰彇褰撳墠鏈堜唤锛�1-12锛�
- String A5 = String.format("%05d", serialNumber.getPlanQty());
+ String A5 = String.format("%05d", headNumber.getHeadNumber());
String SFCCode = A1 + A2 + A3+ A4 + A5;
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
- omProductionOrderInfoService.updateSerialNumber();
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MESSFCCode").value(SFCCode).build());
+ sysCountService.updateHeadNumber();
}else{
- OmProductionOrderInfo newNumber = omProductionOrderInfoService.updateYear();
- String A1 = getEarliestOrder.getEngineType();//鑾峰彇浜у搧鍨嬪彿
+ sysCountService.clean();
+ sysCountService.updateYear();
+ String A1 = getHeadOrder.getEngineType();//鑾峰彇浜у搧鍨嬪彿
String A2 = "3";
+ String newA3 = String.valueOf(LocalDateTime.now().getYear()).substring(2);
String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 鑾峰彇褰撳墠鏈堜唤锛�1-12锛�
- String A5 = String.format("%05d", newNumber.getPlanQty());
- String SFCCode = A1 + A2 + A3+ A4 + A5;
+ String A5 = String.format("%05d", sysCountService.getHeadNumber().getHeadNumber());
+ String SFCCode = A1 + A2 + newA3+ A4 + A5;
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
- omProductionOrderInfoService.updateSerialNumber();
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MESSFCCode").value(SFCCode).build());
+ sysCountService.updateHeadNumber();
}
// 鏇存柊 WorkOrderRequestDone 鍦板潃鍧�
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("11").build());
BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
bsbomChildInfo.setLocationCode(device);
- bsbomChildInfo.setBomCode(getEarliestOrder.getWorkOrderNo());
+ bsbomChildInfo.setBomCode(getHeadOrder.getWorkOrderNo());
//鍙戜笅宸ヨ壓閰嶆柟
formula(thoroughfare, device, bsbomChildInfo);
- omProductionOrderInfoService.updateOrderStatus2();
+ omProductionOrderInfoService.updateHeadStatus1();
+ //鍒ゆ柇缂镐綋宸ュ崟瀹屾垚
+ OmProductionOrderInfo getHeadOrder2 = omProductionOrderInfoService.getHeadOrder();
+ if (Objects.equals(getHeadOrder2.getHeadQty(), getHeadOrder2.getPlanQty())){
+ omProductionOrderInfoService.updateHeadStatus2();
+ }
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(getHeadOrder2.getHeadQty()).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("11").build());
+ }
+ } else if (Constants.P010.equals(device)) {
+ // 鏌ヨ鏁版嵁搴撹幏鍙栫鍚堟潯浠剁殑璁㈠崟淇℃伅
+ OmProductionOrderInfo getPreOrder = omProductionOrderInfoService.getPreOrder();
+ if (getPreOrder != null) {
+ //鍒ゆ柇褰撳墠涓嬪彂鏁伴噺鏄惁婊¤冻璁″垝鏁伴噺
+ //鏇存柊宸ュ崟鐘舵��
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(getPreOrder.getWorkOrderNo()).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ProductionPlan").value(String.valueOf(getPreOrder.getPlanQty())).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".EngineType").value(getPreOrder.getEngineType()).build());
+ //鐢熸垚sn鐮�
+ SysCount preNumber = sysCountService.getPreNumber();
+ String A3 = String.valueOf(LocalDateTime.now().getYear()).substring(2);
+ if(A3.equals(String.valueOf(preNumber.getYear()))){
+ String A1 = getPreOrder.getEngineType();//鑾峰彇浜у搧鍨嬪彿
+ String A2 = "3";
+ String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 鑾峰彇褰撳墠鏈堜唤锛�1-12锛�
+ String A5 = String.format("%05d", preNumber.getPreNumber());
+ 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();
+ }else{
+ sysCountService.clean();
+ sysCountService.updateYear();
+ String A1 = getPreOrder.getEngineType();//鑾峰彇浜у搧鍨嬪彿
+ String A2 = "3";
+ String newA3 = String.valueOf(LocalDateTime.now().getYear()).substring(2);
+ String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 鑾峰彇褰撳墠鏈堜唤锛�1-12锛�
+ String A5 = String.format("%05d", sysCountService.getPreNumber().getPreNumber());
+ 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();
+ }
+
+ // 鏇存柊 WorkOrderRequestDone 鍦板潃鍧�
+ BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
+ bsbomChildInfo.setLocationCode(device);
+ bsbomChildInfo.setBomCode(getPreOrder.getWorkOrderNo());
+ //鍙戜笅宸ヨ壓閰嶆柟
+ formula(thoroughfare, device, bsbomChildInfo);
+ omProductionOrderInfoService.updatePreStatus1();
+ //鍒ゆ柇缂镐綋宸ュ崟瀹屾垚
+ OmProductionOrderInfo getPreOrder2 = omProductionOrderInfoService.getPreOrder();
+ if (Objects.equals(getPreOrder2.getPreQty(), getPreOrder2.getPlanQty())){
+ omProductionOrderInfoService.updatePreStatus2();
+ }
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(getPreOrder2.getPreQty()).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("11").build());
}
}
}
@@ -224,7 +411,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