From f107eaf4d1857d2230a5bc6983e4beb7fb811aa1 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期六, 08 七月 2023 22:06:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs6' into bfwcs6
---
src/main/java/com/zy/core/model/DevpSlave.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/model/DevpSlave.java b/src/main/java/com/zy/core/model/DevpSlave.java
index 4b2ef50..c5c02f0 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -15,11 +15,19 @@
@Data
public class DevpSlave extends Slave {
+ 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<>();
+ private List<Sta> pickInSta = new ArrayList<>();
+
+ private List<Sta> pickOutSta = new ArrayList<>();
@Data
public static class Sta {
@@ -28,6 +36,10 @@
private Integer barcode;
+ private Integer backSta;
+
+ private Integer led;
+
}
}
--
Gitblit v1.9.1