From 363b0a81b4aa766ceebc5431641d13892da1cced Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Wed, 19 Apr 2023 10:53:52 +0800 Subject: [PATCH] =?UTF-8?q?rev=20=E6=9B=B4=E6=96=B0=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardCoveyorControlWithScannerDeviceDriver.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 3b2de2d..dc9f965 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 @@ -136,6 +136,7 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe ScannerDeviceDriver scanner = this.getScanner(); scanner.cleanBarcode(); } + public synchronized boolean finish_instruction() throws Exception { instructionService.finish(inst); return true; @@ -361,10 +362,10 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe } else if (type == 3) { itemMap.put(to_task, command); log.info("设备:" + device_code + ",下发PLC信号" + to_task + ",value:" + command); - } else if (type == 4) { + } else if (type == 4) { itemMap.put(to_door, command); log.info("设备:" + device_code + ",下发PLC信号" + to_task + ",value:" + command); - } else if (type == 5) { + } else if (type == 5) { itemMap.put(to_floor, command); log.info("设备:" + device_code + ",下发PLC信号" + to_task + ",value:" + command); } @@ -566,6 +567,7 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe } else { if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { message = "申请任务中..."; + logServer.deviceExecuteLog(device_code, "", "", "开始申请任务...条码信息:" + container_code); JSONObject apply = new JSONObject(); apply.put("type", "6"); apply.put("vehicle_code", container_code);