From 971788bf15d4bd58fe5bb6dbb76f16317a25ef7b Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 12 七月 2024 09:02:14 +0800
Subject: [PATCH] 工厂MES接口地址优化
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 283 ++++++++++++++++++++++++++++----------------------------
1 files changed, 142 insertions(+), 141 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 43060d8..85eec3c 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
@@ -90,145 +90,145 @@
String device = nodes[1];//璁惧
String tab = nodes[2];//鏍囪
String valueString = value.toString();//鍦板潃鍊�
- if (Constants.RECORD_CHECK_CODE.equals(tab)){//鐢佃姱鏍￠獙
- if (Constants.ONE.equals(valueString)){
- 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);
- //浠呮牎楠岄暱搴︽槸鍚﹀悎鏍�
+
+ CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
+ subHandle(thoroughfare,device,tab,valueString);
+ });
+
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ }
+ }
+
+ public void subHandle(String thoroughfare,String device,String tab,String valueString){
+ try{
+ if (Constants.RECORD_CHECK_CODE.equals(tab)){//鐢佃姱鏍￠獙
+ if (Constants.ONE.equals(valueString)){
+ 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;
// }
- }
- }else if(Constants.OP030.equals(device)){
- Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Scaner").getValue();
- if (ObjectUtil.isNotNull(value1)){
- String cellCode = value1.toString();
- //鍙嶉鐢佃姱ocv妫�娴嬬粨鏋�
- boolean b = OCVResultFeedBack(thoroughfare, device,cellCode);
- //鍥涗釜鐢佃姱鐨勭姸鎬�
- if (b){
- scanResult = 11;
- }else {
- scanResult = 12;
- }
+ }
+ }else if(Constants.OP030.equals(device)){
+ Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Scaner").getValue();
+ if (ObjectUtil.isNotNull(value1)){
+ String cellCode = value1.toString();
+ //鍙嶉鐢佃姱ocv妫�娴嬬粨鏋�
+ boolean b = OCVResultFeedBack(thoroughfare, device,cellCode);
+ //鍥涗釜鐢佃姱鐨勭姸鎬�
+ if (b){
+ scanResult = 11;
}else {
scanResult = 12;
}
-
+ }else {
+ scanResult = 12;
}
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ScanerResult1").value(scanResult).build());
- log.info("鍐欏叆鍒板伐浣峽}鐨凷canerResult1鏁版嵁锛歿}",device,scanResult);
}
- }else if (Constants.RECORD_SN.equals(tab)){//姹備笅鍙戞ā缁勭爜璇�9
- if (Constants.ONE.equals(valueString)){
- 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)){
- //鍙嶉鐢佃姱ocv妫�娴嬬粨鏋�
- boolean b = OCVResultFeedBack(thoroughfare, device);
- //鍥涗釜鐢佃姱鐨勭姸鎬�
- if (b){
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
- log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,11);
- }else {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
- log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,12);
- }
- } else if(Constants.OP100_1.equals(device) || Constants.OP100_2.equals(device)){
- //1銆佽繘绔橮LC缁欎骇鍝佺被鍨嬶紝MES璇诲彇浜у搧绫诲瀷
- Object productTypeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ProductType").getValue();//浜у搧绫诲瀷
- if (ObjectUtil.isNotNull(productTypeObjcet)){
- String productType = productTypeObjcet.toString();//浜у搧绫诲瀷
- CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
- //璋冪敤宸ュ巶MES锛屼繚瀛樺埌鏁版嵁搴�,骞朵笖灏嗗伐鍗曚紶缁橮LC (鐩墠涓存椂鐢ㄨ鏂规硶锛�
- receivingWorkOrders(thoroughfare, device);
- });
-
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
- log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,11);
- }else{
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
- }
-
- }else if (Constants.ModuleList.contains(device)){//鏈夋ā缁勭爜鐨勫伐浣�
- Object modulCodeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
- if (ObjectUtil.isNull(modulCodeObjcet)){
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
- }else{
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
- }
- }
- else {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ScanerResult1").value(scanResult).build());
+ log.info("鍐欏叆鍒板伐浣峽}鐨凷canerResult1鏁版嵁锛歿}",device,scanResult);
+ }
+ }else if (Constants.RECORD_SN.equals(tab)){//姹備笅鍙戞ā缁勭爜璇�9
+ if (Constants.ONE.equals(valueString)){
+ 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)){
+ //鍙嶉鐢佃姱ocv妫�娴嬬粨鏋�
+ boolean b = OCVResultFeedBack(thoroughfare, device);
+ //鍥涗釜鐢佃姱鐨勭姸鎬�
+ if (b){
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,11);
+ }else {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
+ log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,12);
}
- }else if (Constants.TWO.equals(valueString)){//鍑虹珯
- //鍒嗘010-065娈�
- if (Constants.OP010.equals(device)){
- //010宸ヤ綅鏃犺繃绔欒褰曪紝鍙粰鏀捐淇″彿
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(21).build());
- log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,21);
- }else if (Constants.OP020_OP090.contains(device)){
- Integer result = 21;
- //璇诲彇鐢佃姱鐮�
- List<String> cellCodeList = readCellCodeList(thoroughfare, device);
- if(ObjectUtil.isNull(cellCodeList) || cellCodeList.size() != 4){
- result = 23;
- }else{
- result = savePassingStation(thoroughfare, device,cellCodeList);//淇濆瓨杩囩珯
- if(result == 21) {
- result = saveParamCollection(thoroughfare, device,cellCodeList);//淇濆瓨鍙傛暟锛屽彂閫佸伐鍘侻ES
- }
- }
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
- log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,result);
- } else if (Constants.OP100_OP150.contains(device)){//浜哄伐宸ヤ綅
- WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
- } else {
- Integer result = 21;
- Object productTypeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ProductType").getValue();//浜у搧绫诲瀷
- Object modulCodeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
- if (ObjectUtil.isNull(modulCodeObjcet)){
- result = 23;
- }else{
- String moduleCode = modulCodeObjcet.toString();
- result = savePassingStation(thoroughfare, device,moduleCode);//淇濆瓨杩囩珯
- if(result == 21) {
- result = saveParamCollection(thoroughfare, device,moduleCode);//淇濆瓨鍙傛暟锛屽彂閫佸伐鍘侻ES
- }
- }
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
- log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,result);
+ } else if(Constants.OP100_1.equals(device) || Constants.OP100_2.equals(device)){
+ //1銆佽繘绔橮LC缁欎骇鍝佺被鍨嬶紝MES璇诲彇浜у搧绫诲瀷
+ Object productTypeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ProductType").getValue();//浜у搧绫诲瀷
+ if (ObjectUtil.isNotNull(productTypeObjcet)){
+ String productType = productTypeObjcet.toString();//浜у搧绫诲瀷
+ String materialCode = Constants.materialMap.get(productType);
+ CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
+ //璋冪敤宸ュ巶MES锛屼繚瀛樺埌鏁版嵁搴�,骞朵笖灏嗗伐鍗曚紶缁橮LC (鐩墠涓存椂鐢ㄨ鏂规硶锛�
+ receivingWorkOrders(thoroughfare, device,materialCode);
+ });
+
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
+ log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,11);
+ }else{
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
+ }
+
+ }else if (Constants.ModuleList.contains(device)){//鏈夋ā缁勭爜鐨勫伐浣�
+ Object modulCodeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
+ if (ObjectUtil.isNull(modulCodeObjcet)){
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
+ }else{
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
}
}
- } /*else if (Constants.RECORD_CHECK_CODE_1.equals(tab)) {
- if (Constants.OP100_1.equals(device)){
- //閽㈠甫鏉＄爜鏍￠獙--鍙戦�佺粰宸ュ巶mes
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ScanerResult11").value(11).build());
- } else if (Constants.OP100_2.equals(device)) {
- //PET甯︽潯鐮佹牎楠�--鍙戦�佺粰宸ュ巶mes
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ScanerResult12").value(11).build());
+ else {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
+ log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,11);
}
- }*/
+ }else if (Constants.TWO.equals(valueString)){//鍑虹珯
+ //鍒嗘010-065娈�
+ if (Constants.OP010.equals(device)){
+ //010宸ヤ綅鏃犺繃绔欒褰曪紝鍙粰鏀捐淇″彿
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(21).build());
+ log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,21);
+ }else if (Constants.OP020_OP090.contains(device)){
+ Integer result = 21;
+ //璇诲彇鐢佃姱鐮�
+ List<String> cellCodeList = readCellCodeList(thoroughfare, device);
+ if(ObjectUtil.isNull(cellCodeList) || cellCodeList.size() != 4){
+ result = 23;
+ }else{
+ result = savePassingStation(thoroughfare, device,cellCodeList);//淇濆瓨杩囩珯
+ if(result == 21) {
+ result = saveParamCollection(thoroughfare, device,cellCodeList);//淇濆瓨鍙傛暟锛屽彂閫佸伐鍘侻ES
+ }
+ }
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
+ log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,result);
+ } else if (Constants.OP100_OP150.contains(device)){//浜哄伐宸ヤ綅
+ WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
+ } else {
+ Integer result = 21;
+ //Object productTypeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ProductType").getValue();//浜у搧绫诲瀷
+ Object modulCodeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
+ if (ObjectUtil.isNull(modulCodeObjcet)){
+ result = 23;
+ }else{
+ String moduleCode = modulCodeObjcet.toString();
+ result = savePassingStation(thoroughfare, device,moduleCode);//淇濆瓨杩囩珯
+ if(result == 21) {
+ result = saveParamCollection(thoroughfare, device,moduleCode);//淇濆瓨鍙傛暟锛屽彂閫佸伐鍘侻ES
+ }
+ }
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
+ log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,result);
+ }
+ }
}
- } catch (Exception e) {
+ }catch (Exception e) {
log.error(e.getMessage());
- System.out.println(e.getMessage());
- log.info(e.getMessage());
}
}
-
- public void receivingWorkOrders(String thoroughfare ,String device)
- {
+/* public void receivingWorkOrders(String thoroughfare ,String device) {
String paramProductNum = "";
try {
@@ -241,7 +241,7 @@
String orderNum = orderList.get(0).getWorkOrderNo();
//涓嬪彂浜у搧妯＄粍鐮�
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ModuleCode").value(productNum).build());
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(productNum).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(orderNum).build());
//miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(1).build());
//鏇存柊宸ュ崟鐘舵�佷负鎵ц涓�
@@ -253,21 +253,21 @@
//灏嗕骇鍝丼N鍙戦�佸埌鍓嶅彴
productNum = "productNum,"+ productNum;
WebSocketUsers.sendMessageToUserByText(map.get(device), productNum);
- }/*else{
+ }*//*else{
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(2).build());//娌℃湁瑕佺敓浜х殑宸ュ崟
- }*/
+ }*//*
} catch (Exception e) {
throw new RuntimeException(e);
}
- }
+ }*/
- /* public void receivingWorkOrders(String thoroughfare ,String device)
+ public void receivingWorkOrders(String thoroughfare ,String device ,String materialCode)
{
String paramProductNum = "";
try {
// 鏌ヨ鏈�鏂扮殑宸ュ崟淇℃伅
OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder();
- String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "M1OP100");
+ String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "M1OP100",materialCode);
JSONObject jsonObject = new JSONObject(orderJsonString);
// 浠嶫SONObject涓幏鍙杁ata瀵硅薄
JSONObject dataObject = jsonObject.getJSONObject("data");
@@ -280,6 +280,7 @@
omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode"));
omProductionOrdeInfo.setMaterialCode(dataObject.getStr("materialCode"));
+ omProductionOrdeInfo.setPlanQty(Long.valueOf(dataObject.getStr("plannedQuantity")));
omProductionOrdeInfo.setOnlineCompletionMark("0");
omProductionOrdeInfo.setSfResult("0");
omProductionOrdeInfo.setProductCode(dataObject.getStr("model"));
@@ -298,7 +299,7 @@
} catch (Exception e) {
throw new RuntimeException(e);
}
- }*/
+ }
/**
* 璇诲彇鐢佃姱鐮�
@@ -516,9 +517,9 @@
parentVO.setProductNum(moduleCode);
parentVO.setCheckList(mesList);
- log.info("鎵ц宸ュ巶MES鏂规硶start锛屼紶鍏ユ暟鎹細{}",parentVO);
- HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
- log.info("鎵ц宸ュ巶MES鏂规硶end锛岃繑鍥炴暟鎹細{}",execute.body());
+ log.info("鎵ц宸ュ巶MES鏂规硶start锛屽伐浣嶅彿{} 浼犲叆鏁版嵁锛歿}",device ,parentVO);
+ HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_GET_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
+ log.info("鎵ц宸ュ巶MES鏂规硶end锛屽伐浣嶅彿{} 杩斿洖鏁版嵁锛歿}",device,execute.body());
});
}
@@ -595,10 +596,10 @@
//鍙戦�佺粰宸ュ巶mes鍙傛暟灏佽
ChildVO childVO = new ChildVO();
- childVO.setItemCode(confColl1.get(i).getCollectParameterName());//鍙傛暟
+ childVO.setItemCode(confColl1.get(i).getCollectParameterId());//鍙傛暟
childVO.setItemType(confColl1.get(i).getItemType());
childVO.setItemValue(paramValue);//鍙傛暟鍊�
- childVO.setItemText(confColl1.get(i).getParameterSetName());
+ childVO.setItemText(confColl1.get(i).getCollectParameterName());
childVO.setCheckResult("1");
childVO.setCheckTime(format.format(new Date()));
mesChildList1.add(childVO);
@@ -623,10 +624,10 @@
//鍙戦�佺粰宸ュ巶mes鍙傛暟灏佽
ChildVO childVO = new ChildVO();
- childVO.setItemCode(confColl2.get(i).getCollectParameterName());//鍙傛暟
+ childVO.setItemCode(confColl2.get(i).getCollectParameterId());//鍙傛暟
childVO.setItemType(confColl2.get(i).getItemType());
childVO.setItemValue(paramValue);//鍙傛暟鍊�
- childVO.setItemText(confColl2.get(i).getParameterSetName());
+ childVO.setItemText(confColl2.get(i).getCollectParameterName());
childVO.setCheckResult("1");
childVO.setCheckTime(format.format(new Date()));
mesChildList2.add(childVO);
@@ -649,10 +650,10 @@
//鍙戦�佺粰宸ュ巶mes鍙傛暟灏佽
ChildVO childVO = new ChildVO();
- childVO.setItemCode(confColl3.get(i).getCollectParameterName());//鍙傛暟
+ childVO.setItemCode(confColl3.get(i).getCollectParameterId());//鍙傛暟
childVO.setItemType(confColl3.get(i).getItemType());
childVO.setItemValue(paramValue);//鍙傛暟鍊�
- childVO.setItemText(confColl3.get(i).getParameterSetName());
+ childVO.setItemText(confColl3.get(i).getCollectParameterName());
childVO.setCheckResult("1");
childVO.setCheckTime(format.format(new Date()));
mesChildList3.add(childVO);
@@ -675,10 +676,10 @@
//鍙戦�佺粰宸ュ巶mes鍙傛暟灏佽
ChildVO childVO = new ChildVO();
- childVO.setItemCode(confColl4.get(i).getCollectParameterName());//鍙傛暟
+ childVO.setItemCode(confColl4.get(i).getCollectParameterId());//鍙傛暟
childVO.setItemType(confColl4.get(i).getItemType());
childVO.setItemValue(paramValue);//鍙傛暟鍊�
- childVO.setItemText(confColl4.get(i).getParameterSetName());
+ childVO.setItemText(confColl4.get(i).getCollectParameterName());
childVO.setCheckResult("1");
childVO.setCheckTime(format.format(new Date()));
mesChildList4.add(childVO);
@@ -708,10 +709,10 @@
//鍙戦�佺粰宸ュ巶mes鍙傛暟灏佽
ChildVO childVO = new ChildVO();
- childVO.setItemCode(confColl0.get(j).getCollectParameterName());//鍙傛暟
+ childVO.setItemCode(confColl0.get(j).getCollectParameterId());//鍙傛暟
childVO.setItemType(confColl0.get(j).getItemType());
childVO.setItemValue(paramValue);//鍙傛暟鍊�
- childVO.setItemText(confColl0.get(j).getParameterSetName());
+ childVO.setItemText(confColl0.get(j).getCollectParameterName());
childVO.setCheckResult("1");
childVO.setCheckTime(format.format(new Date()));
mesChildList0.add(childVO);
@@ -757,7 +758,7 @@
parentVO.setCheckList(mesChildList);//鍙傛暟
//CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
log.info("鎵ц宸ュ巶MES鏂规硶start锛屼紶鍏ユ暟鎹細{}",parentVO);
- HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
+ HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_GET_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
log.info("鎵ц宸ュ巶MES鏂规硶end锛岃繑鍥炴暟鎹細{}",execute.body());
}
}
--
Gitblit v1.9.3