#

lsh

2024-04-28 1556791461f9ae5c4a1d76ace57b44f10522f92b

 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);
@@ -193,9 +193,7 @@
                    String barcode = barcodeThread.getBarcode();
                    if(!Cools.isEmpty(barcode)) {
                        News.info(""+mark+" - 1"+" - {}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
                        if(staProtocol.getStamp()<2){
                            continue;
                        }

                        if("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) {
                            staProtocol.setWorkNo((short) 9999);
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
@@ -211,9 +209,6 @@
                            continue;
                        }
                    } else {
                        if(staProtocol.getStamp()<2){
                            continue;
                        }
                        staProtocol.setWorkNo((short) 9999);
                        staProtocol.setStaNo(inSta.getBackSta().shortValue());
                        devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -492,7 +487,7 @@
                        wrkMast.setIoTime(now);
                        wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
                        wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
                        wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 源站
                        wrkMast.setSourceStaNo(100); // 源站
                        wrkMast.setStaNo(staNo); // 目标站
                        wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 目标库位 = 出库时的源库位
                        wrkMast.setSourceLocNo(""); // 源库位清空
@@ -1674,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() == 3) {
                    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标记