From 448e5b139e803002547552b989e32c0392d59e4b Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期二, 12 七月 2022 16:05:42 +0800
Subject: [PATCH] Merge branch 'hylywcs' of http://47.97.1.152:5880/r/zy-wcs into hylywcs
---
src/main/java/com/zy/core/model/CrnSlave.java | 15 ++++++++++++++-
1 files changed, 14 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 3ff10a8..cfee50d 100644
--- a/src/main/java/com/zy/core/model/CrnSlave.java
+++ b/src/main/java/com/zy/core/model/CrnSlave.java
@@ -18,6 +18,10 @@
private Integer slot;
+ private Integer offset;
+
+ private Boolean demo;
+
// 鍫嗗灈鏈哄叆搴撶珯鐐�
private List<CrnStn> crnInStn = new ArrayList<>();
@@ -27,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