From 8a8faba0f55512a2c18c4fe719a1bb0c4f6a86c9 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 12 六月 2024 08:44:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3
---
src/main/java/com/zy/core/properties/SlaveProperties.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java
index a6931f3..7bf463d 100644
--- a/src/main/java/com/zy/core/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -1,9 +1,7 @@
package com.zy.core.properties;
import com.zy.core.Slave;
-import com.zy.core.model.CrnSlave;
-import com.zy.core.model.DevpSlave;
-import com.zy.core.model.LedSlave;
+import com.zy.core.model.*;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@@ -19,9 +17,23 @@
@ConfigurationProperties(prefix = "wcs-slave")
public class SlaveProperties {
+ private boolean doubleDeep;
+
+ private List<Integer> doubleLocs = new ArrayList<>();
+
+ private int groupCount;
+
+ private List<String> channel = new ArrayList<>();
+
private List<CrnSlave> crn = new ArrayList<>();
+ private List<SteSlave> ste = new ArrayList<>();
+
private List<DevpSlave> devp = new ArrayList<>();
+
+ private List<Devp2Slave> devp2 = new ArrayList<>();
+
+ private List<Devp2Slave> devp3 = new ArrayList<>();
private List<Slave> barcode = new ArrayList<>();
@@ -29,4 +41,10 @@
private List<Slave> scale = new ArrayList<>();
+ private List<Slave> car = new ArrayList<>();
+
+ private List<ShuttleSlave> shuttle = new ArrayList<>();
+
+ private List<LiftSlave> lift = new ArrayList<>();
+
}
--
Gitblit v1.9.1