From 04ef1a453d35fab8742f185a33d2659f623b038c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 22 二月 2022 16:32:12 +0800
Subject: [PATCH] Merge branch 'xgmwcs' of http://47.97.1.152:5880/r/zy-wcs into xgmwcs
---
src/main/java/com/zy/core/properties/SlaveProperties.java | 17 ++++++++++++++---
1 files changed, 14 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 e691c45..4a60418 100644
--- a/src/main/java/com/zy/core/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -1,6 +1,9 @@
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 lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@@ -16,14 +19,22 @@
@ConfigurationProperties(prefix = "wcs-slave")
public class SlaveProperties {
- private List<Slave> crn = new ArrayList<>();
+ private boolean doubleDeep;
- private List<Slave> devp = new ArrayList<>();
+ private List<Integer> doubleLocs = new ArrayList<>();
+
+ private int groupCount;
+
+ private List<CrnSlave> crn = 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<>();
+
}
--
Gitblit v1.9.1