From 1717a12c83db01e3b31ea9ed913e5bacaf9edbf3 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期六, 29 三月 2025 14:24:06 +0800
Subject: [PATCH] 修改
---
billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java | 178 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 90 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 7d0b0b8..e92c791 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
@@ -132,42 +132,45 @@
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());
- }
- }
- }
+ if(Constants.OP080.equals(device) ){
+ if(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();
@@ -282,56 +285,56 @@
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 = "PLC2." + 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 && !Objects.equals(dataRead.getValue(), " ")) {
-// materialCollection.setParamValue(dataRead.getValue().toString());
-// 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 {
-// log.info("娲诲鍙蜂负绌�: {}",materialCollection.getParamName() );
-// }
-// }
-// }else if (Constants.OP130.equals(device)){
-// final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-// // 閬嶅巻 MaterialCode35 鍒� MaterialCode40 鍏�6缁勬暟鎹�
-// String nodeId = "PLC3." + 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 && !Objects.equals(dataRead.getValue(), " ")) {
-// materialCollection.setParamValue(dataRead.getValue().toString());
-// 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 {
-// log.info("缂哥洊鐮佷负绌�: {}",materialCollection.getParamName() );
-// }
-
+ }
+ 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 = "PLC2." + 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 && !Objects.equals(dataRead.getValue(), " ")) {
+ materialCollection.setParamValue(dataRead.getValue().toString());
+ 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.plusSave(materialCollection);
+ } else {
+ log.info("娲诲鍙蜂负绌�: {}",materialCollection.getParamName() );
+ }
+ }
+ }else if (Constants.OP130.equals(device)){
+ final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ // 閬嶅巻 MaterialCode35 鍒� MaterialCode40 鍏�6缁勬暟鎹�
+ String nodeId = "PLC3." + 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 && !Objects.equals(dataRead.getValue(), " ")) {
+ materialCollection.setParamValue(dataRead.getValue().toString());
+ 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.plusSave(materialCollection);
+ } else {
+ log.info("缂哥洊鐮佷负绌�: {}",materialCollection.getParamName() );
+ }
}
//鍑虹珯淇濆瓨
DaStationCollection daStationCollection = new DaStationCollection();
@@ -355,7 +358,6 @@
daCollectionParamConf1.setDescriptive("1");
List<DaCollectionParamConf> daCollectionParamConfList1 = daCollectionParamConfService.selectDaCollectionParamConfList(daCollectionParamConf1);
for (DaCollectionParamConf conf : daCollectionParamConfList1) {
- String index = String.valueOf(daCollectionParamConfList1.indexOf(conf));
String gatherAddress = conf.getGatherAddress();
String valueObj = null;
ReadWriteEntity entity = miloService.readFromOpcUa(gatherAddress);
@@ -365,7 +367,7 @@
valueObj = value.toString(); // 鏈�缁堣祴鍊�
if (!Objects.equals(valueObj, " ")) {
DaMaterialCollection materialCollection = new DaMaterialCollection();
- materialCollection.setRemark(index);
+
materialCollection.setSfcCode(SFCCode.toString());
materialCollection.setLocationCode(device);
materialCollection.setParamName(conf.getParameterSetName());
--
Gitblit v1.9.3