From ccdcd79a48aabb15d9ce9525a3535c01e69475c8 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期五, 31 十月 2025 11:34:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdwcs' into jshdwcs
---
src/main/java/com/zy/core/model/DevpSlave.java | 10 ++++++++++
1 files changed, 10 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 3a79437..ac84e0d 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -20,6 +20,7 @@
private Integer slot;
private List<Sta> inSta = new ArrayList<>();
+ private List<Sta> inStaAgv = new ArrayList<>();
private List<Sta> emptyInSta = new ArrayList<>();
@@ -27,11 +28,20 @@
private List<Sta> pickSta = new ArrayList<>();
+ private List<Sta> armSta = new ArrayList<>();
+
+ private List<Sta> outStaAgvFull = new ArrayList<>();
+
+ private List<Sta> outStaAgvEmpty = new ArrayList<>();
+
@Data
public static class Sta {
private Integer staNo;
+ private Integer armNo;
+ private Integer sortingLine;
+ private Integer staNoEnd;
private Integer barcode;
private Integer barcodeMat;
--
Gitblit v1.9.1