From 7c274192786484237d4260aa2590cbbb6a64a95d Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 19 十二月 2025 11:42:29 +0800
Subject: [PATCH] 修改成品拣货逻辑
---
Wms/Wms/Controllers/BllSoController.cs | 96 +++++++++++++++++++++++++++++++++--------------
1 files changed, 67 insertions(+), 29 deletions(-)
diff --git a/Wms/Wms/Controllers/BllSoController.cs b/Wms/Wms/Controllers/BllSoController.cs
index 68b3aaa..95cf8e8 100644
--- a/Wms/Wms/Controllers/BllSoController.cs
+++ b/Wms/Wms/Controllers/BllSoController.cs
@@ -22,7 +22,7 @@
{
[Route("api/[controller]/[action]")]
[ApiController]
- //[Authorize]
+ [Authorize]
public class BllSoController : ControllerBase
{
/// <summary>
@@ -76,9 +76,9 @@
{
try
{
- var bolls = _exNoticeSvc.GetStockGroupList(model.WareHouseNo,model.Type,model.OwnerNo,model.Msg);
+ var bolls = _exNoticeSvc.GetStockGroupList(model.WareHouseNo, model.Type, model.OwnerNo, model.Msg);
- return Ok(new { code = 0, count=0, msg = "鍑哄簱鍗曚俊鎭�", data = bolls });
+ return Ok(new { code = 0, count = 0, msg = "鍑哄簱鍗曚俊鎭�", data = bolls });
}
catch (Exception e)
{
@@ -107,7 +107,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- var bolls = _exNoticeSvc.AddExportNotice(model,int.Parse(userId));
+ var bolls = _exNoticeSvc.AddExportNotice(model, int.Parse(userId));
return Ok(new { code = 0, count = 0, msg = "娣诲姞鍑哄簱鍗曟垚鍔�", data = bolls });
}
@@ -158,8 +158,8 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- var list = _exNoticeSvc.EditExportNotice(model,int.Parse(userId));
- if (list!= null && list.Origin != "WMS")
+ var list = _exNoticeSvc.EditExportNotice(model, int.Parse(userId));
+ if (list != null && list.Origin != "WMS")
{
var jsonData = JsonConvert.SerializeObject(list);
string response = "";
@@ -193,10 +193,10 @@
}
catch (Exception e)
{
- return Ok(new { code = 1, msg = "缂栬緫澶辫触"+e.Message });
+ return Ok(new { code = 1, msg = "缂栬緫澶辫触" + e.Message });
}
}
-
+
/// <summary>
/// 鍒犻櫎鍑哄簱鍗曟嵁
/// </summary>
@@ -227,7 +227,7 @@
{
return Ok(new { code = 1, msg = "鍒犻櫎澶辫触" });
}
-
+
}
catch (Exception e)
{
@@ -258,14 +258,52 @@
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
var bolls = _exNoticeSvc.AddExXmlStr(model.Id, int.Parse(userId));
-
- return Ok(new { code = 0, count = 0, msg = "鐢熸垚鍑哄簱鍗昘ml", data= bolls.InnerXml.ToString() });
-
+
+ return Ok(new { code = 0, count = 0, msg = "鐢熸垚鍑哄簱鍗昘ml", data = bolls.InnerXml.ToString() });
+
}
catch (Exception e)
{
return Ok(new { code = 1, msg = "鍒犻櫎澶辫触" + e.Message });
+ }
+ }
+
+
+ /// <summary>
+ /// 鎵归噺鐢熸垚xml
+ /// </summary>
+ /// <param name="date">鏃ユ湡锛�2025-12-16</param>
+ /// <returns></returns>
+ [HttpGet]
+ [AllowAnonymous]
+ public IActionResult AddExportXmls(string date)
+ {
+ try
+ {
+ if (string.IsNullOrWhiteSpace(date))
+ {
+ return Ok(new { code = 1, msg = "鍙傛暟鏃ユ湡涓嶅彲涓虹┖" });
+ }
+
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ var claimsIdentity = User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ List<ExportXmlDto> xmlList = _exNoticeSvc.AddExportXmls(date, int.Parse(userId));
+
+ return Ok(new { code = 0, count = 0, msg = "鎵归噺鐢熸垚鍑哄簱鍗昘ml", data = xmlList });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = "鎵归噺鐢熸垚鍑哄簱鍗昘ml澶辫触" + e.Message });
}
}
@@ -337,7 +375,7 @@
/// <param name="tab">楠岃瘉閫夐」 0锛氶渶楠岃瘉銆�1锛氬凡楠岃瘉杩�</param>
/// <returns></returns>
[HttpGet]
- public IActionResult ExportAutoAllot(string soNo,string tab)
+ public IActionResult ExportAutoAllot(string soNo, string tab)
{
try
{
@@ -384,7 +422,7 @@
return Ok(new { code = 2, msg = "璺ㄦ壒鍑哄簱" });
}
}
-
+
}
catch (Exception e)
{
@@ -473,10 +511,10 @@
{
try
{
- var list = _exNoticeSvc.GetHandOutList(model.DetailId,model.HouseNo,model.RoadwayNo,model.LocateNo,model.Msg,model.PalletNo);
-
+ var list = _exNoticeSvc.GetHandOutList(model.DetailId, model.HouseNo, model.RoadwayNo, model.LocateNo, model.Msg, model.PalletNo);
+
return Ok(new { code = 0, count = list.Count, msg = "鑾峰彇搴撳瓨鏄庣粏淇℃伅", data = list });
-
+
}
catch (Exception e)
{
@@ -553,9 +591,9 @@
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
_exAllotSvc.DelExportAllot(model.Id, int.Parse(userId));
-
+
return Ok(new { code = 0, count = 0, msg = "鍙栨秷鍒嗛厤鎴愬姛" });
-
+
}
catch (Exception e)
{
@@ -582,7 +620,7 @@
}
[HttpGet]
- public IActionResult GetCompBoxInfoList(string sONo, string boxNo,string boxNo3)
+ public IActionResult GetCompBoxInfoList(string sONo, string boxNo, string boxNo3)
{
try
{
@@ -652,7 +690,7 @@
{
list = _exNoticeSvc.IssuePalletNoOut(palletNo, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out str);
}
-
+
return Ok(new { code = 0, msg = str, data = list });
@@ -673,7 +711,7 @@
/// </summary>
/// <param name="soNo">鍑哄簱鍗曞彿</param>
/// <returns></returns>
-
+
[HttpGet]
public IActionResult AddBeiLiaoTimer(string soNo)
{
@@ -693,7 +731,7 @@
_exNoticeSvc.AddBeiLiaoTimer(soNo, int.Parse(userId));
- return Ok(new { code = 0, msg = "澶囨枡瀹氭椂瀹屾垚", data ="" });
+ return Ok(new { code = 0, msg = "澶囨枡瀹氭椂瀹屾垚", data = "" });
}
catch (Exception e)
@@ -712,9 +750,9 @@
{
try
{
- var type = new List<string>(){"1"};
+ var type = new List<string>() { "1" };
RefAsync<int> count = new RefAsync<int>();
- var bolls = await _taskSvc.GetTaskList( type, model.Type,model.Status,model.TaskNo,model.IsSuccess,model.PalletNo,model.Msg,model.Page, model.Limit, count);
+ var bolls = await _taskSvc.GetTaskList(type, model.Type, model.Status, model.TaskNo, model.IsSuccess, model.PalletNo, model.Msg, model.Page, model.Limit, count);
return Ok(new { code = 0, count = count.Value, msg = "鍑哄簱浠诲姟淇℃伅", data = bolls });
}
@@ -746,7 +784,7 @@
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
_exNoticeSvc.CancelSoTask(taskNo, int.Parse(userId));
-
+
return Ok(new { code = 0, msg = "鍙栨秷浠诲姟宸插畬鎴�", data = "" });
@@ -805,7 +843,7 @@
return Ok(new { code = 1, msg = "浠诲姟绫诲瀷閿欒锛岃鏍稿疄锛�" });
}
}
-
+
return Ok(new { code = 0, msg = "鎴愬姛瀹屾垚浠诲姟", data = "" });
@@ -837,7 +875,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _exNoticeSvc.AgainSendSoTask(taskNo, int.Parse(userId),"");
+ _exNoticeSvc.AgainSendSoTask(taskNo, int.Parse(userId), "");
return Ok(new { code = 0, msg = "鎴愬姛涓嬪彂浠诲姟", data = "" });
@@ -949,7 +987,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _waveSvc.AddWaveMage(model.Ids,int.Parse(userId));
+ _waveSvc.AddWaveMage(model.Ids, int.Parse(userId));
return Ok(new { code = 0, count = 0, msg = "娣诲姞娉㈡鍗曟嵁鎴愬姛", data = "" });
}
--
Gitblit v1.8.0