From 01f8f2c627fe0b95acc68b12df828cc966df0bad Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 05 八月 2024 10:23:16 +0800
Subject: [PATCH] 1
---
Wms/Wms/Controllers/PdaSoController.cs | 193 ++++++------------------------------------------
1 files changed, 25 insertions(+), 168 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaSoController.cs b/Wms/Wms/Controllers/PdaSoController.cs
index 6605d0f..9adb88f 100644
--- a/Wms/Wms/Controllers/PdaSoController.cs
+++ b/Wms/Wms/Controllers/PdaSoController.cs
@@ -13,6 +13,7 @@
using Model.ModelVm;
using Wms.Tools;
using Utility;
+using System.Security.Cryptography;
namespace Wms.Controllers
{
@@ -125,30 +126,10 @@
/// <param name="model">SoDetailId:鍑哄簱鍗曟槑缁咺D銆丳alletNo:鎵樼洏鐮�</param>
/// <returns></returns>
[HttpPost]
- public IActionResult SoSetPick(PdaSoVm model)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task SoSetPick(PdaSoVm 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 = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
- }
-
- _pdaSoSvc.SoSetPick(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, int.Parse(userId));
-
- return Ok(new { code = 0, msg = "鎷ｈ揣瀹屾垚", data = "" });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ await _pdaSoSvc.SoSetPick(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, _userManager.UserId);
}
/// <summary>
@@ -157,30 +138,10 @@
/// <param name="model">SoDetailId:鍑哄簱鍗曟槑缁咺D銆丳alletNo:鎵樼洏鐮�</param>
/// <returns></returns>
[HttpPost]
- public IActionResult SoSetQtyPick(PdaSoVm model)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task SoSetQtyPick(PdaSoVm 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 = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
- }
-
- _pdaSoSvc.SoSetQtyPick(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, int.Parse(userId));
-
- return Ok(new { code = 0, msg = "鎷ｈ揣瀹屾垚", data = "" });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ await _pdaSoSvc.SoSetQtyPick(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, _userManager.UserId);
}
@@ -190,36 +151,10 @@
/// <param name="model">绌烘墭鐩樺嚭搴�</param>
/// <returns></returns>
[HttpPost]
- public IActionResult IssuePlnOutHouse(OutModePalletVm model)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<string> IssuePlnOutHouse(OutModePalletVm model)
{
- try
- {
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- if (claimsIdentity == null)
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
- string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- if (string.IsNullOrWhiteSpace(UserId))
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
-
- var strMsg = _pdaSoSvc.IssuePlnOutHouse(model, int.Parse(UserId), _config.WcsHost + _config.IssueComApiUrl);
-
- if (strMsg == "")
- {
- return Ok(new { code = 0, msg = "绌烘墭鐩樺嚭搴撴垚鍔�!" });
- }
- else
- {
- return Ok(new { code = 1, msg = strMsg });
- }
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ return await _pdaSoSvc.IssuePlnOutHouse(model, _userManager.UserId, _config.WcsHost + _config.IssueComApiUrl);
}
@@ -231,17 +166,10 @@
/// <param name="palletNo">鎵樼洏鍙�</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetPingKuInfoByPallet(string soNo, string palletNo)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<dynamic> GetPingKuInfoByPallet(string soNo, string palletNo)
{
- try
- {
- var list = _pdaSoSvc.GetPingKuInfoByPallet(soNo, palletNo);
- return Ok(new { data = list, code = 0, msg = "鑾峰彇骞冲簱鎵樼洏淇℃伅鎴愬姛" });
- }
- catch (Exception e)
- {
- return Ok(new { data = "", code = 1, msg = "鑾峰彇骞冲簱鎵樼洏淇℃伅閿欒锛�" + e.Message });
- }
+ return await _pdaSoSvc.GetPingKuInfoByPallet(soNo, palletNo);
}
/// <summary>
@@ -251,31 +179,10 @@
/// <param name="palletNo">鎵樼洏鍙�</param>
/// <returns></returns>
[HttpGet]
- public IActionResult PlaneExportSuccess(string soNo, string palletNo)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task PlaneExportSuccess(string soNo, string palletNo)
{
- try
- {
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- if (claimsIdentity == null)
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
- string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- if (string.IsNullOrWhiteSpace(UserId))
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
- int uid = Convert.ToInt32(UserId);
-
- _pdaSoSvc.PlaneExportSuccess(soNo, palletNo, uid);
-
- return Ok(new { data = "", code = 0, msg = "骞冲簱鍑哄簱鎴愬姛" });
- }
- catch (Exception e)
- {
- return Ok(new { data = "", code = 1, msg = "骞冲簱鍑哄簱閿欒锛�" + e.Message });
- }
-
+ await _pdaSoSvc.PlaneExportSuccess(soNo, palletNo, _userManager.UserId);
}
@@ -285,30 +192,10 @@
/// <param name="palletNo">鎵樼洏鍙�</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetSampleType(string palletNo)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<string> GetSampleType(string palletNo)
{
- try
- {
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- if (claimsIdentity == null)
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
- string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- if (string.IsNullOrWhiteSpace(UserId))
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
-
- var type = _pdaSoSvc.GetSampleType(palletNo);
-
- return Ok(new { data = type, code = 0, msg = "鑾峰彇鍙栨牱绫诲瀷" });
- }
- catch (Exception e)
- {
- return Ok(new { data = "", code = 1, msg = "鑾峰彇鍙栨牱绫诲瀷閿欒锛�" + e.Message });
- }
-
+ return await _pdaSoSvc.GetSampleType(palletNo);
}
/// <summary>
@@ -317,19 +204,10 @@
/// <param name="palletNo">鎵樼洏鍙�</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetAsnNoByPallet(string palletNo)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<List<string>> GetAsnNoByPallet(string palletNo)
{
- try
- {
- var type = _pdaSoSvc.GetAsnNoByPallet(palletNo);
-
- return Ok(new { data = type, code = 0, msg = "鑾峰彇鍏ュ簱鍗曟嵁" });
- }
- catch (Exception e)
- {
- return Ok(new { data = "", code = 1, msg = "鑾峰彇鍏ュ簱鍗曟嵁閿欒锛�" + e.Message });
- }
-
+ return await _pdaSoSvc.GetAsnNoByPallet(palletNo);
}
/// <summary>
/// 鍙栨牱鍑哄簱鎷ｈ揣(鏍囩)
@@ -337,31 +215,10 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult SampleSoSetPick(PdaSoVm model)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task SampleSoSetPick(PdaSoVm model)
{
- try
- {
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- if (claimsIdentity == null)
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
- string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- if (string.IsNullOrWhiteSpace(UserId))
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
- int uid = Convert.ToInt32(UserId);
-
- _pdaSoSvc.SampleSoSetPick(model.Type, model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, model.AsnNo, uid);
-
- return Ok(new { data = "", code = 0, msg = "(鏍囩)鍙栨牱鍑哄簱鎷ｈ揣" });
- }
- catch (Exception e)
- {
- return Ok(new { data = "", code = 1, msg = "(鏍囩)鍙栨牱鍑哄簱鎷ｈ揣閿欒锛�" + e.Message });
- }
-
+ await _pdaSoSvc.SampleSoSetPick(model.Type, model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, model.AsnNo, _userManager.UserId);
}
/// <summary>
/// 鍙栨牱鍑哄簱鎷ｈ揣(鏃犳爣绛�)
--
Gitblit v1.8.0