From 54c9cb77e93d08bc330b9a421e6232b7f7bba57a Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 19 九月 2025 17:30:36 +0800
Subject: [PATCH] 修改问题
---
Wms/Wms/Controllers/DownApiController.cs | 69 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 10 deletions(-)
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 1e324c3..8ba268b 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -131,7 +131,7 @@
{
var list = _exNoticeSvc.IssueOutHouseMk(soNo, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);
- return Ok(new { code = 0, msg = "str" });
+ return Ok(new { code = 0, msg = str });
}
else if (house == "W02")
{
@@ -159,7 +159,7 @@
/// <param name="outMode">鍑哄簱鍦板潃锛堝钩搴撴嫞璐т綅锛�</param>
/// <returns></returns>
[HttpGet]
- public IActionResult PDAIssueOut(string soNo, string soDetailId,string outMode)
+ public IActionResult PDAIssueOut(string soNo, string soDetailId,string palletNo,string outMode)
{
try
{
@@ -174,23 +174,38 @@
{
return Ok(new HttpReturnModel { Success = "-1", Message = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�"});
}
- //楠岃瘉鍑哄簱鍙�
- if (string.IsNullOrWhiteSpace(outMode))
- {
- return Ok(new HttpReturnModel { Success = "-1", Message = "璇烽�夋嫨鍑哄簱鍦板潃" });
- }
+
var house = _exNoticeSvc.GetHouseBySo(soNo);
+ if (house != "W01")
+ {
+ house= _exNoticeSvc.GetHouseByPalletNo(palletNo);
+ }
if (house == "W01")
{
+ //楠岃瘉鍑哄簱鍙�
+ if (string.IsNullOrWhiteSpace(outMode))
+ {
+ return Ok(new HttpReturnModel { Success = "-1", Message = "璇烽�夋嫨鍑哄簱鍦板潃" });
+ }
//var list = _exNoticeSvc.IssueOutHouseMk(soNo, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);
return Ok(new HttpReturnModel { Success = "0", Message = "str", Data = "list" });
}
else if (house == "W02")
{
- var list = _http.IssueOutHouseLk(soNo,soDetailId, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);
+ //楠岃瘉鍑哄簱鍙�
+ if (string.IsNullOrWhiteSpace(outMode))
+ {
+ return Ok(new HttpReturnModel { Success = "-1", Message = "璇烽�夋嫨鍑哄簱鍦板潃" });
+ }
+ var list = _http.IssueOutHouseLk(soNo, soDetailId, outMode, palletNo, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);
- return Ok(new HttpReturnModel { Success = "0", Message = str, Data = list});
+ return Ok(new HttpReturnModel { Success = "0", Message = str, Data = list });
+ }
+ else if (house == "W04")
+ {
+ _http.IssueOutHousePk(soNo, soDetailId, palletNo, int.Parse(userId));
+ return Ok(new HttpReturnModel { Success = "0", Message = "涓嬪彂鎴愬姛" });
}
else
{
@@ -327,6 +342,40 @@
#endregion
#region WMS鎺ュ彛 琚笅娓哥郴缁熸帴鍙ｈ皟鐢�
+
+ /// <summary>
+ /// WCS鐢宠绌烘墭璺虹粍鎵樺叆搴� 锛堝彔鎵樼洏鏈猴級
+ /// </summary>
+ /// <param name="model">鍏ュ簱鍗曚俊鎭�</param>
+ /// <returns></returns>
+ [AllowAnonymous]
+ [HttpPost]
+ public IActionResult RequestPalletIn(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 = _http.RequestPalletIn(model.PalletNo, model.HouseNo, model.PallNum,model.locate);
+
+ 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>
/// PDA 浜哄伐鐢宠鍌ㄤ綅 锛堢珛浣撳簱锛�
@@ -545,7 +594,7 @@
/// <summary>
- /// 鎺ュ彈wcs杩斿洖鐨勪俊鍙� //鎸囦护鍙嶉锛堟槸鍚﹀畬鎴愶級
+ /// 鎵嬪姩瀹屾垚鐨勪俊鍙� //鎸囦护鍙嶉锛堟槸鍚﹀畬鎴愶級
/// </summary>
/// <returns></returns>
[HttpPost]
--
Gitblit v1.8.0