From 5f0f21ec4d684d6e1a40596889ad92a1f4f1042a Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 19 七月 2024 13:27:07 +0800
Subject: [PATCH] 修改30工位获取ocv数据，根据时间倒叙获取第一条
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 9c63980..09d7e0b 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
@@ -313,7 +313,8 @@
try{
CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
logger.info("OP100鎶ュ伐寮�濮�-宸ュ巶MES寮傛鏂规硶");
- String reportResult = RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(), daParamCollection.getLocationCode(), format.format(new Date()));
+ String stationCode = "M1P100";//鍥犱负涓婂眰绯荤粺鍙敮鎸�6涓猴紝鎵�鏈夋姤宸ュ伐浣嶄负M1P100
+ String reportResult = RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(), stationCode, format.format(new Date()));
JSONObject jsonObject = new JSONObject(reportResult);
String code = jsonObject.getStr("code");
if("success".equals(code)){
@@ -565,7 +566,7 @@
// childVO.setItemType("3");
// }
if(paramConfOne!=null){
- childVO.setItemType(paramConfOne.getSpareField1());
+ childVO.setItemType(paramConfOne.getItemType());
childVO.setItemText(paramConfOne.getCollectParameterName());
}else {
childVO.setItemType("3");
@@ -589,10 +590,9 @@
parentVO.setCheckList(listChildVo);
try{
CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
- logger.info("寮�濮嬫墽琛屽紓姝ユ柟娉�");
+ logger.info("鎵嬪姩宸ヤ綅浼犲伐鍘侻ES寮傛鏂规硶start,宸ヤ綅鍙穥}锛屽叆鍙倇}",stationCode,parentVO.toString());
HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_GET_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
- logger.info("寮傛鏂规硶鎵ц缁撴潫");
- logger.info("鎵嬪姩宸ヤ綅浼犲伐鍘侻ES寮傛鏂规硶{}"+execute.body());
+ logger.info("鎵嬪姩宸ヤ綅浼犲伐鍘侻ES寮傛鏂规硶end宸ヤ綅鍙穥}锛屽嚭鍙倇}",stationCode,execute.body());
DaParamCollectionTemp daParamCollectionTemp = new DaParamCollectionTemp();
daParamCollectionTemp.setSfcCode(packID);
--
Gitblit v1.9.3