From 46f36461c2de26ee44a7a6d59418ac0d73b6845a Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Fri, 22 Dec 2023 09:44:46 +0800 Subject: [PATCH] =?UTF-8?q?rev=20=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../siemens_conveyor/SiemensConveyorDeviceDriver.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java index a6be999d2..f36a861d7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java @@ -257,6 +257,10 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme last_inst_message = inst_message; if ("true".equals(this.device.getExtraValue().get("ship_device_update"))) { this.requiresShipDeviceUpdate = false; + if(mode>0 ) + { + shipDeviceUpdate(); + } } } logServer.deviceItemValue(this.device_code, "move", String.valueOf(move)); @@ -430,12 +434,12 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme JSONObject param = new JSONObject() ; param.put("device_code", device_code); logServer.deviceExecuteLog(this.device_code, "", "", "有货变无货请求LMS,参数:" + param); + this.requiresShipDeviceUpdate = true; HttpResponse response = acsToWmsService.shipDeviceUpdate(param); if (response == null || response.getStatus() == 200) { logServer.deviceExecuteLog(this.device_code, "", "", "有货变无货请求LMS,接口返回:" + response.body()); } future.complete("Async operation completed"); - this.requiresShipDeviceUpdate = true; } catch (Exception e) { future.completeExceptionally(e); }