From 675ed4fa602e79e220e76fcdbc56e4630c0fb21c Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 17 七月 2024 17:17:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/JarSlave.java | 67 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/model/JarSlave.java b/src/main/java/com/zy/core/model/JarSlave.java
index 9ced301..52ba4a9 100644
--- a/src/main/java/com/zy/core/model/JarSlave.java
+++ b/src/main/java/com/zy/core/model/JarSlave.java
@@ -20,20 +20,77 @@
private Boolean demo;
- // 绌挎杞﹀叆搴撶珯鐐�
- private List<CrnStn> steInStn = new ArrayList<>();
+ private Integer jarOtherId;
- // 绌挎杞﹀嚭搴撶珯鐐�
- private List<CrnStn> steOutStn = new ArrayList<>();
+ // 纭寲缃愬叆搴撶珯鐐�
+ private List<StaStn> jarInSta = new ArrayList<>();
+
+ // 纭寲缃愬嚭搴撶珯鐐�
+ private List<StaStn> jarOutSta = new ArrayList<>();
+
+ // 纭寲缃愬叆搴揜GV
+ private List<RgvStn> jarInRgv = new ArrayList<>();
+
+ // 纭寲缃愬嚭搴揜GV
+ private List<RgvStn> jarOutRgv = new ArrayList<>();
+
+ // 纭寲缃愬叆搴撶┛姊澘
+ private List<SteStn> jarInSte = new ArrayList<>();
+
+ // 纭寲缃愬嚭搴撶┛姊澘
+ private List<SteStn> jarOutSte = new ArrayList<>();
@Data
- public static class CrnStn {
+ public static class StaStn {
// 杈撻�佺嚎plc缂栧彿
private Integer devpPlcId;
// 绌挎杞︾珯鐐圭紪鍙�
private Integer staNo;
+ private Integer rgvNo;
+ private Integer steNo;
+
+ // 鎺�
+ private Integer row;
+
+ // 鍒�
+ private Integer bay;
+
+ // 灞�
+ private Integer lev;
+
+ }
+
+ @Data
+ public static class RgvStn {
+ // 杈撻�佺嚎plc缂栧彿
+ private Integer devpPlcId;
+
+ // 绌挎杞︾珯鐐圭紪鍙�
+ private Integer rgvNo;
+
+ // 鎺�
+ private Integer row;
+
+ // 鍒�
+ private Integer bay;
+
+ // 灞�
+ private Integer lev;
+
+ }
+
+ @Data
+ public static class SteStn {
+ // 杈撻�佺嚎plc缂栧彿
+ private Integer devpPlcId;
+
+ // 绌挎鏉縫lc缂栧彿
+ private Integer steId;
+
+ // 绌挎杞︾珯鐐圭紪鍙�
+ private Integer steNo;
// 鎺�
private Integer row;
--
Gitblit v1.9.1