From b460ec7a380334516ec478544afe42df409f4c54 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 25 十一月 2025 09:50:20 +0800
Subject: [PATCH] 1、中空夹胶线出片逻辑优化 2、钢化前卧转新增协议卧转立允许信号

---
 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPOne.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPOne.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPOne.java
index acea6fd..db818ee 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPOne.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPOne.java
@@ -97,6 +97,12 @@
     @S7Variable(address = "DB7.118", type = EDataType.STRING, count = 14)
     private String id6;
 
+    @S7Variable(address = "DB7.1248", type = EDataType.STRING, count = 14)
+    private String id7;
+
+    @S7Variable(address = "DB7.1380", type = EDataType.UINT16)
+    private Integer from7;
+
     @S7Variable(address = "MW1002", type = EDataType.UINT16)
     private Integer alramSignal;
 

--
Gitblit v1.8.0