From cfaa77861170237f07da3113c7d505c70bf371be Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 18 六月 2025 10:50:15 +0800
Subject: [PATCH] S7通讯部署版本代码提交
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java
index d833931..1569990 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java
@@ -127,6 +127,7 @@
} else {
s7DataSP = s7SerializerSPTwo.read(S7DataSP.class);
}
+ log.info("{}涓婄墖绾匡紝褰撳墠涓婄墖浣嶄俊鎭細{}", deviceId, s7DataSP);
Engineering engineering = engineeringMapper.selectOne(new LambdaQueryWrapper<Engineering>()
.eq(Engineering::getState, Const.ENGINEERING_RUNNING).eq(Engineering::getStationCell, deviceId));
if (null == engineering) {
@@ -135,11 +136,11 @@
}
//浠诲姟鏆傚仠
S7DataSP task = new S7DataSP();
- if (LOAD_GLASS_ONE_DEVICE.equals(deviceId)) {
- s7SerializerSPOne.read(S7DataSP.class);
- } else {
- s7SerializerSPTwo.read(S7DataSP.class);
- }
+// if (LOAD_GLASS_ONE_DEVICE.equals(deviceId)) {
+// s7SerializerSPOne.read(S7DataSP.class);
+// } else {
+// s7SerializerSPTwo.read(S7DataSP.class);
+// }
// LoadGlassDeviceTask task = loadGlassDeviceTaskService.queryTaskMessage(tableName);
;
if ("0".equals(s7DataSP.getInkageState().toString())) {
@@ -237,6 +238,7 @@
} else {
s7DataSP = s7SerializerSPTwo.read(S7DataSP.class);
}
+ log.info("{}涓婄墖绾匡紝褰撳墠涓婄墖浣嶄俊鎭細{}", deviceId, s7DataSP);
// LoadGlassDeviceTask task = loadGlassDeviceTaskService.queryTaskMessage(tableName);
if (s7DataSP.getTaskRunning().toString().equals(Const.ENGINEERING_NEW)) {
// if (task.getTaskRunning().equals(Const.ENGINEERING_NEW)) {
--
Gitblit v1.8.0