From ecb386a4201213c6635f28f9e9e02e3faf217b51 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期六, 16 三月 2024 11:08:34 +0800
Subject: [PATCH] 修改储位图例柱状图以及圆形图显示数据问题。
---
Wms/Wms/Controllers/UpApiController.cs | 98 +++++++++++++++++++++++++++++++++---------------
1 files changed, 67 insertions(+), 31 deletions(-)
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index 1e6feb4..857538a 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -37,9 +37,38 @@
#endregion
#region 璋冪敤涓婃父绯荤粺鎺ュ彛
-
/// <summary>
- /// 鍏ュ簱鍗曞畬鎴愬洖浼�
+ /// 鍏ュ簱鍗曞叧闂�
+ /// </summary>
+ /// <param name="model">鍏ュ簱鍗曞彿</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult CloseAsn(IdVm model)
+ {
+ 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 = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ _arrivalNoticeSvc.CloseArrivalNotice(model.Id, int.Parse(userId));
+
+ return Ok(new { code = 0, count = 0, msg = "鍏ュ簱鍗曞叧鍗曟垚鍔�" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+ /// <summary>
+ /// 鍏ュ簱鍗曞鏍稿苟鍥炰紶
/// </summary>
/// <param name="model">鍏ュ簱鍗曞彿</param>
/// <returns></returns>
@@ -59,29 +88,48 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- var bolls = _arrivalNoticeSvc.CloseArrivalNotice(model.Id, int.Parse(userId));
-
- if (bolls == "")
- {
- //绯荤粺瀵规帴鍚庢斁寮�
- //var bl =_ArrivalNoticeSvc.FinishAsn(model.Id,_config.ErpHost+_config.AsnFinishUrl,int.Parse(userId));
- //if (bl)
- //{
- return Ok(new { code = 0, count = 0, msg = "鍏ュ簱鍗曞叧鍗曚笂浼犳垚鍔�" });
- //}
- //return Ok(new { code = 1, count = 0, msg = "鍑哄簱鍗曞叧鍗曟垚鍔熶絾涓婁紶澶辫触" });
- }
- return Ok(new { code = 1, msg = "鍏ュ簱鍗曞叧鍗曞け璐�" });
+ _arrivalNoticeSvc.FinishAsn(model.Id, _config.ErpHost + _config.AsnFinishUrl, int.Parse(userId));
+ return Ok(new { code = 0, count = 0, msg = "鍏ュ簱鍗曞鏍稿苟涓婁紶鎴愬姛" });
}
catch (Exception e)
{
return Ok(new { code = 1, msg = e.Message });
}
}
-
+
/// <summary>
- /// 瀹屾垚鍑哄簱鍗曟嵁 //鍑哄簱鍗曞叧闂弽棣�
+ /// 瀹屾垚/鍏抽棴鍑哄簱鍗曟嵁
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult CloseExportNotice(IdVm model)
+ {
+ 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 = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ _exNoticeSvc.CloseExportNotice(model.Id, int.Parse(userId));
+
+ return Ok(new { code = 0, count = 0, msg = "鍑哄簱鍗曞叧鍗曟垚鍔�" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+ /// <summary>
+ /// //鍑哄簱鍗曞鏍稿苟涓婁紶
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -101,20 +149,8 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- var bolls = _exNoticeSvc.CloseExportNotice(model.Id, int.Parse(userId));
- if (bolls)
- {
- //绯荤粺瀵规帴鍚庢斁寮�
- //var bl =_exNoticeSvc.FinishSo(model.Id,_config.ErpHost + _config.SoFinishUrl, int.Parse(userId));
- //if (bl)
- //{
- return Ok(new { code = 0, count = 0, msg = "鍑哄簱鍗曞叧鍗曚笂浼犳垚鍔�" });
- //}
- //return Ok(new { code = 1, count = 0, msg = "鍑哄簱鍗曞叧鍗曟垚鍔熶絾涓婁紶澶辫触" });
- }
-
- return Ok(new { code = 1, msg = "鍑哄簱鍗曞叧鍗曞け璐�" });
-
+ _exNoticeSvc.FinishSo(model.Id, _config.ErpHost + _config.SoFinishUrl, int.Parse(userId));
+ return Ok(new { code = 0, count = 0, msg = "鍑哄簱鍗曞鏍稿苟涓婁紶鎴愬姛" });
}
catch (Exception e)
{
--
Gitblit v1.8.0