#
luxiaotao1123
2021-01-25 64758a57264af5c863409ba2a9fa7c988c9e3e56
#
2个文件已修改
16 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/BarcodeThread.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -101,8 +101,12 @@
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
                String barcode = barcodeThread.getBarcode();
                if(!Cools.isEmpty(barcode)) {
                    System.err.println(barcode);
                    log.info("{}号条码扫描器检测条码信息:{}", inSta.getBarcode(), barcode);
                    if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
                        continue;
                    }
                }
                // 获取入库站信息
                DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -130,16 +130,6 @@
        return true;
    }
    public String getBarcode() {
        if (Cools.isEmpty(barcode)) {
            return null;
        } else if("NG".endsWith(barcode)) {
            return null;
        } else  {
            return barcode.trim();
        }
    }
    public static void main(String[] args) throws Exception {
        BarcodeThread barcodeThread = new BarcodeThread(new Slave());
        barcodeThread.getSlave().setIp("192.168.2.150");