From 531304243540f64d278c0a701a3ca34e516c4165 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 28 八月 2025 16:32:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdwcs' into jshdwcs
---
src/main/java/com/zy/core/model/DevpSlave.java | 7 +++++++
1 files changed, 7 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 fb50f0a..3a79437 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -21,6 +21,8 @@
private List<Sta> inSta = new ArrayList<>();
+ private List<Sta> emptyInSta = new ArrayList<>();
+
private List<Sta> outSta = new ArrayList<>();
private List<Sta> pickSta = new ArrayList<>();
@@ -31,6 +33,11 @@
private Integer staNo;
private Integer barcode;
+ private Integer barcodeMat;
+
+ private Integer backSta;
+
+ private Integer led;
}
--
Gitblit v1.9.1