#

whycq

2023-02-19 38af05d7c80936abcdfa81b8209666a68f73276b

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

@@ -101,10 +101,27 @@
            for (DevpSlave.Sta inSta : devp.getInSta()) {
                // 获取条码扫描仪信息
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());

                if (barcodeThread == null) {
                    continue;
                }
                String barcode = barcodeThread.getBarcode();

                //101站有3个扫码器，当0扫码器没有数据时，获取9、10两个扫码器数据
                if(inSta.getStaNo().equals(101) && !Cools.isEmpty(barcode)){
                    BarcodeThread barcodeThread1 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode1());
                    if (barcodeThread1 != null) {
                        barcode = barcodeThread1.getBarcode();
                    }

                    if(!Cools.isEmpty(barcode)) {
                        BarcodeThread barcodeThread2 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode2());
                        if (barcodeThread2 != null) {
                            barcode = barcodeThread2.getBarcode();
                        }
                    }
                }

                if (!Cools.isEmpty(barcode)) {
                    log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
                    if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
@@ -1314,7 +1331,8 @@

                // 站点条件判断
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
                        && staProtocol.isEmptyMk() && (staProtocol.getWorkNo() > 9990 && staProtocol.getWorkNo() <= 9999) && staProtocol.isPakMk()) {
                        && staProtocol.isEmptyMk() && (staProtocol.getWorkNo() > 9990
                        && staProtocol.getWorkNo() <= 9999) && staProtocol.isPakMk()) {

                    try {
                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);