From 2028b51aeda2b6b23fda4183875b145d5e83822f Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 19 六月 2024 11:06:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs
---
src/main/java/com/zy/core/model/DevpSlave.java | 19 +++++++++++++++++--
1 files changed, 17 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..e327301 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -8,21 +8,36 @@
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> pickSta = new ArrayList<>();
@Data
- public static class InSta {
+ public static class Sta {
private Integer staNo;
private Integer barcode;
+ private Integer backSta;
+
+ private Integer led;
+
}
}
--
Gitblit v1.9.1