#

Junjie

2023-12-14 3893201c122b090aa31ead73cb9c2e7ae2db9611

#

 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());
                // 相同工作号集合则过滤