From a6ddc35c9f177ec73abef648fed0ac6de16d856f Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期六, 26 七月 2025 16:18:07 +0800
Subject: [PATCH] rgv调动分配优化：判断当前任务取货站点后续小车任务放货完后能不能取当前任务
---
src/main/java/com/zy/core/properties/SlaveProperties.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java
index e691c45..fb800fa 100644
--- a/src/main/java/com/zy/core/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -1,6 +1,7 @@
package com.zy.core.properties;
import com.zy.core.Slave;
+import com.zy.core.model.*;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@@ -10,20 +11,29 @@
/**
* Created by vincent on 2020/8/4
+ *
+ */
+
+/**
+ * 璇ョ被鏁翠釜灏辨槸涓�涓�氳繃閰嶇疆鏂囦欢鏉ュ疄浣撳寲瀵硅薄绫�
*/
@Data
@Configuration
@ConfigurationProperties(prefix = "wcs-slave")
-public class SlaveProperties {
+public class SlaveProperties{
- private List<Slave> crn = new ArrayList<>();
+ private List<RgvSlave> rgv = new ArrayList<>();
- private List<Slave> devp = new ArrayList<>();
+ private List<DevpSlave> devp = new ArrayList<>();
private List<Slave> barcode = new ArrayList<>();
- private List<Slave> led = new ArrayList<>();
+ private List<LedSlave> led = new ArrayList<>();
private List<Slave> scale = new ArrayList<>();
+ private List<Slave> car = new ArrayList<>();
+
+ private List<SteSlave> Ste = new ArrayList<>();
+
}
--
Gitblit v1.9.1