From 8b7ae914554652266b31f3bb4237106f1b220cc7 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 20 十月 2025 16:02:11 +0800
Subject: [PATCH] 阿尔及利亚代码逻辑修改，页面布局修改
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/s7/entity/S7DataSP.java | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/s7/entity/S7DataSP.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/s7/entity/S7DataSP.java
index 75a6e09..40b4ec2 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/s7/entity/S7DataSP.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/s7/entity/S7DataSP.java
@@ -1,6 +1,6 @@
package com.mes.s7.entity;
-import com.github.xingshuangs.iot.common.enums.EDataType;
+import com.github.xingshuangs.iot.protocol.common.enums.EDataType;
import com.github.xingshuangs.iot.protocol.s7.serializer.S7Variable;
import lombok.Data;
@@ -13,32 +13,33 @@
public class S7DataSP {
- @S7Variable(address = "DB19.14", type = EDataType.UINT16)
- private Integer taskState;
+ @S7Variable(address = "DB151.0", type = EDataType.UINT16)
+ private Integer plcRequest;
- @S7Variable(address = "DB19.18", type = EDataType.UINT16)
- private Integer damageCount;
+ @S7Variable(address = "DB151.2", type = EDataType.UINT16)
+ private Integer plcRequestId;
- @S7Variable(address = "DB19.20", type = EDataType.UINT16)
- private Integer rawGlassWidth;
+ @S7Variable(address = "DB151.10", type = EDataType.UINT16)
+ private Integer plcReport;
- @S7Variable(address = "DB19.22", type = EDataType.UINT16)
- private Integer rawGlassHeight;
+ @S7Variable(address = "DB151.12", type = EDataType.UINT16)
+ private Integer plcReportId;
- @S7Variable(address = "DB19.24", type = EDataType.UINT16)
+ @S7Variable(address = "DB151.20", type = EDataType.UINT16)
+ private Integer mesSend;
+
+ @S7Variable(address = "DB151.22", type = EDataType.UINT16)
+ private Integer mesSendId;
+
+ @S7Variable(address = "DB151.24", type = EDataType.UINT16)
private Integer slot;
- @S7Variable(address = "DB19.26", type = EDataType.UINT16)
- private Integer totalCount;
+ @S7Variable(address = "DB151.26", type = EDataType.UINT16)
+ private Integer rawGlassHeight;
- @S7Variable(address = "DB19.28", type = EDataType.UINT16)
- private Integer finishCount;
+ @S7Variable(address = "DB151.28", type = EDataType.UINT16)
+ private Integer rawGlassWidth;
- @S7Variable(address = "DB19.16.0", type = EDataType.BOOL)
- private Boolean taskRunning;
-
- @S7Variable(address = "DB19.30", type = EDataType.UINT16)
- private Integer inkageState;
-
-
+ @S7Variable(address = "DB151.40", type = EDataType.UINT16)
+ private Integer mesConfirm;
}
--
Gitblit v1.8.0