From 1401f0156b5338a110f1d3a803a3c09c134b7e0d Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 23 三月 2024 16:53:02 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Wms/Wms/Controllers/DownApiController.cs | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 2be6a9d..558463d 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 });
@@ -183,7 +185,7 @@
#region WMS鎺ュ彛 琚笅娓哥郴缁熸帴鍙ｈ皟鐢�
/// <summary>
- /// 鐢宠鍌ㄤ綅
+ /// 鐢宠宸烽亾
/// </summary>
/// <param name="model">鍏ュ簱鍗曚俊鎭�</param>
/// <returns></returns>
@@ -203,14 +205,18 @@
var list = _asnPalletBindSvc.RequestRoadWay(model.PalletNo, model.HouseNo );
- LogFile.SaveLogToFile($"WCS鐢宠鍌ㄤ綅杩斿洖锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
-
+ LogFile.SaveLogToFile($"WCS鐢宠宸烽亾杩斿洖锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
+ new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", model.PalletNo.Substring(0, 8),
+ "鐢宠宸烽亾", $"鐢宠宸烽亾鎵樼洏鍙凤細{model.PalletNo.Substring(0, 8)}鐨勬垚鍔熶俊鎭�", 2);
+
return Ok(new { Success = 0, Message = "鐢宠鍌ㄤ綅鎴愬姛", TaskList = list });
}
catch (Exception e)
{
LogFile.SaveLogToFile($"WCS鐢宠宸烽亾杩斿洖锛�( {e.Message} ),", logStr);
-
+ new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", model.PalletNo.Substring(0, 8),
+ "鐢宠宸烽亾", $"鐢宠宸烽亾鎵樼洏鍙凤細{model.PalletNo.Substring(0, 8)}鐨勫け璐ヤ俊鎭�", 2);
+
return Ok(new ErpModel { Success = -1, Message = e.Message });
}
}
@@ -332,6 +338,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