From 035331e18802456a070b61a01b1466f59d43a29d Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 07 三月 2023 14:16:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LedThread.java | 9 +++++----
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 5 +++--
src/main/resources/application.yml | 12 +++++++++---
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 7a79790..012062f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2489,9 +2489,10 @@
}
}
// 鑾峰彇led绾跨▼
- LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getDevpPlcId());
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
// led鏄剧ず榛樿鍐呭
- if (reset) {
+ if (reset && !ledThread.isLedMk()) {
+ ledThread.setLedMk(true);
if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(2, new ArrayList<>()))) {
News.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
}
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index eb261b6..b3d35a7 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -9,11 +9,14 @@
import com.zy.core.model.command.LedCommand;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+import onbon.bx05.Bx5GEnv;
import onbon.bx05.Bx5GScreenClient;
import onbon.bx05.area.TextCaptionBxArea;
+import onbon.bx05.area.page.TextBxPage;
import onbon.bx05.file.ProgramBxFile;
import onbon.bx05.utils.DisplayStyleFactory;
+import java.awt.*;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -27,10 +30,6 @@
private Slave slave;
private Set<Integer> workNos = new HashSet<>();
- private Bx5GScreenClient screen;
- ProgramBxFile pf;
- TextCaptionBxArea area;
- DisplayStyleFactory.DisplayStyle[] styles = DisplayStyleFactory.getStyles().toArray(new DisplayStyleFactory.DisplayStyle[0]);
private boolean ledMk = false;
private boolean resetStatus = false; // 澶嶄綅鐘舵��
@@ -89,7 +88,9 @@
if (!command.isEmptyMk()) {
for (MatDto matDto : command.getMatDtos()) {
sb.append("鐗╂枡缂栫爜锛�").append(matDto.getMatnr()).append("\n");
+ sb.append("鍚嶇О锛�").append(matDto.getMaknx()).append("\n");
sb.append("鏁伴噺锛�").append(matDto.getCount()).append("\n");
+ sb.append("瑙勬牸锛�").append(matDto.getSpecs()).append("\n");
}
}
sb.append("\n");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e6e65d7..7816523 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -142,29 +142,35 @@
emptyInSta[0]:
staNo: 102
barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[1]:
staNo: 201
barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[2]:
staNo: 301
barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[2].id}
# 鍑哄簱鍙�1
outSta[0]:
staNo: 102
+ led: ${wcs-slave.led[3].id}
# 鍑哄簱鍙�2
outSta[1]:
staNo: 202
+ led: ${wcs-slave.led[4].id}
# 鍑哄簱鍙�2
outSta[2]:
staNo: 302
+ led: ${wcs-slave.led[5].id}
# 鎷ｆ枡鍑哄簱鍙�
pickInSta[0]:
- staNo: 102
+ staNo: 100
barcode: ${wcs-slave.barcode[0].id}
- backSta: 102
- led: ${wcs-slave.led[0].id}
+ backSta: 100
+ led: ${wcs-slave.led[3].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
--
Gitblit v1.9.1