#

mrzhssss

2023-01-09 44cf1e2793733f703cfe7ccad5e2727a81a98cad

#

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -397,9 +397,6 @@
                }





//                // 入出库模式判断
//                if (devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }

@@ -1526,26 +1523,19 @@
            // 获取LED线程
            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
            // 相同工作号集合则过滤
            if (CollectionUtils.equals(ledThread.getWorkNos(), workNos)) {
                continue;
            }
//            if (CollectionUtils.equals(ledThread.getWorkNos(), workNos)) {
//                continue;
//            }
            // 命令下发 -------------------------------------------------------------------------------
            if (!commands.isEmpty()) {
                if (led.getId() == 7) {
                String errMsg = "";
                    if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(3, commands))) {
                        log.error("{}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
                        continue;
                    } else {
                        ledThread.setLedMk(false);
                    }
                } else {
                    if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(1, commands))) {
                        log.error("{}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
                        continue;
                    } else {
                        ledThread.setLedMk(false);
                    }
                }


            }


 src/main/java/com/zy/core/thread/LedThread.java

@@ -92,6 +92,8 @@
                        case 6:
                            errorReset();
                            break;
                        case 7:
                            write7((List<LedCommand>) task.getData());
                        default:
                            break;
                    }
@@ -202,6 +204,7 @@
        close();
    }
    private void write7(List<LedCommand> list) {

        commandList = list;

        StringBuilder sb = new StringBuilder();