From d8c0f4088dd1619279f6f894766a28bb0ecfe0a4 Mon Sep 17 00:00:00 2001
From: pengmn <pmn@HanInfo>
Date: 星期五, 04 七月 2025 17:21:12 +0800
Subject: [PATCH] 1
---
HH.WCS.Mobox3.HangYang/api/WmsController.cs | 66 ++++++++++++++++++++++++++++++--
1 files changed, 61 insertions(+), 5 deletions(-)
diff --git a/HH.WCS.Mobox3.HangYang/api/WmsController.cs b/HH.WCS.Mobox3.HangYang/api/WmsController.cs
index 21f77d0..531e9e1 100644
--- a/HH.WCS.Mobox3.HangYang/api/WmsController.cs
+++ b/HH.WCS.Mobox3.HangYang/api/WmsController.cs
@@ -33,12 +33,12 @@
}
/// <summary>
- /// 鏉哀鍏ュ簱鍗曟柊澧炴帴鍙�+ /// 鏉哀鍏ュ簱鍗曟柊澧炰慨鏀规帴鍙� /// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public Result InboundOrder(InOrder model)
+ public Result GetInboundOrder(InOrder model)
{
LogHelper.Info("GetInboundOrder 鍙傛暟锛� + JsonConvert.SerializeObject(model), "WMSAPI");
var res = TaskProcess.GetInboundOrder(model);
@@ -47,12 +47,12 @@
}
/// <summary>
- /// 鏉哀鍑哄簱鍗曟柊澧炴帴鍙�+ /// 鏉哀鍑哄簱鍗曟柊澧炰慨鏀规帴鍙� /// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public Result OutboundOrder(OutOrder model)
+ public Result GetOutboundOrder(OutOrder model)
{
LogHelper.Info("OutOutboundOrder 鍙傛暟锛� + JsonConvert.SerializeObject(model), "WMSAPI");
var res = TaskProcess.GetOutboundOrder(model);
@@ -60,6 +60,34 @@
return res;
}
+ /// <summary>
+ /// 鏉哀鍏ュ簱鍗曞彇娑堟帴鍙�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public Result CancelInboundOrder(InOrderCancel model)
+ {
+ LogHelper.Info("CancelInboundOrder 鍙傛暟锛� + JsonConvert.SerializeObject(model), "WMSAPI");
+ var res = TaskProcess.CancelInboundOrder(model);
+ LogHelper.Info("CancelInboundOrder 杩斿洖锛� + JsonConvert.SerializeObject(res), "WMSAPI");
+ return res;
+ }
+
+
+ /// <summary>
+ /// 鏉哀鍑哄簱鍗曞彇娑堟帴鍙�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public Result CancelOutboundOrder(OutOrderCancel model)
+ {
+ LogHelper.Info("CancelOutboundOrder 鍙傛暟锛� + JsonConvert.SerializeObject(model), "WMSAPI");
+ var res = TaskProcess.CancelOutboundOrder(model);
+ LogHelper.Info("CancelOutboundOrder 杩斿洖锛� + JsonConvert.SerializeObject(res), "WMSAPI");
+ return res;
+ }
#region 涓婁笅娓稿鎺� /// <summary>
@@ -68,13 +96,41 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<Result> notifyDeviceSignal(List<Wcsmodel> model)
+ public async Task<WcsResult> notifyDeviceSignal(List<WcsModel> model)
{
LogHelper.Info("notifyDeviceSignal 鍙傛暟锛� + JsonConvert.SerializeObject(model), "WMSAPI");
var res = await TaskProcess.notifyDeviceSignal(model);
LogHelper.Info("notifyDeviceSignal 杩斿洖锛� + JsonConvert.SerializeObject(res), "WMSAPI");
return res;
}
+
+ /// <summary>
+ /// 鏉哀WCS璋冪敤浠诲姟鐘舵�鍙嶉
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<WcsResult> notifyTaskStatus(WcsTaskModel model)
+ {
+ LogHelper.Info("notifyTaskStatus 鍙傛暟锛� + JsonConvert.SerializeObject(model), "WMSAPI");
+ var res = await TaskProcess.notifyTaskStatus(model);
+ LogHelper.Info("notifyTaskStatus 杩斿洖锛� + JsonConvert.SerializeObject(res), "WMSAPI");
+ return res;
+ }
+
+ /// <summary>
+ /// 鏉哀WCS璋冪敤鐢宠缁堢偣
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<WcsResult> applyDest(WcsTaskEnd model)
+ {
+ LogHelper.Info("applyDest 鍙傛暟锛� + JsonConvert.SerializeObject(model), "WMSAPI");
+ var res = await TaskProcess.applyDest(model);
+ LogHelper.Info("applyDest 杩斿洖锛� + JsonConvert.SerializeObject(res), "WMSAPI");
+ return res;
+ }
#endregion
}
--
Gitblit v1.9.1