From 05bd172d550f1b6b963fcb23ef21d79e2a43d757 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 10 六月 2025 13:59:34 +0800
Subject: [PATCH] 更新S7通讯程序
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcEdgTask.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcEdgTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcEdgTask.java
index 902f06a..286fab4 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcEdgTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcEdgTask.java
@@ -38,7 +38,6 @@
@Resource
GlassInfoService glassInfoService;
-
@Scheduled(fixedDelay = 2000)
public void startOneEdgTask() throws Exception {
startEdgTaskChild("01");
@@ -51,7 +50,7 @@
private void startEdgTaskChild(String cell) throws Exception {
S7DataMBExtra s7DataMBExtra = s7SerializerMBExtra.read(S7DataMBExtra.class);
-
+ log.info("MB04璇诲彇鏁版嵁{}", s7DataMBExtra);
// ReadWriteEntity request = miloService.readFromOpcUa("MB04.MB04.request" + cell);
// if (null == request || "0".equals(request.getValue() + "")) {
String request = "";
@@ -84,13 +83,13 @@
// ualist.add(generateReadWriteEntity("MB04.MB04.thickness" + cell, (int) glassInfo.getThickness() * 10));
// miloService.writeToOpcWord(ualist);
// miloService.writeToOpcUa(generateReadWriteEntity("MB04.MB04.mes_glass_Id_" + cell, glassId));
-
+ log.info("{}绾垮彂閫佸昂瀵镐俊鎭锛歿}锛岄珮锛歿}锛屽帤搴︼細{}", cell, Math.max(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10), Math.min(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10), glassInfo.getThickness() * 10);
if ("01".equals(cell)) {
s7SerializerMBExtra.write(
S7DataMBExtra.builder()
- .widthOne((short) Math.max(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10))
- .heightOne((short) Math.min(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10))
- .thicknessOne((short) (glassInfo.getThickness() * 10))
+ .widthOne((int) Math.max(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10))
+ .heightOne((int) Math.min(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10))
+ .thicknessOne((int) (glassInfo.getThickness() * 10))
.build()
);
s7SerializerMBExtra.write(
@@ -99,9 +98,9 @@
} else {
s7SerializerMBExtra.write(
S7DataMBExtra.builder()
- .widthTwo((short) Math.max(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10))
- .heightTwo((short) Math.min(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10))
- .thicknessTwo((short) (glassInfo.getThickness() * 10))
+ .widthTwo((int) Math.max(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10))
+ .heightTwo((int) Math.min(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10))
+ .thicknessTwo((int) (glassInfo.getThickness() * 10))
.build()
);
s7SerializerMBExtra.write(
--
Gitblit v1.8.0