diff --git a/opentcs-commadapter-loopback/src/main/java/org/opentcs/virtualvehicle/LoopbackCommunicationAdapter.java b/opentcs-commadapter-loopback/src/main/java/org/opentcs/virtualvehicle/LoopbackCommunicationAdapter.java index f7597cd..e13f821 100644 --- a/opentcs-commadapter-loopback/src/main/java/org/opentcs/virtualvehicle/LoopbackCommunicationAdapter.java +++ b/opentcs-commadapter-loopback/src/main/java/org/opentcs/virtualvehicle/LoopbackCommunicationAdapter.java @@ -471,7 +471,7 @@ public class LoopbackCommunicationAdapter ACTION_STATUS = true; //下发动作 - ExecuteAction.sendCmd(getProcessModel().getName(), getProcessModel().getPosition(), command.getOperation(), getSerialNum()); + ExecuteAction.sendCmd(command.getTransportOrder().getName(), getProcessModel().getName(), getProcessModel().getPosition(), command.getOperation(), getSerialNum()); //进入阻塞 while (ACTION_STATUS) { @@ -871,6 +871,7 @@ public class LoopbackCommunicationAdapter */ private void handleActionStatus(AgvActionStatus agvActionStatus) { if (agvActionStatus.getStatus()) { +// System.out.println("handleActionStatus: ======"); ACTION_STATUS = false; } } diff --git a/opentcs-common/src/main/java/org/opentcs/communication/http/dto/kc/action/RequestAction.java b/opentcs-common/src/main/java/org/opentcs/communication/http/dto/kc/action/RequestAction.java index 20b08db..2544a0e 100644 --- a/opentcs-common/src/main/java/org/opentcs/communication/http/dto/kc/action/RequestAction.java +++ b/opentcs-common/src/main/java/org/opentcs/communication/http/dto/kc/action/RequestAction.java @@ -8,6 +8,10 @@ import lombok.Data; @Data public class RequestAction { + /** + * 订单名称 + */ + private String order_name; /** * 动作 */ diff --git a/opentcs-common/src/main/java/org/opentcs/communication/http/service/ExecuteAction.java b/opentcs-common/src/main/java/org/opentcs/communication/http/service/ExecuteAction.java index 255d101..d77b626 100644 --- a/opentcs-common/src/main/java/org/opentcs/communication/http/service/ExecuteAction.java +++ b/opentcs-common/src/main/java/org/opentcs/communication/http/service/ExecuteAction.java @@ -11,12 +11,13 @@ public class ExecuteAction extends BaseService { /** * 下发动作到平台 + * @param orderName 车辆名称 * @param vehicleName 车辆名称 * @param point 当前位置 * @param action 动作 * @param serialNum 序列号 */ - public static void sendCmd(String vehicleName, String point, String action, Integer serialNum) { + public static void sendCmd(String orderName, String vehicleName, String point, String action, Integer serialNum) { String url = getUrl(vehicleName); @@ -26,6 +27,7 @@ public class ExecuteAction extends BaseService { String time = now.format(formatter); RequestAction requestAction = new RequestAction(); + requestAction.setOrder_name(orderName); requestAction.setAction(action); requestAction.setPoint(point);