#
luxiaotao1123
2021-08-02 c2927a5c32e19f8f860b81438fcb3a37c8e462a9
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -100,6 +100,9 @@
            for (DevpSlave.Sta inSta : devp.getInSta()) {
                // 获取条码扫描仪信息
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
                if (barcodeThread == null) {
                    continue;
                }
                String barcode = barcodeThread.getBarcode();
                if(!Cools.isEmpty(barcode)) {
                    log.info("{}号条码扫描器检测条码信息:{}", inSta.getBarcode(), barcode);
@@ -224,7 +227,7 @@
                    staProtocol = staProtocol.clone();
                }
                // 判断是否满足入库条件
                if (staProtocol.isAutoing() && staProtocol.isLoading()
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
                        && !staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() == 9999)
                        && staProtocol.isPakMk()) {
                    // 判断重复工作档
@@ -459,6 +462,9 @@
                    }
                }
            }
            try {
                Thread.sleep(1500L);
            } catch (InterruptedException ignore) {}
            // 库位移转
            this.locToLoc(crn, crnProtocol);
        }