From 5ac80d6a06f686a62c307c52c652e511e3896fb7 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期一, 27 十一月 2023 16:44:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld --- src/main/java/com/zy/core/model/CrnSlave.java | 18 +++++++++++++++++- 1 files changed, 17 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..f84dcdc 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,24 @@ @Data public static class CrnStn { - // 鍫嗗灈鏈簆lc缂栧彿 + // 杈撻�佺嚎plc缂栧彿 private Integer devpPlcId; // 鍫嗗灈鏈虹珯鐐圭紪鍙� private Integer staNo; + // 鎺� + private Integer row; + + // 鍒� + private Integer bay; + + // 灞� + private Integer lev; + + //閫�鍥炵珯鐐� + private Integer backSta; + } } -- Gitblit v1.9.1