#

lsh

2024-04-28 242fd02ef7b86cfe6ae352b1721c50205cc7bafe

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

@@ -148,43 +148,43 @@
//                    }
//                }
                //超宽超高没扫到条码报警
                boolean fig=false;
                for(int i=0;i<8;i++){
                    switch (i){
                        case 0: if(devpThread.startSignal[i]){
                            log.error("前超报警");
                            fig=true;
                        };
                        case 1: if(devpThread.startSignal[i]){
                            log.error("后超报警");
                            fig=true;
                        };
                        case 2: if(devpThread.startSignal[i]){
                            log.error("高超报警");
                            fig=true;
                        };
                        case 3: if(devpThread.startSignal[i]){
                            log.error("左超报警");
                            fig=true;
                        };
                        case 4: if(devpThread.startSignal[i]){
                            log.error("右超报警");
                            fig=true;
                        };
                        case 5: if(devpThread.startSignal[i]){
                            log.error("超重报警");
                            fig=true;
                        };
                        case 6: if(devpThread.startSignal[i]){
                            log.error("未扫到码报警");
                            fig=true;
                        };

                    }
                }
//                boolean fig=false;
//                for(int i=0;i<8;i++){
//                    switch (i){
//                        case 0: if(devpThread.startSignal[i]){
//                            log.error("前超报警");
//                            fig=true;
//                        };
//                        case 1: if(devpThread.startSignal[i]){
//                            log.error("后超报警");
//                            fig=true;
//                        };
//                        case 2: if(devpThread.startSignal[i]){
//                            log.error("高超报警");
//                            fig=true;
//                        };
//                        case 3: if(devpThread.startSignal[i]){
//                            log.error("左超报警");
//                            fig=true;
//                        };
//                        case 4: if(devpThread.startSignal[i]){
//                            log.error("右超报警");
//                            fig=true;
//                        };
//                        case 5: if(devpThread.startSignal[i]){
//                            log.error("超重报警");
//                            fig=true;
//                        };
//                        case 6: if(devpThread.startSignal[i]){
//                            log.error("未扫到码报警");
//                            fig=true;
//                        };
//
//                    }
//                }
                if (staProtocol.isAutoing() && staProtocol.isInEnable()
                        && !staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() > 9990)
                        && staProtocol.isPakMk() && !fig) { //&& staProtocol.getStamp()>=2) {// && !Cools.isEmpty(barcode)) {
                        && staProtocol.isPakMk()) { //&& staProtocol.getStamp()>=2) {// && !Cools.isEmpty(barcode)) {
                    News.warnNoLog(""+mark+" - 0"+" - 开始执行");
//                    try {
//                        Thread.sleep(300);
@@ -1669,33 +1669,33 @@
                continue;
            }
//             命令下发 -------------------------------------------------------------------------------
//            if (!commands.isEmpty()) {
//                if (led.getId() < 7) {
//                    if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(3, commands))) {
//                        News.error(""+mark+" - 2"+" - {}号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))) {
//                        News.error(""+mark+" - 3"+" - {}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
//                        continue;
//                    } else {
//                        ledThread.setLedMk(false);
//                    }
//                }
//
//            }
            // 命令下发 -------------------------------------------------------------------------------
            if (!commands.isEmpty()) {
                if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(3, commands))) {
                    News.error("{}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
                    continue;
                }else {
                    ledThread.setLedMk(false);
                if (led.getId() == 2) {
                    if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(3, commands))) {
                        News.error(""+mark+" - 2"+" - {}号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))) {
                        News.error(""+mark+" - 3"+" - {}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
                        continue;
                    } else {
                        ledThread.setLedMk(false);
                    }
                }

            }
//            // 命令下发 -------------------------------------------------------------------------------
//            if (!commands.isEmpty()) {
//                if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(3, commands))) {
//                    News.error("{}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
//                    continue;
//                }else {
//                    ledThread.setLedMk(false);
//                }
//            }

            try {
                // 修改主档led标记