From 3893201c122b090aa31ead73cb9c2e7ae2db9611 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 14 十二月 2023 20:28:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 62f7286..ebea0fe 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2824,6 +2824,7 @@
List<LedCommand> commands = new ArrayList<>();
// 宸ヤ綔妗ｉ泦鍚�
List<WrkMast> wrkMasts = new ArrayList<>();
+ List<WrkMastLog> wrkMastLogs = new ArrayList<>();
for (Integer staNo : led.getStaArr()) {
// 鑾峰彇鍙夎溅绔欑偣
StaProtocol staProtocol = devpThread.getStation().get(staNo);
@@ -2851,6 +2852,7 @@
locNo = wrkMastLog.getLocNo();
wrkStaNo = wrkMastLog.getStaNo();
barcode = wrkMastLog.getBarcode();
+ wrkMastLogs.add(wrkMastLog);
}else {
if (wrkMast.getWrkSts() < 14 || wrkMast.getIoType() < 100) {
continue;
@@ -2860,8 +2862,8 @@
locNo = wrkMast.getLocNo();
wrkStaNo = wrkMast.getStaNo();
barcode = wrkMast.getBarcode();
+ wrkMasts.add(wrkMast);
}
- wrkMasts.add(wrkMast);
// 缁勮鍛戒护
LedCommand ledCommand = new LedCommand();
ledCommand.setWorkNo(wrkNo);
@@ -2943,7 +2945,12 @@
commands.add(ledCommand);
}
- Set<Integer> workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());
+ Set<Integer> workNos = null;
+ if (!wrkMasts.isEmpty()) {
+ workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());
+ }else {
+ workNos = wrkMastLogs.stream().map(WrkMastLog::getWrkNo).collect(Collectors.toSet());
+ }
// 鑾峰彇LED绾跨▼
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
// 鐩稿悓宸ヤ綔鍙烽泦鍚堝垯杩囨护
--
Gitblit v1.9.1