From e7864a4dcecba72ccbb06dfb6a3d4a77c65f2a3c Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期四, 07 三月 2024 11:25:38 +0800
Subject: [PATCH] 合并代码
---
Wms/Wms/Controllers/DownApiController.cs | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 68f194a..97d7e26 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -42,12 +42,14 @@
/// <summary>
/// 鎸囦护涓嬪彂锛堝嚭搴擄級
/// </summary>
- /// <param name="soNo"></param>
- /// <param name="outMode"></param>
+ /// <param name="unstackingMode">鎷嗗灈鏂瑰紡</param>
+ /// <param name="soNo">鍑哄簱鍗曞彿</param>
+ /// <param name="outMode">鍑哄簱鍙�</param>
+ /// <param name="loadingAddre">瑁呰溅鍙�</param>
/// <returns></returns>
[Authorize]
[HttpGet]
- public IActionResult IssueOutHouse(string soNo,string outMode)
+ public IActionResult IssueOutHouse(string soNo,string unstackingMode, string outMode,string loadingAddre)
{
try
{
@@ -68,7 +70,7 @@
// return Ok(new { code = 1, msg = "璇烽�夋嫨鍑哄簱鍙�" });
//}
- var list = _exNoticeSvc.IssueOutHouse(soNo, outMode,int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl,out string str);
+ var list = _exNoticeSvc.IssueOutHouse(soNo,unstackingMode, outMode,loadingAddre, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl,out string str);
return Ok(new { code = 0, msg = str , data = list });
@@ -189,6 +191,39 @@
/// <returns></returns>
[AllowAnonymous]
[HttpPost]
+ public IActionResult RequestRoadWay(RequestLocate model)
+ {
+ var logStr = "";
+
+ logStr = $@".\log\WCS\WCS鐢宠宸烽亾" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+
+ try
+ {
+
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"WCS鐢宠宸烽亾锛�( {jsonData} ),", logStr);
+
+ var list = _asnPalletBindSvc.RequestRoadWay(model.PalletNo, model.HouseNo );
+
+ LogFile.SaveLogToFile($"WCS鐢宠鍌ㄤ綅杩斿洖锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
+
+ return Ok(new { Success = 0, Message = "鐢宠鍌ㄤ綅鎴愬姛", TaskList = list });
+ }
+ catch (Exception e)
+ {
+ LogFile.SaveLogToFile($"WCS鐢宠宸烽亾杩斿洖锛�( {e.Message} ),", logStr);
+
+ return Ok(new ErpModel { Success = -1, Message = e.Message });
+ }
+ }
+
+ /// <summary>
+ /// 鐢宠鍌ㄤ綅
+ /// </summary>
+ /// <param name="model">鍏ュ簱鍗曚俊鎭�</param>
+ /// <returns></returns>
+ [AllowAnonymous]
+ [HttpPost]
public IActionResult RequestLocation(RequestLocate model)
{
@@ -299,6 +334,11 @@
_exNoticeSvc.ExportSuccess(model.TaskNo,0);
return Ok(new WcsModel { StatusCode = 0, Msg = "鍑哄簱瀹屾垚" });
}
+ else if (model.TaskType == "2")
+ {
+ _exNoticeSvc.RelocationSuccess(model.TaskNo, 0);
+ return Ok(new WcsModel { StatusCode = 0, Msg = "绉诲簱瀹屾垚" });
+ }
break;
case "2"://鐩樺簱瀹屾垚浠诲姟
if (model.TaskType == "1")//0锛氬叆搴� 1锛氬嚭搴� 3锛氱Щ搴�
--
Gitblit v1.8.0