diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java index 88a2064..b5941cc 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java @@ -253,14 +253,16 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe log.debug("设备运转模式:等待工作"); break; case 2: - if (!requireSucess){ + if (!requireSucess && StrUtil.isNotEmpty(barcode())) { logServer.deviceExecuteLog(this.device_code, "", "", "扫码器扫到的条码为:" + barcode()); } //申请任务 - if (!StrUtil.isEmpty(barcode()) && !requireSucess) { + if (!StrUtil.isEmpty(barcode()) && !StrUtil.equals(barcode(), "NoRead") && !requireSucess) { + logServer.deviceExecuteLog(this.device_code, "", "", "开始申请任务~~~~~~"); instruction_require(barcode()); + logServer.deviceExecuteLog(this.device_code, "", "", "申请任务成功~~~~~~"); } - if (!StrUtil.isEmpty(barcode()) && !applySucess) { + if (!StrUtil.isEmpty(barcode()) && !StrUtil.equals(barcode(), "NoRead") && !applySucess) { instruction_apply(barcode()); } }