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 | 321 +++++++++-------------------------------------------
1 files changed, 58 insertions(+), 263 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaSoController.cs b/Wms/Wms/Controllers/PdaSoController.cs
index b918daa..9adb88f 100644
--- a/Wms/Wms/Controllers/PdaSoController.cs
+++ b/Wms/Wms/Controllers/PdaSoController.cs
@@ -12,6 +12,8 @@
using Model.ModelDto;
using Model.ModelVm;
using Wms.Tools;
+using Utility;
+using System.Security.Cryptography;
namespace Wms.Controllers
{
@@ -23,14 +25,15 @@
#region 渚濊禆娉ㄥ叆
private readonly ApiUrlConfig _config; //鎺ュ彛浜や簰璺緞
private readonly IPdaSoServer _pdaSoSvc;
+ private readonly UserManager _userManager;
- public PdaSoController(IOptions<ApiUrlConfig> setting,IPdaSoServer pdaSoSvc)
+ public PdaSoController(IOptions<ApiUrlConfig> setting, IPdaSoServer pdaSoSvc, UserManager userManager)
{
_config = setting.Value;
_pdaSoSvc = pdaSoSvc;
+ _userManager = userManager;
}
#endregion
-
/// <summary>
@@ -39,25 +42,10 @@
/// <param name="model">PalletNo锛氭墭鐩樻潯鐮�</param>
/// <returns></returns>
[HttpPost]
- public IActionResult IsEnableOkPalletNo(PdaSoVm model)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task IsEnableOkPalletNo(PdaSoVm model)
{
- try
- {
- var strMsg = _pdaSoSvc.IsEnableOkPalletNo(model.PalletNo);
-
- 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 });
- }
+ await _pdaSoSvc.IsEnableOkPalletNo(model.PalletNo);
}
/// <summary>
@@ -66,18 +54,10 @@
/// <param name="model">PalletNo:鎵樼洏鍙�</param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetRunSoNoticeList(PdaSoVm model)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<List<string>> GetRunSoNoticeList(PdaSoVm model)
{
- try
- {
- var list = _pdaSoSvc.GetRunSoNoticeList(model.PalletNo,model.Type);
-
- return Ok(new { code = 0, msg = "鍑哄簱鍗曚俊鎭�", data = list });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ return await _pdaSoSvc.GetRunSoNoticeList(model.PalletNo, model.Type);
}
/// <summary>
@@ -86,18 +66,10 @@
/// <param name="model">PalletNo:鎵樼洏鐮併�丼oNo:鍗曟嵁鍙�</param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetSoSkuLotNoListByPallet(PdaSoVm model)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task GetSoSkuLotNoListByPallet(PdaSoVm model)
{
- try
- {
- var models = _pdaSoSvc.GetSoSkuLotNoListByPallet(model.PalletNo, model.SoNo);
-
- return Ok(new { code = 0, msg = "鐗╂枡-鎵规淇℃伅", data = models });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ var models = await _pdaSoSvc.GetSoSkuLotNoListByPallet(model.PalletNo, model.SoNo);
}
/// <summary>
@@ -106,18 +78,10 @@
/// <param name="model">SoDetailId:鍑哄簱鍗曟槑缁咺D銆丳alletNo:鎵樼洏鐮�</param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetOutlets(PdaSoVm model)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<OutPdaInfo> GetOutlets(PdaSoVm model)
{
- try
- {
- var models = _pdaSoSvc.GetOutlets(model.SoDetailId, model.PalletNo);
-
- return Ok(new { code = 0, msg = "鎵樼洏涓婄墿鏂欑瓑淇℃伅", data = models });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ return await _pdaSoSvc.GetOutlets(model.SoDetailId, model.PalletNo);
}
/// <summary>
@@ -126,18 +90,10 @@
/// <param name="model">SoDetailId:鍑哄簱鍗曟槑缁咺D</param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetPlanAndFinishQty(PdaSoVm model)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<OutPdaInfo> GetPlanAndFinishQty(PdaSoVm model)
{
- try
- {
- var models = _pdaSoSvc.GetPlanAndFinishQty(model.SoDetailId);
-
- return Ok(new { code = 0, msg = "鍑哄簱鍗曟槑缁嗘暟閲忎俊鎭�", data = models });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ return await _pdaSoSvc.GetPlanAndFinishQty(model.SoDetailId);
}
/// <summary>
@@ -146,18 +102,10 @@
/// <param name="model">BoxNo:绠辩爜鍙�</param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetDataComBoxInfo(PdaSoVm model)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<dynamic> GetDataComBoxInfo(PdaSoVm model)
{
- try
- {
- var models = _pdaSoSvc.GetDataComBoxInfo(model.SoDetailId,model.PalletNo, model.BoxNo, model.BoxNo3);
-
- return Ok(new { code = 0, msg = "绠辩爜淇℃伅", data = models });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ return await _pdaSoSvc.GetDataComBoxInfo(model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3);
}
/// <summary>
@@ -166,51 +114,10 @@
/// <param name="model">BoxNo:绠辩爜鍙�</param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetAllotPlnInfo(PdaSoVm model)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<dynamic> GetAllotPlnInfo(PdaSoVm model)
{
- try
- {
- var models = _pdaSoSvc.GetAllotPlnInfo(model.SoDetailId, model.PalletNo);
-
- return Ok(new { code = 0, msg = "绠辩爜淇℃伅", data = models });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
- }
-
-
- /// <summary>
- /// 鍑哄簱pda鎷ｈ揣
- /// </summary>
- /// <param name="model">SoDetailId:鍑哄簱鍗曟槑缁咺D銆丳alletNo:鎵樼洏鐮�</param>
- /// <returns></returns>
- [HttpPost]
- public IActionResult 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 });
- }
+ return await _pdaSoSvc.GetAllotPlnInfo(model.SoDetailId, model.PalletNo);
}
/// <summary>
@@ -219,30 +126,22 @@
/// <param name="model">SoDetailId:鍑哄簱鍗曟槑缁咺D銆丳alletNo:鎵樼洏鐮�</param>
/// <returns></returns>
[HttpPost]
- public IActionResult SoSetQtyPick(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 = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
- }
+ await _pdaSoSvc.SoSetPick(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, _userManager.UserId);
+ }
- _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 });
- }
+ /// <summary>
+ /// 鍑哄簱pda鎷ｈ揣
+ /// </summary>
+ /// <param name="model">SoDetailId:鍑哄簱鍗曟槑缁咺D銆丳alletNo:鎵樼洏鐮�</param>
+ /// <returns></returns>
+ [HttpPost]
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task SoSetQtyPick(PdaSoVm model)
+ {
+ await _pdaSoSvc.SoSetQtyPick(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, _userManager.UserId);
}
@@ -252,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);
}
@@ -293,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>
@@ -313,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);
}
@@ -347,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>
@@ -379,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>
/// 鍙栨牱鍑哄簱鎷ｈ揣(鏍囩)
@@ -399,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