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 | 270 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 182 insertions(+), 88 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 00ed36a..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
@@ -1,7 +1,6 @@
package com.billion.main.plcServer.sub;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-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;
@@ -17,6 +16,7 @@
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.plcServer.util.TimeUtil;
import com.billion.main.sys.domain.SysCount;
import com.billion.main.sys.service.ISysCountService;
import com.kangaroohy.milo.model.ReadWriteEntity;
@@ -25,6 +25,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
+import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
@@ -33,6 +34,8 @@
@Slf4j
@Component
public class OPCUaSubscription implements SubscriptionCallback {
+
+ public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
public static MiloService miloService;
public IDaParamCollectionService daParamCollectionService;
public IDaStationCollectionService daStationCollectionService;
@@ -64,6 +67,7 @@
this.daMaterialCollectionService = daMaterialCollectionService;
this.sysCountService = sysCountService;
}
+
@Override
public void onSubscribe(String identifier, Object value) {
log.info("鍦板潃锛�"+identifier+"鍊硷細"+value);
@@ -89,15 +93,16 @@
if (Constants.RecordData.equals(tab)){
//宸ョ珯浜や簰鍒濆鍖�
if (Constants.ZERO.equals(valueString)){
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("0").build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(0).build());
//璇锋眰杩涚珯
} else if (Constants.ONE.equals(valueString)){
//1.1//棣栧伐绔�
if(Constants.ONLINE.contains(device)){
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("11").build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
}
- //闄ら宸ョ珯鎵�鏈夊伐绔�
- else if(Constants.PLC1.contains(device) ||
+ //1.2//闄ら宸ョ珯鎵�鏈夊伐绔�
+ else if(
+ Constants.PLC1.contains(device) ||
Constants.PLC2.contains(device) ||
Constants.PLC3.contains(device) ||
Constants.PLC4.contains(device) ||
@@ -106,17 +111,30 @@
//鏍￠獙SFCCode鏄惁瀛樺湪
Object SFCCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".SFCCode").getValue();
if (SFCCode == null ) {
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("23").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);
- log.info("鏌ヨ缁撴灉鏁伴噺: {}", resultList);
- BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
- bsbomChildInfo.setLocationCode(device);
- bsbomChildInfo.setBomCode(resultList.get(0).getWorkOrderNo());
- //涓嬪彂閰嶆柟
- formula(thoroughfare, device, bsbomChildInfo);
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("11").build());
+ 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);
+ bsbomChildInfo.setBomCode(getWorkOrderNo);
+ //涓嬪彂閰嶆柟
+ 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());
+ }
}
}
//鍑虹珯淇濆瓨鏁版嵁
@@ -127,47 +145,70 @@
//涓婄嚎宸ヤ綅
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((Long) nowQty);
+ 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);
//鎵樼洏缁戝畾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)){
- if(Constants.C070.equals(device)){
+ Date Time = new Date();
+ ReadWriteEntity TimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StopTime");
+ Time = format.parse(TimeUtil.test(TimeUtil.stringProcessing(TimeRead.getValue().toString())));
+ omOrderScheduling.setOfflineTime(Time);
+ if(Constants.C060.equals(device)){
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", "3");
+ updateWrapper.set("head_status", "2");
omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
}
} 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", "3");
+ updateWrapper.set("body_status", "2");
omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
}
}
@@ -175,7 +216,7 @@
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.setNowQty(nowQty.toString());
omOrderScheduling.setSfcCode(SFCCode.toString());
omOrderScheduling.setRemarks("Pre");
omOrderSchedulingService.insertOmOrderScheduling(omOrderScheduling);
@@ -184,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", "3");
+ 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);
@@ -198,46 +261,54 @@
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"}
+ String valueObj = null;
+ ReadWriteEntity entity = miloService.readFromOpcUa(gatherAddress);
+ if (entity != null) {
+ Object value = entity.getValue();
+ if (value != null) {
+ valueObj = value.toString(); // 鏈�缁堣祴鍊�
+ if (!Objects.equals(valueObj, " ")) {
+ DaMaterialCollection materialCollection = new DaMaterialCollection();
+ materialCollection.setSfcCode(SFCCode.toString());
+ materialCollection.setLocationCode(device);
+ materialCollection.setParamName(conf.getParameterSetName());
+ materialCollection.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())));
+ materialCollection.setCollectTime(Time);
+ daMaterialCollectionService.insertDaMaterialCollection(materialCollection);
+ }
+ else {
+ log.info("閲囬泦椤逛负绌�: {}", gatherAddress);
+ }
+ }
}
- 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琛ㄩ噷
+// 鏌ヨ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"}
+ 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);
}
- 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);
+ else {
+ log.info("閲囬泦椤逛负绌�: {}", gatherAddress);
+ }
}
- 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());
}
}
}
@@ -245,13 +316,17 @@
log.error(e.getMessage());
}
}
+
+
+
+
//棣栧伐绔欎笅鍙戝伐鍗�,骞剁敓鎴怱N鐮�
private static final String[] MONTH = {"A","B","C","D","E","F","G","H","I","J","K","L"};
public void plackWorkOrder(String thoroughfare, String device, String tab, String valueString) {
try {
if (Constants.WorkOrderRequest.equals(tab)) {
if (Constants.ZERO.equals(valueString)) {
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("0").build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value(0).build());
}else if (Constants.ONE.equals(valueString)){
if (Constants.OP005.equals(device)){
// 鏌ヨ鏁版嵁搴撹幏鍙栫鍚堟潯浠剁殑璁㈠崟淇℃伅
@@ -260,7 +335,6 @@
//鍒ゆ柇褰撳墠涓嬪彂鏁伴噺鏄惁婊¤冻璁″垝鏁伴噺
//鏇存柊宸ュ崟鐘舵��
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鐮�
SysCount serialNumber = sysCountService.getSerialNumber();
@@ -272,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();
@@ -284,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();
@@ -294,15 +372,21 @@
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();
- }
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(getBodyOrder2.getBodyQty()).build());
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("11").build());
+// 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)) {
// 鏌ヨ鏁版嵁搴撹幏鍙栫鍚堟潯浠剁殑璁㈠崟淇℃伅
OmProductionOrderInfo getHeadOrder = omProductionOrderInfoService.getHeadOrder();
@@ -310,7 +394,6 @@
//鍒ゆ柇褰撳墠涓嬪彂鏁伴噺鏄惁婊¤冻璁″垝鏁伴噺
//鏇存柊宸ュ崟鐘舵��
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鐮�
SysCount headNumber = sysCountService.getHeadNumber();
@@ -324,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();
@@ -336,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();
@@ -344,14 +427,20 @@
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();
- }
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(getHeadOrder2.getHeadQty()).build());
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("11").build());
+// 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)) {
// 鏌ヨ鏁版嵁搴撹幏鍙栫鍚堟潯浠剁殑璁㈠崟淇℃伅
@@ -360,7 +449,6 @@
//鍒ゆ柇褰撳墠涓嬪彂鏁伴噺鏄惁婊¤冻璁″垝鏁伴噺
//鏇存柊宸ュ崟鐘舵��
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();
@@ -373,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();
@@ -385,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();
@@ -393,14 +481,20 @@
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();
- }
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(getPreOrder2.getPreQty()).build());
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("11").build());
+// 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());
}
}
}
@@ -415,9 +509,9 @@
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());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".Material"+ i +"Code").value(bomChildList.get(i-1).getMaterialCode()).build());
// 鐢熸垚 MaterialNumber 鑺傜偣
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".Material1Number"+ i).value(bomChildList.get(i-1).getCostQty()).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".Material"+ i +"Number").value(Integer.parseInt(bomChildList.get(i-1).getCostQty())).build());
}
}
--
Gitblit v1.9.3