From 00aaf49a223be04fc58f6f7c09d95ce4b22ef087 Mon Sep 17 00:00:00 2001 From: kazelee <1847801760@qq.com> Date: 星期五, 11 七月 2025 17:06:18 +0800 Subject: [PATCH] 修复盘点计划单、盘点单的状态更改逻辑 --- api/MoboxController.cs | 92 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 68 insertions(+), 24 deletions(-) diff --git a/api/MoboxController.cs b/api/MoboxController.cs index 153da7a..3591f09 100644 --- a/api/MoboxController.cs +++ b/api/MoboxController.cs @@ -1,5 +1,8 @@ 锘縰sing System.Web.Http; +using HH.WCS.Mobox3.AnGang.util; +using HH.WCS.Mobox3.AnGang.wms; + using Newtonsoft.Json; using static HH.WCS.Mobox3.AnGang.api.ApiModel; @@ -24,19 +27,31 @@ } /// <summary> + /// 璐у搧鍏ュ簱-鎵嬪姩娣诲姞鏁版嵁 + /// </summary> + /// <param name="model"></param> + /// <returns></returns> + [HttpPost] + [Route("InboundData")] + public SimpleResult InboundData(InboundDataInfo model) { + LogHelper.Info("瑙﹀彂API锛氫骇鍝佸叆搴�鎵嬪姩娣诲姞鏁版嵁" + JsonConvert.SerializeObject(model), "API"); + return ApiHelper.InboundData(model); + } + + /// <summary> /// PDA閫夋嫨缁堢偣璐т綅 /// </summary> /// <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); } /// <summary> - /// 浜у搧閮ㄥ垎鍑哄簱(WMS) + /// 浜у搧閮ㄥ垎鍑哄簱 /// </summary> /// <param name="model"></param> /// <returns></returns> @@ -48,7 +63,7 @@ } /// <summary> - /// 浜у搧閮ㄥ垎鍥炲簱(WMS) + /// 浜у搧閮ㄥ垎鍥炲簱 /// </summary> /// <param name="model"></param> /// <returns></returns> @@ -60,28 +75,57 @@ } /// <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) + /// 鐩樼偣鐞嗚揣鍑哄簱(WMS) /// </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); + [Route("CheckOutboundOnce")] + public SimpleResult CheckOutboundOnce(CheckOutboundOnceInfo model) { + LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у嚭搴�WMS)" + JsonConvert.SerializeObject(model), "API"); + + return ApiHelper.CheckOutboundOnce(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> + ///// 鍒涘缓鐩樼偣鍗�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> /// 鐩樼偣鐞嗚揣(PDA) @@ -95,17 +139,17 @@ 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("CheckOutbound")] + public SimpleResult CheckOutbound(CheckOutboundInfo model) { + LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у嚭搴�WMS)" + JsonConvert.SerializeObject(model), "API"); + return ApiHelper.CheckOutbound(model); + } /// <summary> /// 鐩樼偣鐞嗚揣鍥炲簱(WMS) -- Gitblit v1.9.1