From 8ba4ddfed043b20b0a15316141a9be10162ba664 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期一, 12 十二月 2022 12:17:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs_tqs' into bfwcs_tqs
---
src/main/java/com/zy/core/model/DevpSlave.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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..c5c02f0 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -21,9 +21,13 @@
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> pickInSta = new ArrayList<>();
+
+ private List<Sta> pickOutSta = new ArrayList<>();
@Data
public static class Sta {
@@ -32,6 +36,10 @@
private Integer barcode;
+ private Integer backSta;
+
+ private Integer led;
+
}
}
--
Gitblit v1.9.1