From c4e968254a4f1c5d538a9fd91284b4843ea08198 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 23 五月 2025 10:44:58 +0800
Subject: [PATCH] 内部联调，修复问题，添加取消任务功能
---
api/MoboxController.cs | 92 ++++++++++++++++++++++++++-------------------
1 files changed, 53 insertions(+), 39 deletions(-)
diff --git a/api/MoboxController.cs b/api/MoboxController.cs
index 153da7a..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,40 +62,52 @@
}
/// <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);
- }
+ ///// <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("CountProduct")]
- public SimpleResult CountProduct(CountProductInfo model) {
- LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐�PDA)" + JsonConvert.SerializeObject(model), "API");
- return ApiHelper.CountProduct(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)
+ ///// </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)
@@ -107,16 +121,16 @@
// 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);
- }
+ ///// <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