From 22094a20a803866201e0b2dd7ff7c266871ffe52 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 29 八月 2023 10:18:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/java/com/zy/core/model/DevpSlave.java | 15 +++++++++++++--
1 files changed, 13 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..ad33be5 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -8,16 +8,27 @@
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;
--
Gitblit v1.9.1