From f8d23dcf8d6501482db1a5180325194232afe96c Mon Sep 17 00:00:00 2001 From: kazelee <1847801760@qq.com> Date: 星期五, 18 七月 2025 17:30:09 +0800 Subject: [PATCH] 封装部分业务代码,继续优化日志打印流程 --- api/MoboxController.cs | 141 ++++++---------------------------------------- 1 files changed, 20 insertions(+), 121 deletions(-) diff --git a/api/MoboxController.cs b/api/MoboxController.cs index ac5f2e8..059da11 100644 --- a/api/MoboxController.cs +++ b/api/MoboxController.cs @@ -9,55 +9,31 @@ namespace HH.WCS.Mobox3.DSZSH.api { /// <summary> - /// Mobox3 璋冪敤锛岃剼鏈腑璋冪敤锛堝寘鎷�PDA 鐨勬帴鍙o級 + /// Mobox / PDA 鎺ュ彛 /// </summary> [RoutePrefix("api")] public class MoboxController : ApiController { /// <summary> - /// 濂借繍绠�婊℃墭涓嬬嚎鍏ュ簱(PDA) + /// 婊$涓嬬嚎鍏ュ簱 /// </summary> /// <param name="model"></param> /// <returns></returns> [HttpPost] [Route("goodpack-offline")] public SimpleResult GoodpackOffline(GoodpackOfflineInfo model) { - var apiName = "濂借繍绠�婊℃墭涓嬬嚎鍏ュ簱(PDA)"; - LogHelper.InfoApi(apiName, model); - + LogHelper.InfoApi("婊$涓嬬嚎鍏ュ簱", model); return ApiHelper.GoodpackOffline(model); } - ///// <summary> - ///// 绌烘墭/绌虹鍏ュ簱缁戝畾(PDA) - ///// </summary> - ///// <param name="model"></param> - ///// <returns></returns> - //public SimpleResult EmptyBind(EmptyBindInfo model) { - // LogHelper.InfoApi("绌烘墭/绌虹缁戝畾", model); - - // if (model.CntrType == "鎵樼洏") { - // //LogHelper.Info($"瑙﹀彂API锛氱┖鎵樼粦瀹�" + JsonConvert.SerializeObject(model), "API"); - // return ApiHelper.EmptyBindPallet(model); - // } - // else if (model.CntrType == "濂借繍绠�) { - // //LogHelper.Info($"瑙﹀彂API锛氱┖绠辩粦瀹�" + JsonConvert.SerializeObject(model), "API"); - // return ApiHelper.EmptyBindGoodpack(model); - // } - // else { - // return BuildSimpleResult(-1, $"涓嶅悎娉曠殑瀹瑰櫒绫诲瀷锛�{model.CntrType}'"); - // } - //} - /// <summary> - /// 绌烘墭/绌虹鍏ュ簱(PDA) + /// 绌烘墭/绌虹鍏ュ簱 /// </summary> /// <param name="model"></param> /// <returns></returns> [HttpPost] [Route("empty-inbound")] public SimpleResult EmptyInbound(EmptyInboundInfo model) { - var apiName = "绌烘墭/绌虹鍏ュ簱"; - LogHelper.InfoApi(apiName, model); + LogHelper.InfoApi("绌烘墭/绌虹鍏ュ簱", model); if (model.CntrType == "绌烘墭鐩�) { return ApiHelper.EmptyInboundPallet(model); @@ -65,134 +41,78 @@ else if (model.CntrType == "绌哄ソ杩愮") { return ApiHelper.EmptyInboundGoodpack(model); } - else { - return NewSimpleResult(-1, $"瀹瑰櫒绫诲瀷 '{model.CntrType}' 涓嶅悎娉曪細搴斾负 '绌烘墭鐩� 鎴�'绌哄ソ杩愮'"); + else { // PDA鍓嶇涓嬫媺閫夊崟闄愬埗,鏁呯悊璁轰笂涓嶄細杩涘叆杩欎釜娴佺▼ + return NewSimpleResult(-1, $"瀹瑰櫒绫诲瀷'{model.CntrType}'涓嶅悎娉�瑕佹眰:绫诲瀷=['绌烘墭鐩�,'绌哄ソ杩愮']"); } } - - ///// <summary> - ///// 绌烘墭/绌虹涓婄嚎(PDA) - ///// </summary> - ///// <returns> - ///// 浜哄伐浣跨敤PDA鎵爜锛屾牴鎹墿鏂欑被鍨嬪垽鏂笂绾跨┖鎵�绌虹 - ///// </returns> - //public SimpleResult EmptyOnline(EmptyOnlineInfo model) { - // var db = DbHelper.GetDbClient(); - // var locCntrRel = db.Queryable<TN_Loc_Container>() - // .LeftJoin<TN_CG_Detail>((lc, cd) => lc.S_CNTR_CODE == cd.S_CNTR_CODE) - // .Where((lc, cd) => cd.S_ITEM_CODE == model.ItemCode) - // .First(); - - // if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") { - - // return ApiHelper.EmptyOnlinePallet(new EmptyOnlinePalletInfo { - // CntId = locCntrRel.S_CNTR_CODE, - // EndLoc = model.EndLoc - // }); - // } - // else if (locCntrRel.S_CNTR_TYPE == "濂借繍绠�) { - - // return ApiHelper.EmptyOnlineGoodpack(new EmptyOnlineGoodpackInfo { - // CntId = locCntrRel.S_CNTR_CODE, - // EndLoc = model.EndLoc - // }); - // } - // else { - // return BuildSimpleResult(-1, $"涓嶅悎娉曠殑瀹瑰櫒绫诲瀷锛�{locCntrRel.S_CNTR_CODE}'"); - // } - //} - + /// <summary> - /// 鎵樼洏-绌烘墭涓婄嚎(PDA) + /// 绌烘墭涓婄嚎 /// </summary> /// <param name="model"></param> /// <returns></returns> [HttpPost] [Route("empty-online-pallet")] public SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) { - var apiName = "鎵樼洏-绌烘墭涓婄嚎(PDA)"; - LogHelper.InfoApi(apiName, model); + LogHelper.InfoApi("绌烘墭涓婄嚎", model); return ApiHelper.EmptyOnlinePallet(model); } /// <summary> - /// 濂借繍绠�绌虹涓婄嚎(PDA) + /// 绌虹涓婄嚎 /// </summary> /// <param name="model"></param> /// <returns></returns> [HttpPost] [Route("empty-online-goodpack")] public SimpleResult EmptyOnlineGoodpack(EmptyOnlineGoodpackInfo model) { - var apiName = "濂借繍绠�绌虹涓婄嚎(PDA)"; - LogHelper.InfoApi(apiName, model); + LogHelper.InfoApi("绌虹涓婄嚎", model); return ApiHelper.EmptyOnlineGoodpack(model); } - ///// <summary> - ///// 鍚堟牸鍥炲簱/涓嶅悎鏍肩Щ搴�- ///// </summary> - ///// <param name="model"></param> - ///// <returns></returns> - //[HttpPost] - //[Route("CheckShift")] - //public SimpleResult CheckShift(CheckShiftInfo model) { - // LogHelper.InfoApi("鍚堟牸鍥炲簱/涓嶅悎鏍肩Щ搴�, model); - - // if (model.Qualified) { - // return ApiHelper.QualifiedBack(model); - // } - // else { - // return ApiHelper.UnqualifiedShift(model); - // } - //} - /// <summary> - /// 鍚堟牸鍥炲簱(PDA) + /// 鍚堟牸鍥炲簱 /// </summary> /// <returns></returns> [HttpPost] [Route("qualified-back")] public SimpleResult QualifiedBack(QualifiedBackInfo model) { - var apiName = "鍚堟牸鍥炲簱(PDA)"; - LogHelper.InfoApi(apiName, model); + LogHelper.InfoApi("鍚堟牸鍥炲簱", model); return ApiHelper.QualifiedBack(model); } /// <summary> - /// 涓嶅悎鏍肩Щ搴�PDA) + /// 涓嶅悎鏍肩Щ搴� /// </summary> /// <returns></returns> [HttpPost] [Route("unqualified-shift")] public SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) { - var apiName = "涓嶅悎鏍肩Щ搴�PDA)"; - LogHelper.InfoApi(apiName, model); + LogHelper.InfoApi("涓嶅悎鏍肩Щ搴�, model); return ApiHelper.UnqualifiedShift(model); } /// <summary> - /// 浣欐枡灏剧鍥炲簱(PDA) + /// 浣欐枡灏剧鍥炲簱 /// </summary> /// <param name="model"></param> /// <returns></returns> [HttpPost] [Route("rest-back")] public SimpleResult RestBack(RestBackInfo model) { - var apiName = "浣欐枡灏剧鍥炲簱(PDA)"; - LogHelper.InfoApi(apiName, model); + LogHelper.InfoApi("浣欐枡灏剧鍥炲簱", model); return ApiHelper.RestBack(model); } /// <summary> - /// 鎴愬搧鑳跺嚭搴�PDA) + /// 鎴愬搧鑳跺嚭搴� /// </summary> /// <param name="model"></param> /// <returns></returns> [HttpPost] [Route("finished-outbound")] public SimpleResult FinishedOutbound(FinishedOutboundInfo model) { - var apiName = "鎴愬搧鑳跺嚭搴�PDA)"; - LogHelper.InfoApi(apiName, model); + LogHelper.InfoApi("鎴愬搧鑳跺嚭搴�, model); if (model.ForcedOut) { return ApiHelper.FinishedOutboundForce(model); @@ -202,26 +122,5 @@ } } - ///// <summary> - ///// 鎶芥-鍒涘缓鎶芥鍗�WMS) - ///// </summary> - ///// <param name="model"></param> - ///// <returns></returns> - //[HttpPost] - //[Route("create-check-order")] - //public SimpleResult CreateCheckOrder(CreateCheckOrderInfo model) { - // return ApiHelper.CreateCheckOrder(model); - //} - - ///// <summary> - ///// 绉诲簱-鍒涘缓绉诲簱浠诲姟(WMS) - ///// </summary> - ///// <param name="model"></param> - ///// <returns></returns> - //[HttpPost] - //[Route("shift-storage")] - //public SimpleResult CreateShiftOrder(CreateShiftOrderInfo model) { - // return ApiHelper.CreateShiftOrder(model); - //} } } -- Gitblit v1.9.1