From 73d19affacfe22aa0a8c1b92bbf588c7240ed746 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期五, 06 九月 2024 09:39:57 +0800
Subject: [PATCH] 添加报工失败二次报工
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 b89434e..89ae472 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
@@ -321,7 +321,8 @@
CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
logger.info("OP100鎶ュ伐寮�濮�-宸ュ巶MES寮傛鏂规硶");
String stationCode = "M2P100";//鍥犱负涓婂眰绯荤粺鍙敮鎸�6浣嶏紝鎵�鏈夋姤宸ュ伐浣嶄负M2P100
- String reportResult = RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(), stationCode, format.format(new Date()));
+ //String reportResult = RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(), stationCode, format.format(new Date()));
+ String reportResult = OPCUaSubscription.getWorkReportResultFeedback(daParamCollection.getProductBarcode(), stationCode, format.format(new Date()));
JSONObject jsonObject = new JSONObject(reportResult);
String code = jsonObject.getStr("code");
if("success".equals(code)){
--
Gitblit v1.9.3