From e9e2c4dba5e42c8b07ee7d4f1cf8fdbd8f0b4bc7 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 02 八月 2024 15:41:52 +0800
Subject: [PATCH] -bug修改
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 72 ++++++++++++++++++++++++++---------
1 files changed, 53 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 000f805..52af3ee 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
@@ -361,6 +361,10 @@
}
// RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(),"OP230",format.format(new Date()));
}
+ if(daParamCollection.getLocationCode().equals("POP430")){
+ this.enterWeighing(daParamCollection);
+ }
+
} catch (Exception e) {
@@ -666,25 +670,51 @@
public void enterWeighing(DaParamCollection daParamCollection) {
String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
// String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
- long timestampMillis = Instant.now().toEpochMilli();
- ParentVO parentVO = new ParentVO();
- ChildVO childVO = new ChildVO();
- List<ChildVO> childVOList = new ArrayList<>();
- childVO.setItemCode("PWD_PW");
- childVO.setItemType("3");
- childVO.setItemText("Pack閲嶉噺鍊�");
- childVO.setItemValue(daParamCollection.getWeightValue());
- childVO.setCheckTime(format.format(new Date()));
- childVO.setCheckResult("1");
- childVOList.add(childVO);
- parentVO.setSiteCode("3983");
- parentVO.setRecordId(""+timestampMillis);
- parentVO.setStationCode("POP430");
- parentVO.setProductNum(daParamCollection.getSfcCode());
- parentVO.setTotalResult("1");
- parentVO.setCheckList(childVOList);
- HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
- RestfulService.getWorkReportResultFeedback(daParamCollection.getSfcCode(),"POP430",format.format(new Date()));
+ try{
+ daParamCollection.setWeightValue(getRandomNumberBetween(312.5, 313.5));
+// Object recordDataDone = miloService.readFromOpcUa("PACK" + "." + daParamCollection.getLocationCode() + ".MStepNumber").getValue();
+// if(ObjectUtil.isNotNull(recordDataDone)){
+// daParamCollection.setWeightValue(recordDataDone.toString());
+// }
+ long timestampMillis = Instant.now().toEpochMilli();
+ ParentVO parentVO = new ParentVO();
+ ChildVO childVO = new ChildVO();
+ List<ChildVO> childVOList = new ArrayList<>();
+ childVO.setItemCode("PWD_PW");
+ childVO.setItemType("3");
+ childVO.setItemText("Pack閲嶉噺鍊�");
+ childVO.setItemValue(daParamCollection.getWeightValue());
+ childVO.setCheckTime(format.format(new Date()));
+ childVO.setCheckResult("1");
+ childVOList.add(childVO);
+ parentVO.setSiteCode("3983");
+ parentVO.setRecordId(""+timestampMillis);
+ parentVO.setStationCode("POP430");
+ parentVO.setProductNum(daParamCollection.getProductBarcode());
+ parentVO.setTotalResult("1");
+ parentVO.setCheckList(childVOList);
+ CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
+ logger.info("POP430鎶ュ伐寮�濮�-宸ュ巶MES寮傛鏂规硶");
+ HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
+ logger.info("绉伴噸430杩斿洖缁撴灉"+execute.body());
+ String reportResult = RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(), "POP430", format.format(new Date()));
+ JSONObject jsonObject = new JSONObject(reportResult);
+ String code = jsonObject.getStr("code");
+ String resultCode = jsonObject.getJSONObject("data").getStr("resultCode");
+ if("success".equals(code)&&"S".equals(resultCode)){
+ //濡傛灉鎴愬姛锛屾墽琛屾姤宸ユ垚鍔熸柟娉曪紝淇敼鏄惁鎶ュ伐涓�1锛屾坊鍔犳姤宸ユ椂闂�
+ omProductionOrdeInfoService.updateOrderByProductNum("1",daParamCollection.getProductBarcode(),"POP430");
+ }else{
+ //瑙ｆ瀽宸ュ巶mes杩斿洖缁撴灉锛屽鏋滃け璐ワ紝鎵ц鎶ュ伐澶辫触鏂规硶锛屼慨鏀规槸鍚︽姤宸ヤ负2锛屾坊鍔犳姤宸ユ椂闂�
+ omProductionOrdeInfoService.updateOrderByProductNum("2",daParamCollection.getProductBarcode(),"POP430");
+ }
+ logger.info("OP430鎶ュ伐缁撴潫-宸ュ巶MES寮傛鏂规硶{}"+reportResult);
+ });
+ }catch (Exception e){
+ System.out.println(e.getMessage());
+ }
+// HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
+// RestfulService.getWorkReportResultFeedback(daParamCollection.getSfcCode(),"POP430",format.format(new Date()));
}
@Override
@@ -854,5 +884,9 @@
}
}
+ public static String getRandomNumberBetween(double min, double max) {
+ return String.format("%.1f",min + (Math.random() * (max - min)));
+ }
+
}
--
Gitblit v1.9.3