From 9a5ab9f2f92f798fe15d7bad13428d9ddace83f9 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期五, 19 七月 2024 09:08:04 +0800
Subject: [PATCH] 修改报工工位，及上传参数itemType
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 4 ++--
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 4 ++--
2 files changed, 4 insertions(+), 4 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 f32e812..e7d65a5 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,7 @@
try{
CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
logger.info("OP100鎶ュ伐寮�濮�-宸ュ巶MES寮傛鏂规硶");
- String stationCode = "M1OP100";
+ 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");
@@ -566,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");
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 de5bf59..ef55561 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
@@ -508,9 +508,9 @@
//鎻掑叆鍙傛暟閲囬泦琛�
daParamCollectionService.insertBatch(collectionList);
- //濡傛灉220宸ヤ綅锛岃繘琛屾姤宸�
+ //濡傛灉220宸ヤ綅锛岃繘琛屾姤宸�,鍥犱负涓婂眰绯荤粺鍙敮鎸�6浣嶏紝鎵�鏈夋姤宸ュ伐浣嶄慨鏀逛负M1P220
if("M1OP220".equals(device)) {
- getWorkReportResultFeedback(moduleCode, "M1OP220", format.format(new Date()));
+ getWorkReportResultFeedback(moduleCode, "M1P220", format.format(new Date()));
}
//涓婁紶鍒板伐鍘俶es
--
Gitblit v1.9.3