From 3d9c487d82168e2f559ffae8d46fe6f20e37fef5 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 01 八月 2024 14:06:41 +0800
Subject: [PATCH] `
---
Wms/Wms/Controllers/PdaSoController.cs | 126 ++++++++++-------------------------------
1 files changed, 32 insertions(+), 94 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaSoController.cs b/Wms/Wms/Controllers/PdaSoController.cs
index b918daa..6605d0f 100644
--- a/Wms/Wms/Controllers/PdaSoController.cs
+++ b/Wms/Wms/Controllers/PdaSoController.cs
@@ -12,6 +12,7 @@
using Model.ModelDto;
using Model.ModelVm;
using Wms.Tools;
+using Utility;
namespace Wms.Controllers
{
@@ -23,14 +24,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 +41,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 +53,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 +65,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 +77,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 +89,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 +101,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,20 +113,11 @@
/// <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 });
- }
+ return await _pdaSoSvc.GetAllotPlnInfo(model.SoDetailId, model.PalletNo);
}
-
/// <summary>
/// 鍑哄簱pda鎷ｈ揣
@@ -203,7 +141,7 @@
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _pdaSoSvc.SoSetPick(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3,model.PickQty ,int.Parse(userId));
+ _pdaSoSvc.SoSetPick(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, int.Parse(userId));
return Ok(new { code = 0, msg = "鎷ｈ揣瀹屾垚", data = "" });
}
@@ -235,7 +173,7 @@
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _pdaSoSvc.SoSetQtyPick(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, int.Parse(userId));
+ _pdaSoSvc.SoSetQtyPick(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, int.Parse(userId));
return Ok(new { code = 0, msg = "鎷ｈ揣瀹屾垚", data = "" });
}
@@ -297,7 +235,7 @@
{
try
{
- var list = _pdaSoSvc.GetPingKuInfoByPallet(soNo,palletNo);
+ var list = _pdaSoSvc.GetPingKuInfoByPallet(soNo, palletNo);
return Ok(new { data = list, code = 0, msg = "鑾峰彇骞冲簱鎵樼洏淇℃伅鎴愬姛" });
}
catch (Exception e)
@@ -335,9 +273,9 @@
}
catch (Exception e)
{
- return Ok(new { data = "", code = 1, msg = "骞冲簱鍑哄簱閿欒锛�"+e.Message });
+ return Ok(new { data = "", code = 1, msg = "骞冲簱鍑哄簱閿欒锛�" + e.Message });
}
-
+
}
@@ -360,7 +298,7 @@
if (string.IsNullOrWhiteSpace(UserId))
{
throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
+ }
var type = _pdaSoSvc.GetSampleType(palletNo);
@@ -415,7 +353,7 @@
}
int uid = Convert.ToInt32(UserId);
- _pdaSoSvc.SampleSoSetPick(model.Type,model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, model.AsnNo, uid);
+ _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 = "(鏍囩)鍙栨牱鍑哄簱鎷ｈ揣" });
}
--
Gitblit v1.8.0