From 64430567571df58cd36c80065b4cc619be160ca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=97=AD=E6=98=8E=5C73939?= <739390650@QQ.COM> Date: Mon, 26 Jan 2026 10:24:06 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E7=94=B3=E8=AF=B7=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=97=B4=E9=9A=94=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConveyorWithScannerWeightDeviceDriver.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java index e7a3cb59e..866111267 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java @@ -178,6 +178,9 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv private Date require_apply_zjrk_time = new Date(); //退货入库申请时间 private Date require_apply_thrk_time = new Date(); + //入库申请时间 + private Date require_apply_in_time = new Date(); + private int instruction_update_time_out = 1000; Integer heartbeat_tag; private Date instruction_require_time = new Date(); @@ -187,6 +190,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv private int require_apply_tprk_time_out = 4000; private int require_apply_zjrk_time_out = 4000; private int require_apply_thrk_time_out = 4000; + private int require_apply_in_time_out = 4000; //行架机械手申请任务成功标识 boolean requireSucess = false; @@ -694,6 +698,12 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv } private void applyIn(String type, int mode) { + Date date = new Date(); + if (date.getTime() - this.require_apply_in_time.getTime() + < (long) this.require_apply_in_time_out) { + log.trace("触发时间因为小于{}毫秒，而被无视", this.require_apply_in_time_out); + return; + } try { JSONObject param = new JSONObject(); param.put("device_code", device_code);