From d60a70483d2ad7d20bfb73ddb62c300496425ae3 Mon Sep 17 00:00:00 2001
From: xuzhiheng <2543137953@qq.com>
Date: Mon, 30 Jun 2025 18:21:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=86=E9=85=8D=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E6=9B=B4=E6=96=B0wms=E7=B3=BB=E7=BB=9F=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E8=BD=A6=E8=BE=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/opentcs/common/GuestUserCredentials.java     | 4 ++++
 .../strategies/basic/dispatching/TransportOrderUtil.java  | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/opentcs-common/src/main/java/org/opentcs/common/GuestUserCredentials.java b/opentcs-common/src/main/java/org/opentcs/common/GuestUserCredentials.java
index cdf25b5..bb3d2ea 100644
--- a/opentcs-common/src/main/java/org/opentcs/common/GuestUserCredentials.java
+++ b/opentcs-common/src/main/java/org/opentcs/common/GuestUserCredentials.java
@@ -23,4 +23,8 @@ public interface GuestUserCredentials {
    * 内核开放端口
    */
   Integer PORT = 1099;
+  /**
+   * WMS系统地址
+   */
+  String WMS_URL = "http://192.168.124.114:2004";
 }
diff --git a/opentcs-strategies-default/src/main/java/org/opentcs/strategies/basic/dispatching/TransportOrderUtil.java b/opentcs-strategies-default/src/main/java/org/opentcs/strategies/basic/dispatching/TransportOrderUtil.java
index 1e739bb..2b2c4b4 100644
--- a/opentcs-strategies-default/src/main/java/org/opentcs/strategies/basic/dispatching/TransportOrderUtil.java
+++ b/opentcs-strategies-default/src/main/java/org/opentcs/strategies/basic/dispatching/TransportOrderUtil.java
@@ -356,8 +356,12 @@ public class TransportOrderUtil
     // vehicle reports the remaining movements as finished.
     updateTransportOrderState(order.getReference(), TransportOrder.State.WITHDRAWN);
 
-    //撤销订单
-    ExecuteOperation.cancelOrder(vehicle.getName());
+    //撤销订单,获取订单状态
+    TransportOrder.State state = order.getState();
+    if (state == TransportOrder.State.BEING_PROCESSED) {
+      //订单执行中，需要撤销下发给控制器的任务
+//      ExecuteOperation.cancelOrder(vehicle.getName());
+    }
 
     VehicleController vehicleController
         = vehicleControllerPool.getVehicleController(vehicle.getName());