From 3cf23392ce90c0a99835afe2db3a81206e093819 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 25 九月 2025 10:02:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdwcs' into jshdwcs

---
 src/main/java/com/zy/core/model/DevpSlave.java |    6 ++++++
 1 files changed, 6 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 e327301..62e3fe2 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -27,12 +27,18 @@
 
     private List<Sta> pickSta = new ArrayList<>();
 
+    private List<Sta> armSta = 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;
 
         private Integer backSta;
 

--
Gitblit v1.9.1