From 98343f1d89b8821a765862d0dbf2f35d78f18326 Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Tue, 25 Feb 2025 16:39:41 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E9=99=90=E5=88=B6=E5=90=91lms=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=91=BC=E5=8F=AB=E7=A9=BA=E6=89=98=E7=9B=98=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../conveyor/belt_conveyor/BeltConveyorDeviceDriver.java | 4 +++- .../org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java index 36cf8e28a..f0aafc0a1 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java @@ -97,6 +97,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements private Date instruction_finished_time = new Date(); private Date instruction_apply_time = new Date(); private int instruction_require_time_out = 3000; + private int require_apply_strangulation_time_out = 4000; String notCreateInstMessage = ""; @@ -436,10 +437,11 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements private void applyEmptyTask(String type, int mode) { Date date = new Date(); if (date.getTime() - this.require_apply_strangulation_time.getTime() - < (long) this.instruction_require_time_out) { + < (long) this.require_apply_strangulation_time_out) { log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); return; } else { + this.require_apply_strangulation_time = date; try { JSONObject param = new JSONObject(); param.put("device_code", device_code); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index 5b411ecbf..ee4392e9c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -186,7 +186,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { log.info("applyTwo-----输出参数{}", result2.body()); LuceneLogDto luceneLogDto = new LuceneLogDto(4, "applyTwo", String.valueOf(result2.getStatus()), JSON.toJSONString(param), String.valueOf(result2.body()), "ACS向LMS申请" - + ("1".equals(param.getString("type")) ? "子卷装箱入库任务" : "2".equals(param.getString("type")) ? "空盘入库" : "5".equals(param.getString("type")) ? "木箱入库" : + + ("1".equals(param.getString("type")) ? "子卷装箱入库任务" : "2".equals(param.getString("type")) ? "空盘入库" : "3".equals(param.getString("type")) ? "空盘出库" : "5".equals(param.getString("type")) ? "木箱入库" : "6".equals(param.getString("type")) ? "退货入库" : "异常处理位")); luceneLogService.interfaceExecuteLog(luceneLogDto); return result2;