From 0641b66a7724bda815e667feeb832e2f755d18cb Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 22 四月 2025 21:07:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs
---
src/main/java/com/zy/core/model/DevpSlave.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/model/DevpSlave.java b/src/main/java/com/zy/core/model/DevpSlave.java
index 6b0b563..24365d1 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -8,21 +8,59 @@
import java.util.List;
/**
+ * 杈撻�佺嚎閰嶇疆
* Created by vincent on 2020/8/6
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class DevpSlave extends Slave {
- private List<InSta> inSta = new ArrayList<>();
+ private Integer rack;
+
+ private Integer slot;
+
+ private List<Sta> inSta = new ArrayList<>();
+
+ private List<Sta> emptyInSta = new ArrayList<>();
+
+ private List<Sta> outSta = new ArrayList<>();
+
+ private List<Sta> pickInSta = new ArrayList<>();
+
+ private List<Sta> pickInSta2 = new ArrayList<>();
+
+ private List<Sta> pickOutSta = new ArrayList<>();
+
+ private List<StaRack> rackInStn = new ArrayList<>();
+
+ private List<StaRack> rackOutStn = new ArrayList<>();
@Data
- public static class InSta {
+ public static class Sta {
private Integer staNo;
private Integer barcode;
+ private Integer backSta;
+
+ private Integer led;
+
+ private Integer liftNo;
+
+ }
+
+ @Data
+ public static class StaRack {
+ private Integer devpPlcId;
+
+ private Integer staNo;
+
+ private Integer row;
+
+ private Integer bay;
+
+ private Integer lev;
}
}
--
Gitblit v1.9.1