From 7267e82ccfbea0fa03e8bc809a2d5ac6f7da84ac Mon Sep 17 00:00:00 2001 From: kazelee <1847801760@qq.com> Date: 星期五, 20 六月 2025 15:33:36 +0800 Subject: [PATCH] 优化国自AGV和ERP下发的报文处理逻辑 --- api/MoboxController.cs | 109 ++++++++++++++++++++++++++++++++---------------------- 1 files changed, 65 insertions(+), 44 deletions(-) diff --git a/api/MoboxController.cs b/api/MoboxController.cs index 10bf84a..cae34ee 100644 --- a/api/MoboxController.cs +++ b/api/MoboxController.cs @@ -1,5 +1,7 @@ 锘縰sing System.Web.Http; +using HH.WCS.Mobox3.AnGang.wms; + using Newtonsoft.Json; using static HH.WCS.Mobox3.AnGang.api.ApiModel; @@ -29,7 +31,7 @@ /// <param name="model"></param> /// <returns></returns> [HttpPost] - [Route("SelectLocation")] + [Route("PDAFullInArea")] public SimpleResult SelectLocation(SelectLocationInfo model) { LogHelper.Info("瑙﹀彂API锛歅DA閫夋嫨缁堢偣璐т綅" + JsonConvert.SerializeObject(model), "API"); return ApiHelper.SelectLocation(model); @@ -60,56 +62,75 @@ } /// <summary> - /// 鍒涘缓鐩樼偣璁″垝鍗�WMS) + /// 鍙栨秷浠诲姟 /// </summary> /// <param name="model"></param> /// <returns></returns> [HttpPost] - [Route("CreateCountPlan")] - public SimpleResult CreateCountPlan(CreateCountPlanInfo model) { - LogHelper.Info("瑙﹀彂API锛氬垱寤虹洏鐐硅鍒掑崟(WMS)" + JsonConvert.SerializeObject(model), "API"); - return ApiHelper.CreateCountPlan(model); + [Route("CancelTask")] + public SimpleResult CancelTask(CancelTaskInfo model) { + LogHelper.Info("瑙﹀彂API锛氬彇娑堜换鍔� + JsonConvert.SerializeObject(model), "API"); + return ApiHelper.CancelTask(model); } - /// <summary> - /// 鍒涘缓鐩樼偣鍗�PDA) - /// </summary> - /// <param name="model"></param> - /// <returns></returns> - [HttpPost] - [Route("CreateCountOrder")] - public SimpleResult CreateCountOrder(CreateCountOrderInfo model) { - LogHelper.Info("瑙﹀彂API锛氬垱寤虹洏鐐瑰崟(PDA)" + JsonConvert.SerializeObject(model), "API"); - return ApiHelper.CreateCountOrder(model); - } - - public SimpleResult CountProduct(CountProductInfo model) { - LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐�PDA)" + JsonConvert.SerializeObject(model), "API"); - return ApiHelper.CountProduct(model); - } + ///// <summary> + ///// 鍒涘缓鐩樼偣璁″垝鍗�WMS) + ///// </summary> + ///// <param name="model"></param> + ///// <returns></returns> + //[HttpPost] + //[Route("CreateCountPlan")] + //public SimpleResult CreateCountPlan(CreateCountPlanInfo model) { + // LogHelper.Info("瑙﹀彂API锛氬垱寤虹洏鐐硅鍒掑崟(WMS)" + JsonConvert.SerializeObject(model), "API"); + // return ApiHelper.CreateCountPlan(model); + //} - /// <summary> - /// 鐩樼偣鐞嗚揣鍑哄簱(WMS) - /// </summary> - /// <param name="model"></param> - /// <returns></returns> - [HttpPost] - [Route("CheckOutbound")] - public SimpleResult CheckOutbound(CheckOutboundInfo model) { - LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у嚭搴�WMS)" + JsonConvert.SerializeObject(model), "API"); - return ApiHelper.CheckOutbound(model); - } + ///// <summary> + ///// 鍒涘缓鐩樼偣鍗�PDA) + ///// </summary> + ///// <param name="model"></param> + ///// <returns></returns> + //[HttpPost] + //[Route("CreateCountOrder")] + //public SimpleResult CreateCountOrder(CreateCountOrderInfo model) { + // LogHelper.Info("瑙﹀彂API锛氬垱寤虹洏鐐瑰崟(PDA)" + JsonConvert.SerializeObject(model), "API"); + // return ApiHelper.CreateCountOrder(model); + //} - /// <summary> - /// 鐩樼偣鐞嗚揣鍥炲簱(WMS) - /// </summary> - /// <param name="model"></param> - /// <returns></returns> - [HttpPost] - [Route("CheckInbound")] - public SimpleResult CheckInbound(CheckInboundInfo model) { - LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у洖搴�WMS)" + JsonConvert.SerializeObject(model), "API"); - return ApiHelper.CheckInbound(model); - } + ///// <summary> + ///// 鐩樼偣鐞嗚揣(PDA) + ///// </summary> + ///// <param name="model"></param> + ///// <returns></returns> + //[HttpPost] + //[Route("CountProduct")] + //public SimpleResult CountProduct(CountProductInfo model) { + // LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐�PDA)" + JsonConvert.SerializeObject(model), "API"); + // return ApiHelper.CountProduct(model); + //} + + ///// <summary> + ///// 鐩樼偣鐞嗚揣鍑哄簱(WMS) + ///// </summary> + ///// <param name="model"></param> + ///// <returns></returns> + //[HttpPost] + //[Route("CheckOutbound")] + //public SimpleResult CheckOutbound(CheckOutboundInfo model) { + // LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у嚭搴�WMS)" + JsonConvert.SerializeObject(model), "API"); + // return ApiHelper.CheckOutbound(model); + //} + + ///// <summary> + ///// 鐩樼偣鐞嗚揣鍥炲簱(WMS) + ///// </summary> + ///// <param name="model"></param> + ///// <returns></returns> + //[HttpPost] + //[Route("CheckInbound")] + //public SimpleResult CheckInbound(CheckInboundInfo model) { + // LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у洖搴�WMS)" + JsonConvert.SerializeObject(model), "API"); + // return ApiHelper.CheckInbound(model); + //} } } -- Gitblit v1.9.1