From cbebb0417578984346ef413f85e04e424546279a Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Mon, 25 Dec 2023 11:15:15 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E8=A7=A3=E5=86=B3=E5=BC=82?=
 =?UTF-8?q?=E6=AD=A5=E5=A4=9A=E6=AC=A1=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../siemens_conveyor/SiemensConveyorDeviceDriver.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 63186fb96..cde80ebcf 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
@@ -433,7 +433,6 @@ 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());
@@ -443,6 +442,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
                 future.completeExceptionally(e);
             }
         });
+        this.requiresShipDeviceUpdate = true;
     }
 
     public void sendDeviceStatus(JSONObject param) {
@@ -452,11 +452,11 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
             try {
                 acsToWmsService.sendDeviceStatus(param);
                 future.complete("Async operation completed");
-                this.requiresShipDeviceUpdate = true;
             } catch (Exception e) {
                 future.completeExceptionally(e);
             }
         });
+        this.requiresShipDeviceUpdate = true;
     }
 
     private void taskDeviceUpdate(int task) {