From 22ae1296592d87627d05233786c4aab0e854239b Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期三, 19 二月 2025 11:58:57 +0800
Subject: [PATCH] -换型
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 4 ++
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 43 +++++++++++++++++++++
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 62 +++++++++++++++++++++---------
3 files changed, 90 insertions(+), 19 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
index 89ae472..58f4762 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
@@ -58,6 +58,8 @@
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
+import static org.apache.commons.lang3.SystemUtils.getUserName;
+
/**
* 璁惧浜у搧杩囩▼鍙傛暟閲囬泦Service涓氬姟灞傚鐞�
*
@@ -397,12 +399,47 @@
saveParamListTemp.add(collectionTemp);//灏佽鍙傛暟閲囬泦list
}
+
+ //娣诲姞鍩虹鍙傛暟(鐧婚檰浜轰俊鎭�)
+// try {
+// addCollectParamBasicData(daParamCollection.getLocationCode(),daParamCollection.getProductBarcode());
+// }catch (Exception e){
+// throw new RuntimeException(e);
+// }
//鎻掑叆鍙傛暟閲囬泦琛�
daParamCollectionService.insertBatch(saveParamList);
//鎻掑叆鍙傛暟閲囬泦琛�
daParamCollectionTempService.insertBatch(saveParamListTemp);
}
}
+
+ public void addCollectParamBasicData(String stationCode,String modelCode){
+ List<DaCollectionParamConf> confList = daCollectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
+ .like(DaCollectionParamConf::getCollectParameterId, "YGBH")
+ .eq(DaCollectionParamConf::getProcessesCode, stationCode)
+ );
+ if(!confList.isEmpty()){
+ DaCollectionParamConf daCollectionParamConf = confList.get(0);
+ DaParamCollection collection = new DaParamCollection();
+ collection.setSfcCode(modelCode);//妯＄粍鐮�
+ collection.setParamCode(daCollectionParamConf.getCollectParameterId());//鍙傛暟缂栫爜
+ collection.setParamName(daCollectionParamConf.getCollectParameterName());//鍙傛暟鍚嶇О
+ collection.setParamValue(getUserName());//鍙傛暟鍊�
+ collection.setLocationCode(stationCode);//宸ヤ綅
+ collection.setCollectionTime(new Date());//閲囬泦鏃堕棿
+ daParamCollectionService.save(collection);
+
+ DaParamCollectionTemp collectionTemp = new DaParamCollectionTemp();
+ collectionTemp.setSfcCode(modelCode);//妯＄粍鐮�
+ collectionTemp.setParamCode(daCollectionParamConf.getCollectParameterId());//鍙傛暟缂栫爜
+ collectionTemp.setParamName(daCollectionParamConf.getCollectParameterName());//鍙傛暟鍚嶇О
+ collectionTemp.setParamValue(getUserName());//鍙傛暟鍊�
+ collectionTemp.setLocationCode(stationCode);//宸ヤ綅
+ collectionTemp.setCollectionTime(new Date());//閲囬泦鏃堕棿
+ daParamCollectionTempService.save(collectionTemp);
+ }
+ }
+
@Override
public void insertBatch(List<DaParamCollection> confList){
try{
@@ -543,6 +580,12 @@
@Override
public void pushGeelycvMesFeedback(String packID, String stationCode) {
+ //娣诲姞鍩虹鍙傛暟(鐧婚檰浜轰俊鎭�)
+ try {
+ addCollectParamBasicData(stationCode,packID);
+ }catch (Exception e){
+ throw new RuntimeException(e);
+ }
logger.info("杩涘叆浜哄伐宸ヤ綅鎺ㄩ�佸伐鍘侻ES鏁版嵁鏂规硶-pushGeelycvMesFeedback-宸ヤ綅{}-pack鐮亄}",stationCode,packID);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String totalResult = "0";
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
index 55c439e..8a46925 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -58,6 +58,10 @@
//PLC鍒癕ES鐗╂枡杞崲
Constants.materialMap.put("1","9900199052A");
Constants.materialMap.put("2","9900199053B");
+// Constants.materialMap.put("3","9900236569");
+// Constants.materialMap.put("4","9900236570");
+// Constants.materialMap.put("1","9900236569");
+// Constants.materialMap.put("2","9900236570");
//鍒嗘010-090娈� 鐢佃姱宸ヤ綅
Constants.OP020_OP090.add(Constants.OP020);
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 d696353..1de8f5d 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
@@ -121,16 +121,22 @@
Integer scanResult = 11;
if (Constants.OP010.equals(device)){
//OP010宸ヤ綅鐢佃姱鏉＄爜鏍￠獙||OP030宸ヤ綅鐢佃姱鏉＄爜鏍￠獙
- Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Scaner").getValue();
- if (ObjectUtil.isNotNull(value1)){
- String keyCode = value1.toString();
- log.info("璇诲彇鍒板伐浣峽}鐨凷caner鏁版嵁锛歿}",device,keyCode);
- //浠呮牎楠岄暱搴︽槸鍚﹀悎鏍�
-// List<KeyCodeCheck> collect = keyCodeCheckService.list().stream().filter(x -> x.getKeyCode().contains(keyCode)).collect(Collectors.toList());
-// if (CollUtil.isNotEmpty(collect)){
-// scanResult = 11;
-// }
- }
+ //鐢佃姱鎵规鏍￠獙
+// Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Scaner").getValue();
+// Object value2 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Batch").getValue();
+// if (ObjectUtil.isNotNull(value1)&&ObjectUtil.isNotNull(value2)){
+// String keyCode = value1.toString();
+// String batch = value2.toString();
+// log.info("璇诲彇鍒板伐浣峽}鐨凷caner鏁版嵁锛歿} 鏍￠獙鎵规涓猴細{}",device,keyCode,batch);
+// //浠呮牎楠岄暱搴︽槸鍚﹀悎鏍�
+//// List<KeyCodeCheck> collect = keyCodeCheckService.list().stream().filter(x -> x.getKeyCode().contains(keyCode)).collect(Collectors.toList());
+//// if (CollUtil.isNotEmpty(collect)){
+//// scanResult = 11;
+//// }
+// scanResult = batchVerification(keyCode,batch);
+// }else {
+// scanResult = 12;
+// }
}else if(Constants.OP030.equals(device)){
Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Scaner").getValue();//鐢佃姱鐮�
if (ObjectUtil.isNotNull(value1)){
@@ -161,15 +167,15 @@
//OP020 鐢佃姱鎸′綅鏍￠獙
if (Constants.OP020.equals(device)){
Integer result = 11;
- /*Object cellGearObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellGear").getValue();
- if (ObjectUtil.isNull(cellGearObjcet)){
- result = 11;//濡傛灉鐢佃姱鎸′綅涓虹┖锛屼笉杩涜鎸′綅鏍￠獙
- }else{
- String cellGear = cellGearObjcet.toString();
- List<String> cellCodeList = readCellCodeList(thoroughfare, device);
- result = checkCellGear(thoroughfare, device,cellCodeList,cellGear);//鏍￠獙鐢佃姱鎸′綅鍜岀粍鍒�
- Constants.OLD_CELL_GEAR = cellGear;//鎸′綅璧嬪��
- }*/
+// Object cellGearObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellGear").getValue();
+// if (ObjectUtil.isNull(cellGearObjcet)){
+// result = 11;//濡傛灉鐢佃姱鎸′綅涓虹┖锛屼笉杩涜鎸′綅鏍￠獙
+// }else{
+// String cellGear = cellGearObjcet.toString();
+// List<String> cellCodeList = readCellCodeList(thoroughfare, device);
+// result = checkCellGear(thoroughfare, device,cellCodeList,cellGear);//鏍￠獙鐢佃姱鎸′綅鍜岀粍鍒�
+// Constants.OLD_CELL_GEAR = cellGear;//鎸′綅璧嬪��
+// }
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
}else if (Constants.OP030.equals(device)){
@@ -1179,5 +1185,23 @@
}
}
+ /**
+ * 鎵规鏍￠獙
+ * @param keyCode,batch
+ * @return list
+ */
+ public Integer batchVerification(String keyCode,String batch){
+ Integer result = 11;
+ List<DaCellData> cellDataList = daCellDataService.list(new LambdaQueryWrapper<DaCellData>()
+ .eq(DaCellData::getGbCellCode, keyCode)
+ .eq(DaCellData::getCellSerial, batch)
+ );
+ if(cellDataList.isEmpty()){
+ result = 13;
+ log.info("鐢佃姱鐮亄} 宸ヤ綅010鏍￠獙鎵规澶辫触锛氭壒娆′负{}",keyCode,batch);
+ }
+ return result;
+ }
+
}
--
Gitblit v1.9.3