#

Junjie

2023-12-12 a01af25e1b22558174014839581de144d683ad10

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

@@ -409,10 +409,6 @@
            for (DevpSlave devp : slaveProperties.getDevp()) {
                // 遍历拣料入库口
                for (DevpSlave.Sta pickSta : devp.getPickInSta()) {
                    if (pickSta.getStaNo() == 325 || pickSta.getStaNo() == 331 || pickSta.getStaNo() == 333 || pickSta.getStaNo() == 339) {
                        continue;
                    }

                    // 获取拣料入库站信息
                    DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                    StaProtocol staProtocol = devpThread.getStation().get(pickSta.getStaNo());
@@ -679,30 +675,19 @@
//                            && (staProtocol.getWorkNo() > 0)
                            && staProtocol.isPakMk()) {

                        WrkMast wrkMast = null;
                        if (pickSta.getStaNo() == 325 || pickSta.getStaNo() == 331 || pickSta.getStaNo() == 333 || pickSta.getStaNo() == 339) {
                            if (staProtocol.getWorkNo() == 0) {
                                continue;
                            }
                            //根据工作号搜索工作档
                            wrkMast = wrkMastMapper.selectByWorkNo(staProtocol.getWorkNo().intValue());
                        }else {
                            //根据托盘码搜索工作档
                            // 获取条码扫描仪信息
                            BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
                            if (barcodeThread == null) {
                                continue;
                            }
                            String barcode = barcodeThread.getBarcode();
                            if (Cools.isEmpty(barcode)) {
                                continue;
                            }
                            if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) {
                                continue;
                            }
                            wrkMast = wrkMastMapper.selectByBarcode(barcode);
                        // 获取条码扫描仪信息
                        BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
                        if (barcodeThread == null) {
                            continue;
                        }

                        String barcode = barcodeThread.getBarcode();
                        if (Cools.isEmpty(barcode)) {
                            continue;
                        }
                        if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) {
                            continue;
                        }
                        WrkMast wrkMast = wrkMastMapper.selectByBarcode(barcode);
                        if (wrkMast == null) {//找不到工作档
                            continue;
                        }
@@ -1335,7 +1320,7 @@
            if (wrkMast.getStaNo() == 300) {
                //出300站，检测300站任务数量
                List<WrkMast> wrkMasts = wrkMastMapper.select300Wrk();
                if (wrkMasts.size() >= 4) {
                if (wrkMasts.size() >= 20) {
                    News.info("{}任务，输送线任务过载{}", wrkMast.getWrkNo(), wrkMasts.size());
                    return false;
                }