From 45f4602070d7219fe00b098b6c0471ca42a8553f Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期四, 06 六月 2024 20:21:38 +0800
Subject: [PATCH] 380新产品,优化
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 70 ++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index 49742b7..3e1f834 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -99,31 +99,31 @@
logger.info("-------鐩戝惉鍒�,{}鐨勬壂鐮佹灙鎵爜鐨凜ODE_CHECK鐨勪俊鍙�",identifier);
scannerGunMessage();
}
- if (identifier.equals(OPCElement.OP060_HX_CODE_CHECK) && "1".equals(value.toString())){
- Object SNCodeObject = miloService.readFromOpcUa("CFL4HX.OP060.Code1").getValue();
- if (null == SNCodeObject){
- SNCodeObject = miloService.readFromOpcUa("CFL4HX.OP060.Code").getValue();
- }
- if (null != SNCodeObject){
- String XT="";
- String CZ="";
- String SNCode = SNCodeObject.toString();
- DaParamCollection ParamCollection = new DaParamCollection();
- ParamCollection.setSfcCode(SNCode);
- List<DaParamCollection> DaParamCollectionlist=daParamCollectionService.selectDaParamCollectionList(ParamCollection);
- List<DaParamCollection> XTParamCollection = DaParamCollectionlist.stream().filter(x -> "绠变綋".equals(x.getParamName())).collect(Collectors.toList());
- if (CollUtil.isNotEmpty(XTParamCollection)){
- DaParamCollection lastOne = XTParamCollection.get(0);
- XT = lastOne.getParamValue();
- }
- List<DaParamCollection> CZParamCollection = DaParamCollectionlist.stream().filter(x -> "鏇茶酱".equals(x.getParamName())).collect(Collectors.toList());
- if (CollUtil.isNotEmpty(CZParamCollection)){
- DaParamCollection lastOne = CZParamCollection.get(0);
- CZ = lastOne.getParamValue();
- }
- passingStationCollectionServiceImpl.sendMessage(XT+"*"+CZ,"OP060");
- }
- }
+// if (identifier.equals(OPCElement.OP060_HX_CODE_CHECK) && "1".equals(value.toString())){
+// Object SNCodeObject = miloService.readFromOpcUa("CFL4HX.OP060.Code1").getValue();
+// if (null == SNCodeObject){
+// SNCodeObject = miloService.readFromOpcUa("CFL4HX.OP060.Code").getValue();
+// }
+// if (null != SNCodeObject){
+// String XT="";
+// String CZ="";
+// String SNCode = SNCodeObject.toString();
+// DaParamCollection ParamCollection = new DaParamCollection();
+// ParamCollection.setSfcCode(SNCode);
+// List<DaParamCollection> DaParamCollectionlist=daParamCollectionService.selectDaParamCollectionList(ParamCollection);
+// List<DaParamCollection> XTParamCollection = DaParamCollectionlist.stream().filter(x -> "绠变綋".equals(x.getParamName())).collect(Collectors.toList());
+// if (CollUtil.isNotEmpty(XTParamCollection)){
+// DaParamCollection lastOne = XTParamCollection.get(0);
+// XT = lastOne.getParamValue();
+// }
+// List<DaParamCollection> CZParamCollection = DaParamCollectionlist.stream().filter(x -> "鏇茶酱".equals(x.getParamName())).collect(Collectors.toList());
+// if (CollUtil.isNotEmpty(CZParamCollection)){
+// DaParamCollection lastOne = CZParamCollection.get(0);
+// CZ = lastOne.getParamValue();
+// }
+// passingStationCollectionServiceImpl.sendMessage(XT+"*"+CZ,"OP060");
+// }
+// }
}
if (collect2.contains(identifier)){
if ("1".equals(value.toString())){
@@ -180,20 +180,22 @@
DaPassingStationCollection PassingStationCollection=new DaPassingStationCollection();
PassingStationCollection.setSfcCode(SNCode);
daPassingStationCollections = passingStationCollectionServiceImpl.selectDaPassingStationCollectionList(PassingStationCollection);
- if (CollUtil.isNotEmpty(daPassingStationCollections)){
- DaPassingStationCollection lastOne = daPassingStationCollections.get(daPassingStationCollections.size() - 1);
- String outRsSign = lastOne.getOutRsSign();
- if ("鍚堟牸".equals(outRsSign)){
- a = "1";
- }else {
- a = "2";
- }
- }
+// if (CollUtil.isNotEmpty(daPassingStationCollections)){
+// DaPassingStationCollection lastOne = daPassingStationCollections.get(daPassingStationCollections.size() - 1);
+// String outRsSign = lastOne.getOutRsSign();
+// if ("鍚堟牸".equals(outRsSign)){
+// a = "1";
+// }else {
+// a = "2";
+// }
+// }
RmRepairRecord rmRepairRecord = new RmRepairRecord();
rmRepairRecord.setBoxCode(SNCode);
rmRepairRecords = rmRepairRecordService.selectRmRepairRecordList(rmRepairRecord);
if (CollUtil.isNotEmpty(rmRepairRecords)){
a = "1";
+ }else {
+ a = "2";
}
}
logger.info("-----杩斿洖codeCheckFeed-----,{}",a);
--
Gitblit v1.9.3