From 5e7af1c3ce9e48f81ac96b8e009af47def0d17e6 Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期三, 27 十一月 2024 09:20:06 +0800
Subject: [PATCH] 义乌项目：补充响应PLC钢化进炉请求逻辑，以及向钢化炉下发参数逻辑
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/OpcNGTemperingTask.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/OpcNGTemperingTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/OpcNGTemperingTask.java
index fcf2542..cd836a3 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/OpcNGTemperingTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/OpcNGTemperingTask.java
@@ -41,17 +41,22 @@
* fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
- @Scheduled(fixedDelay = 1000)
+ //@Scheduled(fixedDelay = 1000)
public void requestTemperingTask() throws Exception {
- ReadWriteEntity requestTemperingId = miloService.readFromOpcUa("XX.XX.requestTemperingId");//璇锋眰杩涚墖 鐐夊彿ID
+ ReadWriteEntity requestInTempering = miloService.readFromOpcUa("GH1S7.GH1S7.requestInTempering");//璇锋眰杩涚墖
+ ReadWriteEntity requestTemperingId = miloService.readFromOpcUa("GH1S7.GH1S7.requestTemperingId");//璇锋眰杩涚墖 鐐夊彿ID
+ Integer request = Integer.parseInt(requestInTempering.getValue().toString());
Integer id = Integer.parseInt(requestTemperingId.getValue().toString());
- if (id == 0) {
- miloService.writeToOpcUa(generateReadWriteEntity("XX.XX.responseInTempering", 0));//鍏佽閫佺墖娓呴浂
- }
- ReadWriteEntity placedNumber = miloService.readFromOpcUa("XX.XX.placedNumber");//宸叉憜鐗囨暟閲�
- List<TemperingGlassInfo> glassList = temperingAgoService.selectGlassInfoById(id);
- if (glassList.size() == Integer.parseInt(placedNumber.getValue().toString())) {
- miloService.writeToOpcUa(generateReadWriteEntity("XX.XX.responseInTempering", 1));//鍐欏叆鍏佽閫佺墖
+ if (request == 0) {
+ miloService.writeToOpcUa(generateReadWriteEntity("GH1S7.GH1S7.responseInTempering", 0));//鍏佽閫佺墖娓呴浂
+ } else {
+ ReadWriteEntity placedNumber = miloService.readFromOpcUa("GH1S7.GH1S7.placedNumber");//宸叉憜鐗囨暟閲�
+ List<TemperingGlassInfo> glassList = temperingAgoService.selectGlassInfoById(id);
+ if (glassList.size() == Integer.parseInt(placedNumber.getValue().toString())) {
+ miloService.writeToOpcUa(generateReadWriteEntity("GH1S7.GH1S7.responseInTempering", 1));//鍐欏叆鍏佽閫佺墖
+ } else {
+ miloService.writeToOpcUa(generateReadWriteEntity("GH1S7.GH1S7.responseInTempering", 2));//涓嶆弧瓒宠繘鐐夋潯浠�
+ }
}
}
@@ -60,9 +65,9 @@
* fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
- @Scheduled(fixedDelay = 1000)
+ //@Scheduled(fixedDelay = 1000)
public void loadTemperingTask() throws Exception {
- ReadWriteEntity loadTemperingId = miloService.readFromOpcUa("XX.XX.loadTemperingId");//杩涚墖瀹屾垚 鐐夊彿ID
+ ReadWriteEntity loadTemperingId = miloService.readFromOpcUa("GH1S7.GH1S7.loadTemperingId");//杩涚墖瀹屾垚 鐐夊彿ID
getNewTemperingID(Integer.parseInt(loadTemperingId.getValue().toString()));//杩涚墖瀹屾垚 涓嬪彂鍙傛暟
}
--
Gitblit v1.8.0