From 287ef80679ed099cfb4f49dfc2b776375a4ce67f Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期二, 25 三月 2025 19:57:01 +0800
Subject: [PATCH] 修改
---
billion-main/src/main/java/com/billion/main/da/service/impl/DaMaterialCollectionServiceImpl.java | 2
/dev/null | 35 --------
billion-main/src/main/java/com/billion/main/api/RestfulAPI.java | 2
billion-main/src/main/java/com/billion/main/da/service/impl/DaParamCollectionServiceImpl.java | 3
billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java | 155 ++++++++++++++++++++++++++++++++++----
5 files changed, 141 insertions(+), 56 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/api/RestfulAPI.java b/billion-main/src/main/java/com/billion/main/api/RestfulAPI.java
index d825e5c..9cd61f3 100644
--- a/billion-main/src/main/java/com/billion/main/api/RestfulAPI.java
+++ b/billion-main/src/main/java/com/billion/main/api/RestfulAPI.java
@@ -1,9 +1,9 @@
package com.billion.main.api;
import com.billion.main.api.domain.ApiResponse;
-import com.billion.main.api.domain.CollectQualityData;
import com.billion.main.api.domain.WorkOrdersInfo;
import com.billion.main.api.service.IWorkOrdersInfoService;
+import com.billion.main.da.domain.CollectQualityData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/billion-main/src/main/java/com/billion/main/api/domain/CollectQualityData.java b/billion-main/src/main/java/com/billion/main/api/domain/CollectQualityData.java
deleted file mode 100644
index 1138d33..0000000
--- a/billion-main/src/main/java/com/billion/main/api/domain/CollectQualityData.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.billion.main.api.domain;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class CollectQualityData {
- private String stationID;
- private String stationName;
- private String engineNumber;
- private String factoryNumber;
- private String engineSerialNumber;
- private String orderNumber;
- private String insertTime;
- private String detectionID;
- private String detectionName;
- private String upperSpec;
- private String lowerSpec;
- private String target;
- private String unit;
- private String actualValue;
- private String status;
-}
\ No newline at end of file
diff --git a/billion-main/src/main/java/com/billion/main/api/service/ICollectQualityDataService.java b/billion-main/src/main/java/com/billion/main/api/service/ICollectQualityDataService.java
deleted file mode 100644
index e7cb0fd..0000000
--- a/billion-main/src/main/java/com/billion/main/api/service/ICollectQualityDataService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.billion.main.api.service;
-
-import com.billion.main.api.domain.CollectQualityData;
-
-public interface ICollectQualityDataService {
- boolean postCollectQualityData(CollectQualityData collectQualityData);
-}
diff --git a/billion-main/src/main/java/com/billion/main/api/service/impl/CollectQualityDataServiceImpl.java b/billion-main/src/main/java/com/billion/main/api/service/impl/CollectQualityDataServiceImpl.java
deleted file mode 100644
index de64b8e..0000000
--- a/billion-main/src/main/java/com/billion/main/api/service/impl/CollectQualityDataServiceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.billion.main.api.service.impl;
-
-import com.billion.main.api.domain.CollectQualityData;
-import com.billion.main.api.service.ICollectQualityDataService;
-import com.billion.main.da.service.IDaMaterialCollectionService;
-import com.billion.main.da.service.IDaParamCollectionService;
-import com.billion.main.da.service.IDaTightenCollectionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 鐗╂枡閲囬泦Service涓氬姟灞傚鐞�
- *
- * @author Billion-Yi
- * @date 2024-11-22
- */
-@Service
-public class CollectQualityDataServiceImpl implements ICollectQualityDataService
-{
- @Autowired
- private IDaMaterialCollectionService daMaterialCollectionService;
- @Autowired
- private IDaParamCollectionService daParamCollectionService;
- @Autowired
- private IDaTightenCollectionService daTightenCollectionService;
-
-
- @Transactional
- @Override
- public boolean postCollectQualityData(CollectQualityData collectQualityData) {
-
- return false;
- }
-}
diff --git a/billion-main/src/main/java/com/billion/main/da/service/impl/DaMaterialCollectionServiceImpl.java b/billion-main/src/main/java/com/billion/main/da/service/impl/DaMaterialCollectionServiceImpl.java
index 39b893f..354b3da 100644
--- a/billion-main/src/main/java/com/billion/main/da/service/impl/DaMaterialCollectionServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/da/service/impl/DaMaterialCollectionServiceImpl.java
@@ -12,9 +12,7 @@
import com.billion.main.bs.service.IBsBomChildInfoService;
import com.billion.main.constant.Constants;
import com.billion.main.da.domain.CollectMT;
-import com.billion.main.da.domain.CollectTrack;
import com.billion.main.om.domain.OmOrderScheduling;
-import com.billion.main.om.domain.OmProductionOrderInfo;
import com.billion.main.om.service.IOmOrderSchedulingService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/billion-main/src/main/java/com/billion/main/da/service/impl/DaParamCollectionServiceImpl.java b/billion-main/src/main/java/com/billion/main/da/service/impl/DaParamCollectionServiceImpl.java
index 76acb2d..ab341aa 100644
--- a/billion-main/src/main/java/com/billion/main/da/service/impl/DaParamCollectionServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/da/service/impl/DaParamCollectionServiceImpl.java
@@ -3,9 +3,8 @@
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.json.JSONUtil;
-import com.billion.main.api.domain.CollectQualityData;
import com.billion.main.constant.Constants;
-import com.billion.main.da.domain.CollectTrack;
+import com.billion.main.da.domain.CollectQualityData;
import com.billion.main.da.domain.DaParamCollection;
import com.billion.main.da.mapper.DaParamCollectionMapper;
import com.billion.main.da.service.IDaParamCollectionService;
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 d66e297..62ceaf1 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
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.billion.main.bs.domain.BsBomChildInfo;
+import com.billion.main.bs.domain.BsLineInfo;
import com.billion.main.bs.service.IBsBomChildInfoService;
+import com.billion.main.bs.service.IBsLineInfoService;
import com.billion.main.constant.Constants;
import com.billion.main.da.domain.DaCollectionParamConf;
import com.billion.main.da.domain.DaMaterialCollection;
@@ -45,6 +47,7 @@
public IDaCollectionParamConfService daCollectionParamConfService;
public IDaMaterialCollectionService daMaterialCollectionService;
public ISysCountService sysCountService;
+ public IBsLineInfoService bsLineInfoService;
public OPCUaSubscription(MiloService miloService,
@@ -55,7 +58,8 @@
IBsBomChildInfoService bsBomChildInfoService,
IDaCollectionParamConfService daCollectionParamConfService,
IDaMaterialCollectionService daMaterialCollectionService,
- ISysCountService sysCountService
+ ISysCountService sysCountService,
+ IBsLineInfoService bsLineInfoService
) {
OPCUaSubscription.miloService = miloService;
this.daParamCollectionService = daParamCollectionService;
@@ -66,7 +70,9 @@
this.daCollectionParamConfService = daCollectionParamConfService;
this.daMaterialCollectionService = daMaterialCollectionService;
this.sysCountService = sysCountService;
+ this.bsLineInfoService = bsLineInfoService;
}
+
@Override
public void onSubscribe(String identifier, Object value) {
log.info("鍦板潃锛�"+identifier+"鍊硷細"+value);
@@ -101,6 +107,7 @@
}
//1.2//闄ら宸ョ珯鎵�鏈夊伐绔�
else if(
+ Constants.TEST.contains(device) ||
Constants.PLC1.contains(device) ||
Constants.PLC2.contains(device) ||
Constants.PLC3.contains(device) ||
@@ -110,12 +117,58 @@
//鏍￠獙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());
+ }
+
+ //9L鍙戝姩鏈烘秱鑳惰建杩逛笅鍙�
+ else if(Constants.OP080.equals(device) && Constants.PLC_4.equals(thoroughfare)){
+ // 1. 鍒濆鍖栧伐鍗曞璞″苟鏌ヨ宸ュ崟淇℃伅
+ String workOrderNo = resultList.get(0).getWorkOrderNo();
+ OmProductionOrderInfo queryOrder = new OmProductionOrderInfo();
+ queryOrder.setWorkOrderNo(workOrderNo);
+ List<OmProductionOrderInfo> orderList = omProductionOrderInfoService.selectOmProductionOrderInfoList(queryOrder);
+ // 2. 鍒ゆ柇绫诲瀷鍒嗘敮閫昏緫
+ String engineName = orderList.get(0).getEngineName();
+ if (!"9L".equals(engineName)) {
+ // 闈�9L鐩存帴鍐�0
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".GlueType").value(0).build());
+ } else {
+ // 3. 鏌ヨ浜х嚎閰嶇疆鐨勪袱鏉￠缃暟鎹�
+ BsLineInfo lineQuery = new BsLineInfo();
+ lineQuery.setLineCode(engineName); // 鍋囪閫氳繃lineCode=9L鑾峰彇涓ゆ潯鏁版嵁
+ List<BsLineInfo> configuredLines = bsLineInfoService.selectBsLineInfoList(lineQuery);
+ // 绗竴鏉￠厤缃暟鎹殑鏍￠獙
+ BsLineInfo firstLine = configuredLines.get(0);
+ BsBomChildInfo checkFirst = new BsBomChildInfo();
+ checkFirst.setMaterialCode(firstLine.getLineName());
+ checkFirst.setBomCode(workOrderNo);
+ List<BsBomChildInfo> firstCheckList = bsBomChildInfoService.selectBsBomChildInfoList(checkFirst);
+ if (firstCheckList.size() == 1) {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".GlueType").value(1).build());
+ } else {
+ // 绗簩鏉￠厤缃暟鎹殑鏍￠獙
+ BsLineInfo secondLine = configuredLines.get(1);
+ BsBomChildInfo checkSecond = new BsBomChildInfo();
+ checkSecond.setMaterialCode(secondLine.getLineName());
+ checkSecond.setBomCode(workOrderNo);
+ List<BsBomChildInfo> secondCheckList = bsBomChildInfoService.selectBsBomChildInfoList(checkSecond);
+ if (secondCheckList.size() == 1) {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".GlueType").value(2).build());
+ }
+ }
+ }
+ }
String getWorkOrderNo = resultList.get(0).getWorkOrderNo();
BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
bsbomChildInfo.setLocationCode(device);
@@ -124,6 +177,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,25 +188,26 @@
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(getBodyOrder2.getBodyQty(), getBodyOrder2.getPlanQty())){
+ if (Objects.equals(nowQty, getBodyOrder2.getPlanQty().toString())){
omProductionOrderInfoService.updateBodyStatus2();
}
}
@@ -161,7 +216,7 @@
omOrderScheduling.setRemarks("Head");
sysCountService.updateHeadNumber();
OmProductionOrderInfo getHeadOrder2 = omProductionOrderInfoService.getHeadOrder();
- if (Objects.equals(getHeadOrder2.getHeadQty(), getHeadOrder2.getPlanQty())){
+ if (Objects.equals(nowQty, getHeadOrder2.getPlanQty().toString())){
omProductionOrderInfoService.updateHeadStatus2();
}
}
@@ -175,27 +230,27 @@
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");
omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
}
- } else if (Constants.OP300.equals(device)) {
+ } 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", "2");
@@ -215,7 +270,7 @@
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");
@@ -224,9 +279,58 @@
sysCountService.updatePreNumber();
omProductionOrderInfoService.updatePreStatus1();
OmProductionOrderInfo getPreOrder2 = omProductionOrderInfoService.getPreOrder();
- if (Objects.equals(getPreOrder2.getPreQty(), getPreOrder2.getPlanQty())){
+ if (Objects.equals(nowQty, getPreOrder2.getPlanQty().toString())){
omProductionOrderInfoService.updatePreStatus2();
}
+ }else if (Constants.OP020.equals(device)){
+ final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ // 閬嶅巻 MaterialCode35 鍒� MaterialCode40 鍏�6缁勬暟鎹�
+ for (int i = 35; i <= 40; i++) { // 淇敼寰幆鑼冨洿
+ // 鏋勫缓OPC UA鑺傜偣鍦板潃锛堜緥濡傦細PLC1.OP020.MaterialCode35锛�
+ String nodeId = "PLC1." + device + ".MaterialCode" + i;
+ // 鍒涘缓閲囬泦瀵硅薄
+ DaMaterialCollection materialCollection = new DaMaterialCollection();
+ materialCollection.setSfcCode(SFCCode.toString());
+ materialCollection.setLocationCode(device);
+ // 璁剧疆鍙傛暟鍚嶇О锛堟椿濉�1鍒版椿濉�6锛�
+ int pistonNumber = i - 34; // 35鈫�1, 36鈫�2...40鈫�6
+ materialCollection.setParamName("娲诲" + pistonNumber);
+ // 閫氳繃OPC UA璇诲彇鍙傛暟鍊�
+ ReadWriteEntity dataRead = miloService.readFromOpcUa(nodeId);
+ if (dataRead != null && dataRead.getValue() != null) {
+ materialCollection.setParamValue(dataRead.getValue().toString());
+ } else {
+ materialCollection.setParamValue("N/A"); // 澶勭悊绌哄�兼儏鍐�
+ }
+ Date collectTime = new Date();
+ ReadWriteEntity collectTimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StopTime");//杩涚珯鏃堕棿
+ collectTime = format.parse(TimeUtil.test(TimeUtil.stringProcessing(collectTimeRead.getValue().toString())));
+ materialCollection.setCollectTime( collectTime);
+ // 鎻掑叆鏁版嵁搴�
+ daMaterialCollectionService.insertDaMaterialCollection(materialCollection);
+ }
+ }else if (Constants.OP130.equals(device)){
+ final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ // 閬嶅巻 MaterialCode35 鍒� MaterialCode40 鍏�6缁勬暟鎹�
+ String nodeId = "PLC1." + device + ".MaterialCode35" ;
+ // 鍒涘缓閲囬泦瀵硅薄
+ DaMaterialCollection materialCollection = new DaMaterialCollection();
+ materialCollection.setSfcCode(SFCCode.toString());
+ materialCollection.setLocationCode(device);
+ materialCollection.setParamName("缂哥洊鐮�");
+ // 閫氳繃OPC UA璇诲彇鍙傛暟鍊�
+ ReadWriteEntity dataRead = miloService.readFromOpcUa(nodeId);
+ if (dataRead != null && dataRead.getValue() != null) {
+ materialCollection.setParamValue(dataRead.getValue().toString());
+ } else {
+ materialCollection.setParamValue("N/A"); // 澶勭悊绌哄�兼儏鍐�
+ }
+ Date collectTime = new Date();
+ ReadWriteEntity collectTimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StopTime");//杩涚珯鏃堕棿
+ collectTime = format.parse(TimeUtil.test(TimeUtil.stringProcessing(collectTimeRead.getValue().toString())));
+ materialCollection.setCollectTime( collectTime);
+ // 鎻掑叆鏁版嵁搴�
+ daMaterialCollectionService.insertDaMaterialCollection(materialCollection);
}
//鍑虹珯淇濆瓨
DaStationCollection daStationCollection = new DaStationCollection();
@@ -270,7 +374,7 @@
daMaterialCollectionService.insertDaMaterialCollection(materialCollection);
}
else {
- log.debug("閲囬泦椤逛负绌�: {}", gatherAddress);
+ log.info("閲囬泦椤逛负绌�: {}", gatherAddress);
}
}
}
@@ -296,7 +400,7 @@
daParamCollectionService.insertDaParamCollection(paramCollection);
}
else {
- log.debug("閲囬泦椤逛负绌�: {}", gatherAddress);
+ log.info("閲囬泦椤逛负绌�: {}", gatherAddress);
}
}
}
@@ -306,6 +410,9 @@
log.error(e.getMessage());
}
}
+
+
+
//棣栧伐绔欎笅鍙戝伐鍗�,骞剁敓鎴怱N鐮�
private static final String[] MONTH = {"A","B","C","D","E","F","G","H","I","J","K","L"};
@@ -333,8 +440,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());
+ log.info("SFCCode锛歿}涓嬪彂鎴愬姛",SFCCode);
}else{
sysCountService.clean();
sysCountService.updateYear();
@@ -344,8 +454,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());
+ log.info("SFCCode锛歿}涓嬪彂鎴愬姛",SFCCode);
}
// 鏇存柊 WorkOrderRequestDone 鍦板潃鍧�
BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
@@ -362,8 +475,10 @@
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)) {
@@ -386,6 +501,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());
+ log.info("SFCCode锛歿}涓嬪彂鎴愬姛",SFCCode);
}else{
sysCountService.clean();
sysCountService.updateYear();
@@ -397,6 +513,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());
+ log.info("SFCCode锛歿}涓嬪彂鎴愬姛",SFCCode);
}
// 鏇存柊 WorkOrderRequestDone 鍦板潃鍧�
BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
@@ -413,8 +530,10 @@
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)) {
@@ -436,6 +555,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());
+ log.info("SFCCode锛歿}涓嬪彂鎴愬姛",SFCCode);
}else{
sysCountService.clean();
sysCountService.updateYear();
@@ -447,6 +567,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());
+ log.info("SFCCode锛歿}涓嬪彂鎴愬姛",SFCCode);
}
// 鏇存柊 WorkOrderRequestDone 鍦板潃鍧�
BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
@@ -463,8 +584,10 @@
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