#

whycq

2023-02-24 3a69206f92a89fa7454c5f21a769ac594d99c023

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

@@ -108,14 +108,16 @@
                }
                String barcode = barcodeThread.getBarcode();



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

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