#

zjj

2024-01-05 8e7c727183f83bb734238e97b64a11ba5588c9c1

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

@@ -118,7 +118,7 @@
                String barcode = barcodeThread.getBarcode();
                //9998退回，9996空板
                if (!Cools.isEmpty(barcode) && (staProtocol.getWorkNo() != 9998 || staProtocol.getWorkNo() != 9996)) {
                    log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
//                    log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
                    if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
                        String errorMsg = "15站扫码失败，已退回14站";
                        staProtocol.setWorkNo((short) 9998);
@@ -380,7 +380,7 @@
                String barcode = barcodeThread.getBarcode();

                if (!Cools.isEmpty(barcode) && (staProtocol.getWorkNo() != 9998 || staProtocol.getWorkNo() != 9996)) {
                    log.info("{}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
//                    log.info("{}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
                    if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
                        staProtocol.setWorkNo((short) 9998);
                        staProtocol.setStaNo((short) 14);
@@ -708,7 +708,14 @@
            }

            WrkMast wrkMast1 = wrkMastMapper.selectPakInStep2(slave.getId(), staProtocol.getWorkNo().intValue(), crnStn.getStaNo());
            if(null == wrkMast1) {
//                log.error("查询无待入库数据--wrk_sts=2, 工作号={}", staProtocol.getWorkNo());
                continue;
            }
            wrkNos.add(wrkMast1.getWrkNo());
        }
        if (Cools.isEmpty(wrkNos)){
            return;
        }

        List<WrkMast> wrkMasts=wrkMastService.selectWaitPakIn(wrkNos);
@@ -1684,7 +1691,6 @@
                        && staProtocol.isLoading()
                        && staProtocol.isInEnable()
                        && staProtocol.isEmptyMk()
                        && (staProtocol.getWorkNo() == 9996)
                        && staProtocol.isPakMk()) {

                    try {