From ffbcb17a9ce705b443c3a450e3e3d56f13ee712f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 23 九月 2025 13:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs_dev' into shuttle_rcs_dev
---
src/main/java/com/zy/core/properties/SlaveProperties.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java
index a03469f..74910e7 100644
--- a/src/main/java/com/zy/core/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -1,7 +1,7 @@
package com.zy.core.properties;
import com.zy.core.Slave;
-import com.zy.core.model.DevpSlave;
+import com.zy.core.model.*;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@@ -17,14 +17,16 @@
@ConfigurationProperties(prefix = "wcs-slave")
public class SlaveProperties {
- private List<Slave> crn = new ArrayList<>();
+ private boolean doubleDeep;
- private List<DevpSlave> devp = new ArrayList<>();
+ private List<Integer> doubleLocs = new ArrayList<>();
- private List<Slave> barcode = new ArrayList<>();
+ private int groupCount;
- private List<Slave> led = new ArrayList<>();
+ private List<ShuttleSlave> shuttle = new ArrayList<>();
- private List<Slave> scale = new ArrayList<>();
+ private List<ForkLiftSlave> forkLift = new ArrayList<>();
+
+ private List<ForkLiftSlave> forkLiftMaster = new ArrayList<>();
}
--
Gitblit v1.9.1