From db6ebb25325838edb5e8bb9c55388341935628b8 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期二, 13 八月 2024 16:42:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 2 +-
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java | 6 ++++--
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 2 ++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
index a3f0f99..ce5def6 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
@@ -53,9 +53,11 @@
@GetMapping("/unfinishedProcess")
public AjaxResult unfinishedProcess(BsFormulaChildInfo bsFormulaChildInfo)
{
+ String thoroughfare = Constants.thoroughfareMap.get(bsFormulaChildInfo.getProcessesCode());//鑾峰彇閫氶亾
try {
- String str = "MOZU1."+bsFormulaChildInfo.getProcessesCode()+".RecordDataDone";
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(bsFormulaChildInfo.getRecordDataDone()).build());
+// String str = "MOZU1."+bsFormulaChildInfo.getProcessesCode()+".RecordDataDone";
+// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(bsFormulaChildInfo.getRecordDataDone()).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare+"."+bsFormulaChildInfo.getProcessesCode()+".RecordDataDone").value(bsFormulaChildInfo.getRecordDataDone()).build());
} catch (Exception e) {
throw new RuntimeException(e);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
index 6db9e8c..1ca8a2b 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -100,7 +100,7 @@
Constants.OP0170_OP230.add(Constants.OP200);
Constants.OP0170_OP230.add(Constants.OP210);
Constants.OP0170_OP230.add(Constants.OP220);
- Constants.OP0170_OP230.add(Constants.OP230);
+// Constants.OP0170_OP230.add(Constants.OP230);
OPCUaSubscription opcUaSubscription = new OPCUaSubscription(
miloService,
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 28d1647..e0a712a 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
@@ -324,6 +324,8 @@
parentVO.setRecordId(UUID.randomUUID().toString());
if("2".equals(stationStatus)){//宸ョ珯鐘舵��
parentVO.setTotalResult("0");
+ }else{
+ parentVO.setTotalResult("1");
}
parentVO.setProductNum(snCode);
parentVO.setCheckList(mesList);
--
Gitblit v1.9.3