From 1f4b2e0571bcdc64786bf4d6ba5916b3a39b3929 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期一, 29 七月 2024 08:56:00 +0800
Subject: [PATCH] 修改采集
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 179 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 135 insertions(+), 44 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 998102a..389a655 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
@@ -12,6 +12,8 @@
import com.jcdm.common.core.domain.AjaxResult;
import com.jcdm.framework.websocket.WebSocketUsers;
import com.jcdm.main.constant.Constants;
+import com.jcdm.main.da.cellData.domain.DaCellData;
+import com.jcdm.main.da.cellData.service.IDaCellDataService;
import com.jcdm.main.da.collectionParamConf.domain.DaCollectionParamConf;
import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService;
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
@@ -62,6 +64,8 @@
public static IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService;
+ public static IDaCellDataService daCellDataService;
+
/* @Value("${orderLineUrl}")
private static String orderLineUrl;*/
@@ -70,13 +74,15 @@
IDaCollectionParamConfService collectionParamConfService,
IDaParamCollectionService daParamCollectionService,
IOmProductionOrdeInfoService omProductionOrdeInfoService,
- IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService) {
+ IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService,
+ IDaCellDataService daCellDataService) {
OPCUaSubscription.miloService = miloService;
OPCUaSubscription.daPassingStationCollectionService = daPassingStationCollectionService;
OPCUaSubscription.collectionParamConfService = collectionParamConfService;
OPCUaSubscription.daParamCollectionService = daParamCollectionService;
OPCUaSubscription.omProductionOrdeInfoService = omProductionOrdeInfoService;
OPCUaSubscription.daTestDeviceInterfaceTempService = daTestDeviceInterfaceTempService;
+ OPCUaSubscription.daCellDataService = daCellDataService;
}
@@ -121,7 +127,7 @@
}else if(Constants.OP030.equals(device)){
Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Scaner").getValue();//鐢佃姱鐮�
if (ObjectUtil.isNotNull(value1)){
- String cellCode = value1.toString();
+ //String cellCode = value1.toString();
scanResult = 11;
//鍙嶉鐢佃姱ocv妫�娴嬬粨鏋�,杩欓噷涓嶇敤鍐嶈繘琛屾娴嬶紝鍙鐮佹病闂灏卞彲浠ヤ簡
/*boolean b = OCVResultFeedBack(thoroughfare, device,cellCode);//瀵规浛鎹㈢數鑺牎楠�
@@ -143,9 +149,22 @@
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(1).build());//娌℃湁瑕佺敓浜х殑宸ュ崟
}
}else if (Constants.RECORD_DATA.equals(tab)){//鍑哄叆绔�
- if (Constants.ONE.equals(valueString)){//鍏ョ珯
- //1:鍛婄煡MES鎵樼洏宸插埌绔欙紝璇锋眰涓嬪彂杩涚珯鐘舵��
- if (Constants.OP030.equals(device)){
+ if (Constants.ONE.equals(valueString)){//鍏ョ珯 //1:鍛婄煡MES鎵樼洏宸插埌绔欙紝璇锋眰涓嬪彂杩涚珯鐘舵��
+
+ //OP020 鐢佃姱鎸′綅鏍￠獙
+ if (Constants.OP020.equals(device)){
+ Integer result = 11;
+ Object cellGearObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellGear").getValue();
+ if (ObjectUtil.isNull(cellGearObjcet)){
+ result = 16;//鐢佃姱鎸′綅涓虹┖
+ }else{
+ String cellGear = cellGearObjcet.toString();
+ List<String> cellCodeList = readCellCodeList(thoroughfare, device);
+ result = checkCellGear(thoroughfare, device,cellCodeList,cellGear);//鏍￠獙鐢佃姱鎸′綅鍜岀粍鍒�
+ }
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
+
+ }else if (Constants.OP030.equals(device)){
//鍙嶉鐢佃姱ocv妫�娴嬬粨鏋�
boolean b = OCVResultFeedBack(thoroughfare, device);//杩涚珯瀵�4涓數鑺牎楠�
//鍥涗釜鐢佃姱鐨勭姸鎬�
@@ -162,7 +181,7 @@
if (ObjectUtil.isNotNull(productTypeObjcet)){
String productType = productTypeObjcet.toString();//浜у搧绫诲瀷
String materialCode = Constants.materialMap.get(productType);
- //璋冪敤宸ュ巶MES锛屼繚瀛樺埌鏁版嵁搴�,骞朵笖灏嗗伐鍗曚紶缁橮LC
+ //鎺ユ敹宸ュ崟锛屼繚瀛樺埌鏁版嵁搴�,骞朵笖灏嗗伐鍗曚紶缁橮LC
CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
receivingWorkOrders(thoroughfare, device,materialCode);
});
@@ -221,11 +240,32 @@
result = savePassingStation(thoroughfare, device,cellCodeList);//淇濆瓨杩囩珯
if(result == 21) {
- if(Constants.OP030.contains(device)){
- daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode1);
- daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode2);
- daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode3);
- daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode4);
+ if(Constants.OP020.contains(device)){
+ if(!cellCode1.isEmpty()){
+ daCellDataService.deleteDaCellDataByGbCellCode(cellCode1);
+ }
+ if(!cellCode2.isEmpty()){
+ daCellDataService.deleteDaCellDataByGbCellCode(cellCode2);
+ }
+ if(!cellCode3.isEmpty()){
+ daCellDataService.deleteDaCellDataByGbCellCode(cellCode3);
+ }
+ if(!cellCode4.isEmpty()){
+ daCellDataService.deleteDaCellDataByGbCellCode(cellCode4);
+ }
+ }else if(Constants.OP030.contains(device)){
+ if(!cellCode1.isEmpty()){
+ daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode1);
+ }
+ if(!cellCode2.isEmpty()){
+ daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode2);
+ }
+ if(!cellCode3.isEmpty()){
+ daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode3);
+ }
+ if(!cellCode4.isEmpty()) {
+ daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode4);
+ }
}
result = saveParamCollection(device,cellCodeList);//淇濆瓨鍙傛暟锛屽彂閫佸伐鍘侻ES
}
@@ -271,33 +311,19 @@
{
String paramProductNum = "";
try {
- // 鏌ヨ鏈�鏂扮殑宸ュ崟淇℃伅
- OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder();
- log.info("璇锋眰宸ュ巶MES宸ュ崟锛氬叆鍙俤evice{},materialCode锛歿}", device, materialCode);
- String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "M1OP100",materialCode);
- JSONObject jsonObject = new JSONObject(orderJsonString);
- // 浠嶫SONObject涓幏鍙杁ata瀵硅薄
- JSONObject dataObject = jsonObject.getJSONObject("data");
- String code = jsonObject.getStr("code");
- // 鍒ゆ柇鎺ュ崟鏄惁鎴愬姛
- if(code.equals("success")) {
- log.info("璇锋眰宸ュ巶MES宸ュ崟锛氬叆鍙俻ack{}鍑哄弬pack锛歿}", paramProductNum, dataObject.getStr("productNum"));
- OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
- omProductionOrdeInfo.setWorkOrderNo(dataObject.getStr("productionOrderNum"));
- omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
- omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode"));
- omProductionOrdeInfo.setProductCode(dataObject.getStr("materialCode"));
- omProductionOrdeInfo.setPlanQty(Long.valueOf(dataObject.getStr("plannedQuantity")));
- omProductionOrdeInfo.setOnlineCompletionMark("0");
- omProductionOrdeInfo.setSfResult("0");
- omProductionOrdeInfo.setProductModel(dataObject.getStr("model"));
- omProductionOrdeInfo.setCreateTime(new Date());
- omProductionOrdeInfo.setCreateUser("宸ュ巶MES");
- omProductionOrdeInfoService.save(omProductionOrdeInfo);
+ //鍏堟煡璇㈣〃涓槸鍚︽湁鍓╀綑宸ュ崟
+ List<OmProductionOrdeInfo> orderList = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>()
+ .eq(OmProductionOrdeInfo::getOrderStatus, Constants.ONE)
+ .eq(OmProductionOrdeInfo::getStationCode,device)//宸ヤ綅
+ .eq(OmProductionOrdeInfo::getProductCode,materialCode));//浜у搧绫诲瀷
+ if (CollUtil.isNotEmpty(orderList)){
+ Long id = orderList.get(0).getId();
+ String productNum = orderList.get(0).getProductNum();//妯＄粍鐮�
+ String orderNum = orderList.get(0).getWorkOrderNo();
- String productNum = dataObject.getStr("productNum");
- String orderNum = dataObject.getStr("productionOrderNum");
+ paramProductNum = productNum;
+
//涓嬪彂浜у搧妯＄粍鐮�
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ModuleCode").value(productNum).build());
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(orderNum).build());
@@ -305,8 +331,44 @@
//灏嗕骇鍝丼N鍙戦�佸埌鍓嶅彴
productNum = "productNum,"+ productNum;
WebSocketUsers.sendMessageToUserByText(map.get(device), productNum);
+ }else{
+ // 鏌ヨ鏈�鏂扮殑宸ュ崟淇℃伅
+ OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder();
+ log.info("璇锋眰宸ュ巶MES宸ュ崟锛氬叆鍙俤evice{},materialCode锛歿}", device, materialCode);
+ String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "M1OP100",materialCode);
+ JSONObject jsonObject = new JSONObject(orderJsonString);
+ // 浠嶫SONObject涓幏鍙杁ata瀵硅薄
+ JSONObject dataObject = jsonObject.getJSONObject("data");
+ String code = jsonObject.getStr("code");
+ // 鍒ゆ柇鎺ュ崟鏄惁鎴愬姛
+ if(code.equals("success")) {
+ log.info("璇锋眰宸ュ巶MES宸ュ崟锛氬叆鍙俻ack{}鍑哄弬pack锛歿}", paramProductNum, dataObject.getStr("productNum"));
+ OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
+ omProductionOrdeInfo.setWorkOrderNo(dataObject.getStr("productionOrderNum"));
+ omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
+ omProductionOrdeInfo.setStationCode(device);
+ omProductionOrdeInfo.setProductCode(dataObject.getStr("materialCode"));
+ omProductionOrdeInfo.setPlanQty(Long.valueOf(dataObject.getStr("plannedQuantity")));
+ omProductionOrdeInfo.setOnlineCompletionMark("0");
+ omProductionOrdeInfo.setSfResult("0");
+ omProductionOrdeInfo.setProductModel(dataObject.getStr("model"));
+ omProductionOrdeInfo.setCreateTime(new Date());
+ omProductionOrdeInfo.setCreateUser("宸ュ巶MES");
+ omProductionOrdeInfoService.save(omProductionOrdeInfo);
+
+ String productNum = dataObject.getStr("productNum");
+ String orderNum = dataObject.getStr("productionOrderNum");
+ //涓嬪彂浜у搧妯＄粍鐮�
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ModuleCode").value(productNum).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(orderNum).build());
+
+ //灏嗕骇鍝丼N鍙戦�佸埌鍓嶅彴
+ productNum = "productNum,"+ productNum;
+ WebSocketUsers.sendMessageToUserByText(map.get(device), productNum);
+ }
}
+
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -509,7 +571,7 @@
daParamCollectionService.insertBatch(collectionList);
//濡傛灉220宸ヤ綅锛岃繘琛屾姤宸�,鍥犱负涓婂眰绯荤粺鍙敮鎸�6浣嶏紝鎵�鏈夋姤宸ュ伐浣嶄慨鏀逛负M1P220
- if("M1OP220".equals(device)) {
+ if(Constants.OP220.equals(device)) {
getWorkReportResultFeedback(moduleCode, "M1P220", format.format(new Date()));
}
@@ -790,6 +852,41 @@
}
/**
+ * OP020鏍￠獙鐢佃姱鎸′綅
+ * @param thoroughfare
+ * @param device
+ * @throws Exception
+ */
+ private Integer checkCellGear(String thoroughfare, String device,List<String> cellCodeList,String cellGear) throws Exception {
+ Integer result = 11;
+
+ for(int i = 0; i < cellCodeList.size(); i ++){
+ Integer cellStatus = 1;
+ String cellCode = cellCodeList.get(i);
+ if(!cellCode.isEmpty()){
+ List<DaCellData> list = daCellDataService.list(new LambdaQueryWrapper<DaCellData>()
+ .eq(DaCellData::getGbCellCode,cellCode));
+ if(CollUtil.isNotEmpty(list)){
+ DaCellData daCellData = list.get(0);
+ String cellValue = daCellData.getCellValue();//鏁版嵁搴撲腑鐢佃姱鎸′綅
+ String cellSerial = daCellData.getCellSerial();//鏁版嵁搴撲腑鐢佃姱缁勫埆
+ if(!cellValue.isEmpty() && cellValue.equals(cellGear)){
+ cellStatus = 1;
+ }else {
+ cellStatus = 2;
+ result = 17;//鎸′綅鏍￠獙涓嶅悎鏍�
+ }
+ }else {
+ cellStatus = 2;
+ result = 17;//鏌ヤ笉鍒拌鏍￠獙鐨勬尅浣�
+ }
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_"+(i+1)).value(cellStatus).build());
+ }
+ }
+ return result;
+ }
+
+ /**
* 030宸ヤ綅杩斿洖ocv娴嬭瘯缁撴灉
* @param thoroughfare
* @param device
@@ -798,9 +895,7 @@
*/
private boolean OCVResultFeedBack(String thoroughfare, String device,String cellCode) throws Exception {
boolean flag = true;
-
List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
- .eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020")
.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)
.orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime)
);
@@ -811,7 +906,7 @@
}else {
flag = false;
}
- daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode);
+ //daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode);
}else {
flag = false;
log.info("璇诲彇鍒板伐浣峽},娴嬭瘯璁惧杩斿洖鐨勬暟鎹煡璇笉鍒帮紝鐢佃姱鐮佷负锛歿}",device,cellCode);
@@ -830,7 +925,6 @@
if (ObjectUtil.isNotNull(value1)){
String cellCode = value1.toString();
List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
- //.eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020")
.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)
.orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime)
);
@@ -857,7 +951,6 @@
if (ObjectUtil.isNotNull(value2)){
String cellCode = value2.toString();
List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
- //.eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020")
.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)
.orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime)
);
@@ -885,7 +978,6 @@
if (ObjectUtil.isNotNull(value3)){
String cellCode = value3.toString();
List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
- //.eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020")
.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)
.orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime)
);
@@ -913,7 +1005,6 @@
if (ObjectUtil.isNotNull(value4)){
String cellCode = value4.toString();
List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
- //.eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020")
.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)
.orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime)
);
--
Gitblit v1.9.3