From eaefefa5c4cf5ce403ce5f0dcf09a5ad21837e43 Mon Sep 17 00:00:00 2001 From: zxx <Zxx@HanInfo> Date: 星期一, 07 七月 2025 17:34:44 +0800 Subject: [PATCH] 1 --- HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/AgvController.cs | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/AgvController.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/AgvController.cs index 4973025..54cd220 100644 --- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/AgvController.cs +++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/AgvController.cs @@ -21,7 +21,6 @@ /// <param name="model"></param> /// <returns></returns> [HttpPost] - //[Route("AGVCallbackState")] public ReturnResult AGVCallbackState(AgvTaskState model) { LogHelper.Info("AGVCallbackState Request锛� + JsonConvert.SerializeObject(model), "HosttoagvTask"); WCSCore.OperateAgvTaskStatus(model); @@ -34,7 +33,6 @@ /// <param name="model"></param> /// <returns></returns> [HttpPost] - //[Route("AGVCallbackEvent")] public ReturnResult AGVCallbackEvent(AgvEventInfo model) { LogHelper.Info("AGVCallbackEvent Request锛� + JsonConvert.SerializeObject(model), "HosttoagvTask"); return new ReturnResult(); @@ -45,13 +43,10 @@ /// <param name="models"></param> /// <returns></returns> [HttpPost] - //[Route("AGVDeviceReceive")] public ReturnResult AGVDeviceReceive(List<AgvDeviceStatus> models) { LogHelper.Info("AGVDeviceReceive Request锛� + JsonConvert.SerializeObject(models), "HosttoagvCar"); return new ReturnResult(); } - - /// <summary> /// 鍥借嚜浠诲姟鐘舵�鍥炴姤 @@ -59,13 +54,39 @@ /// <param name="model"></param> /// <returns></returns> [HttpPost] - //[Route("AGVDeviceReceive")] public GzResult orderStatusReport(orderStatusReportParme model) { LogHelper.Info("orderStatusReport 鍙傛暟锛� + JsonConvert.SerializeObject(model), "API"); return GZRobot.orderStatusReport(model); } - + /// <summary> + /// 鐢宠鏄惁缁曡矾 + /// </summary> + /// <param name="model"></param> + /// <returns></returns> + [HttpPost] + public GzResult applyReroute(orderReroute model) + { + LogHelper.Info("applyReroute 鍙傛暟锛� + JsonConvert.SerializeObject(model), "API"); + var apply = GZRobot.applyReroute(model); + LogHelper.Info("applyReroute 杩斿洖鍙傛暟锛� + JsonConvert.SerializeObject(apply), "API"); + return apply; + } + + /// <summary> + /// 浜ょ鐢宠 + /// </summary> + /// <param name="model"></param> + /// <returns></returns> + [HttpPost] + public GzResult agvTraffic(orderTraffic model) + { + LogHelper.Info("agvTraffic 鍙傛暟锛� + JsonConvert.SerializeObject(model), "API"); + var traffic = GZRobot.agvTraffic(model); + LogHelper.Info("agvTraffic 杩斿洖鍙傛暟锛� + JsonConvert.SerializeObject(traffic), "API"); + + return traffic; + } } } -- Gitblit v1.9.1