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());