From ae0c9d3eaa416147007f433fef28f099937eceb2 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期五, 13 九月 2024 14:41:28 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 677d052..3e6cddc 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -4015,17 +4015,17 @@ } else { staProtocol = staProtocol.clone(); } - String barcode = staProtocol.getBarcode(); - if (!Cools.isEmpty(barcode)) { -// log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode); - if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || !CodeDetectionUtil.barcodeDetection(barcode)) { - continue; - } - } else { - continue; - } if (emptyInSta.getStaNo()==607 && staProtocol.getStaNo()==607 && staProtocol.getWorkNo()==0 && staProtocol.isLoading() && staProtocol.isAutoing() && staProtocol.isInEnable()){ + String barcode = staProtocol.getBarcode(); + if (!Cools.isEmpty(barcode)) { +// log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode); + if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || !CodeDetectionUtil.barcodeDetection(barcode)) { + continue; + } + } else { + continue; + } try { BasDevp basDevp = basDevpService.selectById(staProtocol.getStaNo()); if (basDevp.getReportSign()==0){ @@ -4069,8 +4069,7 @@ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); } return; - } - + } else // 绔欑偣鏉′欢鍒ゆ柇 if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isEmptyMk() && ((staProtocol.getWorkNo() > 32222 && staProtocol.getWorkNo() <= 63333) || staProtocol.getWorkNo()==0) && staProtocol.isPakMk()) { -- Gitblit v1.9.1