From e32ff68be04c9e2e3ab689c4494aefe5d3036400 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 12 四月 2025 11:12:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wcs' into jx-fyxc-wcs
---
src/main/java/com/zy/core/model/CrnSlave.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/model/CrnSlave.java b/src/main/java/com/zy/core/model/CrnSlave.java
index 47232af..cfee50d 100644
--- a/src/main/java/com/zy/core/model/CrnSlave.java
+++ b/src/main/java/com/zy/core/model/CrnSlave.java
@@ -14,6 +14,14 @@
@Data
public class CrnSlave extends Slave {
+ private Integer rack;
+
+ private Integer slot;
+
+ private Integer offset;
+
+ private Boolean demo;
+
// 鍫嗗灈鏈哄叆搴撶珯鐐�
private List<CrnStn> crnInStn = new ArrayList<>();
@@ -23,12 +31,21 @@
@Data
public static class CrnStn {
- // 鍫嗗灈鏈簆lc缂栧彿
+ // 杈撻�佺嚎plc缂栧彿
private Integer devpPlcId;
// 鍫嗗灈鏈虹珯鐐圭紪鍙�
private Integer staNo;
+ // 鎺�
+ private Integer row;
+
+ // 鍒�
+ private Integer bay;
+
+ // 灞�
+ private Integer lev;
+
}
}
--
Gitblit v1.9.1