From fbb7c2253c86d58583d7e3b0a8a44d0342c43c73 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 25 七月 2025 17:20:52 +0800
Subject: [PATCH] 完善单容器多物料场景的优化重构, 优化ERP回报信息的处理
---
api/MoboxController.cs | 106 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 89 insertions(+), 17 deletions(-)
diff --git a/api/MoboxController.cs b/api/MoboxController.cs
index 51d084f..dba5ad7 100644
--- a/api/MoboxController.cs
+++ b/api/MoboxController.cs
@@ -1,5 +1,6 @@
锘縰sing System.Web.Http;
+using HH.WCS.Mobox3.AnGang.util;
using HH.WCS.Mobox3.AnGang.wms;
using Newtonsoft.Json;
@@ -13,18 +14,7 @@
/// </summary>
[RoutePrefix("api")]
public class MoboxController : ApiController {
- /// <summary>
- /// 璐у搧鍏ュ簱(PDA)
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost]
- [Route("Inbound")]
- public SimpleResult Inbound(InboundInfo model) {
- LogHelper.Info("瑙﹀彂API锛氫骇鍝佸叆搴�PDA)" + JsonConvert.SerializeObject(model), "API");
- return ApiHelper.Inbound(model);
- }
-
+
/// <summary>
/// 璐у搧鍏ュ簱-鎵嬪姩娣诲姞鏁版嵁
/// </summary>
@@ -33,8 +23,15 @@
[HttpPost]
[Route("InboundData")]
public SimpleResult InboundData(InboundDataInfo model) {
- LogHelper.Info("瑙﹀彂API锛氫骇鍝佸叆搴�鎵嬪姩娣诲姞鏁版嵁" + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛欼nboundData锛氫骇鍝佸叆搴� + JsonConvert.SerializeObject(model), "API");
return ApiHelper.InboundData(model);
+ }
+
+ [HttpPost]
+ [Route("AddCgDetail")]
+ public SimpleResult AddCgDetail(AddCgDetailInfo model) {
+ LogHelper.Info("瑙﹀彂API锛欰ddCgDetail: 娣诲姞瀹瑰櫒璐у搧鏄庣粏" + JsonConvert.SerializeObject(model), "API");
+ return ApiHelper.AddCgDetail(model).Result;
}
/// <summary>
@@ -45,7 +42,7 @@
[HttpPost]
[Route("PDAFullInArea")]
public SimpleResult SelectLocation(SelectLocationInfo model) {
- LogHelper.Info("瑙﹀彂API锛歅DA閫夋嫨缁堢偣璐т綅" + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛歅DAFullInArea锛歅DA閫夋嫨缁堢偣璐т綅" + JsonConvert.SerializeObject(model), "API");
return ApiHelper.SelectLocation(model);
}
@@ -57,7 +54,7 @@
[HttpPost]
[Route("PartOutbound")]
public SimpleResult PartOutbound(PartOutboundInfo model) {
- LogHelper.Info("瑙﹀彂API锛氫骇鍝侀儴鍒嗗嚭搴�WMS)" + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛歅artOutbound锛氫骇鍝侀儴鍒嗗嚭搴� + JsonConvert.SerializeObject(model), "API");
return ApiHelper.PartOutbound(model);
}
@@ -69,8 +66,32 @@
[HttpPost]
[Route("PartInbound")]
public SimpleResult PartInbound(PartInboundInfo model) {
- LogHelper.Info("瑙﹀彂API锛氫骇鍝侀儴鍒嗗洖搴�WMS)" + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛歅artInbound锛氫骇鍝侀儴鍒嗗洖搴� + JsonConvert.SerializeObject(model), "API");
return ApiHelper.PartInbound(model);
+ }
+
+ /// <summary>
+ /// 鎸囧畾璐т綅鍏ュ簱
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("InboundLoc")]
+ public SimpleResult InboundLoc(InboundLocInfo model) {
+ LogHelper.Info("瑙﹀彂API锛欼nboundLoc锛氭寚瀹氳揣浣嶅叆搴� + JsonConvert.SerializeObject(model), "API");
+ return ApiHelper.InboundLoc(model);
+ }
+
+ /// <summary>
+ /// 璐т綅瀹瑰櫒瑙ｇ粦
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("UnbindLoc")]
+ public SimpleResult UnbindLoc(UnbindLocInfo model) {
+ LogHelper.Info("瑙﹀彂API锛歎nbindLoc锛氳揣浣嶅鍣ㄨВ缁� + JsonConvert.SerializeObject(model), "API");
+ return ApiHelper.UnbindLoc(model);
}
/// <summary>
@@ -81,8 +102,59 @@
[HttpPost]
[Route("CancelTask")]
public SimpleResult CancelTask(CancelTaskInfo model) {
- LogHelper.Info("瑙﹀彂API锛氬彇娑堜换鍔� + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛欳ancelTask锛氬彇娑堜换鍔� + JsonConvert.SerializeObject(model), "API");
return ApiHelper.CancelTask(model);
}
+
+ // 鐩樼偣鍔熻兘锛堟柊锛�-----------------------------------
+
+ /// <summary>
+ /// 鐩樼偣鐞嗚揣鍑哄簱
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("CheckOutboundOnce")]
+ public SimpleResult CheckOutboundOnce(CheckOutboundOnceInfo model) {
+ LogHelper.Info("瑙﹀彂API锛欳heckOutboundOnce锛氱洏鐐圭悊璐у嚭搴� + JsonConvert.SerializeObject(model), "API");
+
+ return ApiHelper.CheckOutboundOnce(model);
+ }
+
+ /// <summary>
+ /// 鐩樼偣鐞嗚揣
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("CountProduct")]
+ public SimpleResult CountProduct(CountProductInfo model) {
+ LogHelper.Info("瑙﹀彂API锛欳ountProduct锛氱洏鐐圭悊璐� + JsonConvert.SerializeObject(model), "API");
+ return ApiHelper.CountProduct(model);
+ }
+
+ /// <summary>
+ /// 鐩樼偣鐞嗚揣鍑哄簱-澶囩敤
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("CheckOutbound")]
+ public SimpleResult CheckOutbound(CheckOutboundInfo model) {
+ LogHelper.Info("瑙﹀彂API锛欳heckOutbound锛氱洏鐐圭悊璐у嚭搴� + JsonConvert.SerializeObject(model), "API");
+ return ApiHelper.CheckOutbound(model);
+ }
+
+ /// <summary>
+ /// 鐩樼偣鐞嗚揣鍥炲簱-澶囩敤
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("CheckInbound")]
+ public SimpleResult CheckInbound(CheckInboundInfo model) {
+ LogHelper.Info("瑙﹀彂API锛欳heckInbound锛氱洏鐐圭悊璐у洖搴� + JsonConvert.SerializeObject(model), "API");
+ return ApiHelper.CheckInbound(model);
+ }
}
}
--
Gitblit v1.9.1