From ba554f3db080b64d74bb283a899a0b2b5dbcf376 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 22 八月 2025 13:59:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-gt-crn-wcs' into jx-gt-crn-wcs
---
src/main/java/com/zy/core/model/DevpSlave.java | 15 +++++++++++++++
1 files changed, 15 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..1763c3c 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -15,9 +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> agvOutSta = new ArrayList<>();
@Data
public static class Sta {
@@ -25,6 +35,11 @@
private Integer staNo;
private Integer barcode;
+ private Integer barcodeMat;
+
+ private Integer backSta;
+
+ private Integer led;
}
--
Gitblit v1.9.1