From 3278201562dc71cc4fbffb54786639fa4521afb4 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 26 三月 2024 16:28:54 +0800
Subject: [PATCH] 优化PDA库存查询功能
---
Wms/Wms/Controllers/BllSoController.cs | 62 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 15 deletions(-)
diff --git a/Wms/Wms/Controllers/BllSoController.cs b/Wms/Wms/Controllers/BllSoController.cs
index 56f7128..489c5f2 100644
--- a/Wms/Wms/Controllers/BllSoController.cs
+++ b/Wms/Wms/Controllers/BllSoController.cs
@@ -72,7 +72,7 @@
{
try
{
- var bolls = _exNoticeSvc.GetStockGroupList(model.Type,model.Msg);
+ var bolls = _exNoticeSvc.GetStockGroupList(model.Type,model.OwnerNo,model.Msg);
return Ok(new { code = 0, count=0, msg = "鍑哄簱鍗曚俊鎭�", data = bolls });
}
@@ -213,18 +213,18 @@
{
try
{
- ////鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
- //var claimsIdentity = this.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 = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
- //}
- var bolls = _exNoticeSvc.AddExXmlStr(model.Id, 1);//int.Parse(userId)
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ var claimsIdentity = this.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 = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var bolls = _exNoticeSvc.AddExXmlStr(model.Id, int.Parse(userId));
return Ok(new { code = 0, count = 0, msg = "鐢熸垚鍑哄簱鍗昘ml", data= bolls.InnerXml.ToString() });
@@ -697,8 +697,19 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _exNoticeSvc.ExportSuccess(taskNo, int.Parse(userId));
-
+ var type = _taskSvc.GetTaskType(taskNo);
+ if (type == "1")//鍑哄簱瀹屾垚
+ {
+ _exNoticeSvc.ExportSuccess(taskNo, int.Parse(userId));
+ }
+ else if (type == "2")//鍑哄簱鏃朵骇鐢熺殑绉诲簱浠诲姟瀹屾垚
+ {
+ _exNoticeSvc.RelocationSuccess(taskNo, int.Parse(userId));
+ }
+ else
+ {
+ return Ok(new { code = 1, msg = "浠诲姟绫诲瀷閿欒锛岃鏍稿疄锛�" });
+ }
return Ok(new { code = 0, msg = "鎴愬姛瀹屾垚浠诲姟", data = "" });
@@ -767,5 +778,26 @@
}
#endregion
+
+ /// <summary>
+ /// 鍒ゆ柇鍑哄簱鏄惁闇�瑕佹媶绠�
+ /// </summary>
+ /// <param name="soNo"></param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult IsNeedUnpack(string soNo)
+ {
+ try
+ {
+ string result = _exNoticeSvc.IsNeedUnpack(soNo);
+
+ return Ok(new { code = 0, data = result, msg = "鎴愬姛" });
+
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
}
}
--
Gitblit v1.8.0