From 9129e80e9f729012c2d74dfba7e366539924b069 Mon Sep 17 00:00:00 2001 From: pjb <pjb123456> Date: 星期六, 26 七月 2025 15:21:12 +0800 Subject: [PATCH] 修复:给一块plc输送线连续下发任务,造成该plc线程没时间读,主线程又循环到rgv放货完成方法,造成线程一直无法读,重复写 --- src/main/java/com/zy/core/properties/SlaveProperties.java | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java index ad23f6a..52badea 100644 --- a/src/main/java/com/zy/core/properties/SlaveProperties.java +++ b/src/main/java/com/zy/core/properties/SlaveProperties.java @@ -1,28 +1,48 @@ 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.RgvSlave; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import java.util.ArrayList; import java.util.List; /** * Created by vincent on 2020/8/4 + * + */ + +/** + * 璇ョ被鏁翠釜灏辨槸涓�涓�氳繃閰嶇疆鏂囦欢鏉ュ疄浣撳寲瀵硅薄绫� */ @Data @Configuration @ConfigurationProperties(prefix = "wcs-slave") public class SlaveProperties { - private List<Slave> crn; + private boolean doubleDeep; - private List<Slave> devp; + private List<Integer> doubleLocs = new ArrayList<>(); - private List<Slave> barcode; + private int groupCount; - private List<Slave> led; + private List<CrnSlave> crn = new ArrayList<>(); - private List<Slave> scale; + private List<DevpSlave> devp = new ArrayList<>(); + + private List<Slave> barcode = new ArrayList<>(); + + private List<LedSlave> led = new ArrayList<>(); + + private List<Slave> scale = new ArrayList<>(); + + private List<Slave> car = new ArrayList<>(); + + private List<RgvSlave> rgv = new ArrayList<>(); } -- Gitblit v1.9.1