From ac0906df88505ec24ee910899a036676823f9d63 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 21 十一月 2023 08:56:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

---
 src/main/java/com/zy/core/model/DevpSlave.java |    9 +++++++++
 1 files changed, 9 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..bb45c71 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -15,7 +15,15 @@
 @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<>();
 
@@ -26,6 +34,7 @@
 
         private Integer barcode;
 
+        private Integer scale;
     }
 
 }

--
Gitblit v1.9.1