From a81c56cc9d0766914a5cd932cb61bf94dce27bc8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 11 九月 2024 13:07:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zb-md-wcs' into zb-md-wcs
---
src/main/java/com/zy/core/model/DevpSlave.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/model/DevpSlave.java b/src/main/java/com/zy/core/model/DevpSlave.java
index dcbbe12..21e29a9 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -15,9 +15,23 @@
@Data
public class DevpSlave extends Slave {
+ private Integer rack;
+
+ private Integer slot;
+
private List<Sta> inSta = new ArrayList<>();
+ private List<Sta> rgvSta = new ArrayList<>();
+
+ private List<Sta> emptyInSta = new ArrayList<>();
+
+ private List<Sta> outSta = new ArrayList<>();
+
private List<Sta> pickSta = new ArrayList<>();
+
+ private List<Sta> autoEmptyOut = new ArrayList<>();
+
+ private List<Sta> autoEmptyIn = new ArrayList<>();
@Data
public static class Sta {
@@ -26,6 +40,10 @@
private Integer barcode;
+ private Integer backSta;
+
+ private Integer led;
+
}
}
--
Gitblit v1.9.1