From 996acccd51e8fd31a26d92b012e34b6fbbcf2237 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 22 八月 2024 14:40:59 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Wms/Wms/Controllers/PdaSoController.cs | 204 +++++++--------------------------------------------
1 files changed, 28 insertions(+), 176 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaSoController.cs b/Wms/Wms/Controllers/PdaSoController.cs
index 4e3cdd0..3c63851 100644
--- a/Wms/Wms/Controllers/PdaSoController.cs
+++ b/Wms/Wms/Controllers/PdaSoController.cs
@@ -10,7 +10,6 @@
using Model.ModelVm.PdaVm;
using WMS.IBLL.IPdaServer;
using Model.ModelDto;
-using Model.ModelVm;
using Wms.Tools;
using Utility;
using System.Security.Cryptography;
@@ -20,6 +19,7 @@
[Route("api/[controller]/[action]")]
[ApiController]
[Authorize]
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
public class PdaSoController : ControllerBase
{
#region 渚濊禆娉ㄥ叆
@@ -42,7 +42,6 @@
/// <param name="model">PalletNo锛氭墭鐩樻潯鐮�</param>
/// <returns></returns>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task IsEnableOkPalletNo(PdaSoVm model)
{
await _pdaSoSvc.IsEnableOkPalletNo(model.PalletNo);
@@ -54,7 +53,6 @@
/// <param name="model">PalletNo:鎵樼洏鍙�</param>
/// <returns></returns>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<List<string>> GetRunSoNoticeList(PdaSoVm model)
{
return await _pdaSoSvc.GetRunSoNoticeList(model.PalletNo, model.Type);
@@ -66,10 +64,9 @@
/// <param name="model">PalletNo:鎵樼洏鐮併�丼oNo:鍗曟嵁鍙�</param>
/// <returns></returns>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
- public async Task GetSoSkuLotNoListByPallet(PdaSoVm model)
+ public async Task<List<DetailIdSkuLotNo>> GetSoSkuLotNoListByPallet(PdaSoVm model)
{
- var models = await _pdaSoSvc.GetSoSkuLotNoListByPallet(model.PalletNo, model.SoNo);
+ return await _pdaSoSvc.GetSoSkuLotNoListByPallet(model.PalletNo, model.SoNo);
}
/// <summary>
@@ -78,7 +75,6 @@
/// <param name="model">SoDetailId:鍑哄簱鍗曟槑缁咺D銆丳alletNo:鎵樼洏鐮�</param>
/// <returns></returns>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<OutPdaInfo> GetOutlets(PdaSoVm model)
{
return await _pdaSoSvc.GetOutlets(model.SoDetailId, model.PalletNo);
@@ -90,22 +86,22 @@
/// <param name="model">SoDetailId:鍑哄簱鍗曟槑缁咺D</param>
/// <returns></returns>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<OutPdaInfo> GetPlanAndFinishQty(PdaSoVm model)
{
- return await _pdaSoSvc.GetPlanAndFinishQty(model.SoDetailId);
+ var data = await _pdaSoSvc.GetPlanAndFinishQty(model.SoDetailId);
+ return data;
}
/// <summary>
/// 鑾峰彇绠辩爜淇℃伅锛堟牴鎹鐮佸湪搴撳瓨绠辩爜鏄庣粏涓煡璇級
/// </summary>
- /// <param name="model">BoxNo:绠辩爜鍙�</param>
+ /// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
- public async Task<dynamic> GetDataComBoxInfo(PdaSoVm model)
+ public async Task<List<BoxInfo>> GetDataComBoxInfo(PdaSoVm model)
{
- return await _pdaSoSvc.GetDataComBoxInfo(model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3);
+ var data = await _pdaSoSvc.GetDataComBoxInfo(model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3);
+ return data;
}
/// <summary>
@@ -114,8 +110,7 @@
/// <param name="model">BoxNo:绠辩爜鍙�</param>
/// <returns></returns>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
- public async Task<dynamic> GetAllotPlnInfo(PdaSoVm model)
+ public async Task<List<BoxInfo>> GetAllotPlnInfo(PdaSoVm model)
{
return await _pdaSoSvc.GetAllotPlnInfo(model.SoDetailId, model.PalletNo);
}
@@ -126,7 +121,6 @@
/// <param name="model">SoDetailId:鍑哄簱鍗曟槑缁咺D銆丳alletNo:鎵樼洏鐮�</param>
/// <returns></returns>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task SoSetPick(PdaSoVm model)
{
await _pdaSoSvc.SoSetPick(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, _userManager.UserId);
@@ -138,7 +132,6 @@
/// <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);
@@ -151,7 +144,6 @@
/// <param name="model">绌烘墭鐩樺嚭搴�</param>
/// <returns></returns>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<string> IssuePlnOutHouse(OutModePalletVm model)
{
return await _pdaSoSvc.IssuePlnOutHouse(model, _userManager.UserId, _config.WcsHost + _config.IssueComApiUrl);
@@ -166,8 +158,7 @@
/// <param name="palletNo">鎵樼洏鍙�</param>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
- public async Task<dynamic> GetPingKuInfoByPallet(string soNo, string palletNo)
+ public async Task<List<BoxInfo>> GetPingKuInfoByPallet(string soNo, string palletNo)
{
return await _pdaSoSvc.GetPingKuInfoByPallet(soNo, palletNo);
}
@@ -179,7 +170,6 @@
/// <param name="palletNo">鎵樼洏鍙�</param>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task PlaneExportSuccess(string soNo, string palletNo)
{
await _pdaSoSvc.PlaneExportSuccess(soNo, palletNo, _userManager.UserId);
@@ -192,7 +182,6 @@
/// <param name="palletNo">鎵樼洏鍙�</param>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<string> GetSampleType(string palletNo)
{
return await _pdaSoSvc.GetSampleType(palletNo);
@@ -204,7 +193,6 @@
/// <param name="palletNo">鎵樼洏鍙�</param>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<List<string>> GetAsnNoByPallet(string palletNo)
{
return await _pdaSoSvc.GetAsnNoByPallet(palletNo);
@@ -217,7 +205,7 @@
[HttpPost]
public async Task SampleSoSetPick(PdaSoVm model)
{
- await _pdaSoSvc.SampleSoSetPick(model.Type, model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, model.AsnNo, uid);
+ await _pdaSoSvc.SampleSoSetPick(model.Type, model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, model.AsnNo, _userManager.UserId);
}
/// <summary>
/// 鍙栨牱鍑哄簱鎷ｈ揣(鏃犳爣绛�)
@@ -225,30 +213,9 @@
/// <param name="model">SoDetailId:鍑哄簱鍗曟槑缁咺D銆丳alletNo:鎵樼洏鐮�</param>
/// <returns></returns>
[HttpPost]
- public IActionResult SampleSoSetQtyPick(PdaSoVm model)
+ public async Task SampleSoSetQtyPick(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.SampleSoSetQtyPick(model.Type, model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, model.AsnNo, int.Parse(userId));
-
- return Ok(new { data = "", code = 0, msg = "(鏃犳爣绛�)鍙栨牱鍑哄簱鎷ｈ揣" });
- }
- catch (Exception e)
- {
- return Ok(new { data = "", code = 1, msg = "(鏃犳爣绛�)鍙栨牱鍑哄簱鎷ｈ揣閿欒锛�" + e.Message });
- }
+ await _pdaSoSvc.SampleSoSetQtyPick(model.Type, model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, model.AsnNo, _userManager.UserId);
}
#region 鎷ｈ揣鎷兼墭
/// <summary>
@@ -257,29 +224,9 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult SoSetPinPick(PdaSoVm model)
+ public async Task SoSetPinPick(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.SoSetPinPick(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, model.PalletNoNew, int.Parse(userId));
- return Ok(new { code = 0, msg = "鎷ｈ揣瀹屾垚", data = "" });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ await _pdaSoSvc.SoSetPinPick(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, model.PalletNoNew, _userManager.UserId);
}
/// <summary>
/// 鎷兼墭鍑哄簱pda鎷ｈ揣-鏁伴噺
@@ -287,30 +234,9 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult SoSetQtyPinPick(PdaSoVm model)
+ public async Task SoSetQtyPinPick(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.SoSetQtyPinPick(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, model.PalletNoNew, int.Parse(userId));
-
- return Ok(new { code = 0, msg = "鎷ｈ揣瀹屾垚", data = "" });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ await _pdaSoSvc.SoSetQtyPinPick(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, model.PalletNoNew, _userManager.UserId);
}
#endregion
@@ -323,19 +249,9 @@
/// <param name="palletNo">鎵樼洏鍙�</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetSampleType2(string palletNo)
+ public async Task<string> GetSampleType2(string palletNo)
{
- try
- {
- var type = _pdaSoSvc.GetSampleType2(palletNo);
-
- return Ok(new { data = type, code = 0, msg = "鏍规嵁鎵樼洏鍙疯幏鍙栧彇鏍风被鍨�" });
- }
- catch (Exception e)
- {
- return Ok(new { data = "", code = 1, msg = "鏍规嵁鎵樼洏鍙疯幏鍙栧彇鏍风被鍨嬶細" + e.Message });
- }
-
+ return await _pdaSoSvc.GetSampleType2(palletNo);
}
/// <summary>
@@ -343,19 +259,9 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- public IActionResult GetInspectionNo()
+ public async Task<List<string>> GetInspectionNo()
{
- try
- {
- var qcNoStr = _pdaSoSvc.GetInspectionNo();
-
- return Ok(new { data = qcNoStr, code = 0, msg = "鑾峰彇寰呭嚭搴撴垨寰呭彇鏍风殑璇烽獙鍗�" });
- }
- catch (Exception e)
- {
- return Ok(new { data = "", code = 1, msg = "鑾峰彇寰呭嚭搴撴垨寰呭彇鏍风殑璇烽獙鍗曪細" + e.Message });
- }
-
+ return await _pdaSoSvc.GetInspectionNo();
}
/// <summary>
@@ -364,19 +270,9 @@
/// <param name="qcNo">璇烽獙鍗�</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetInspectionRequestInfo(string qcNo)
+ public async Task<InspectionRequestDto> GetInspectionRequestInfo(string qcNo)
{
- try
- {
- var info = _pdaSoSvc.GetInspectionRequestInfo(qcNo);
-
- return Ok(new { data = info, code = 0, msg = "鑾峰彇璇烽獙鍗曠浉鍏充俊鎭�" });
- }
- catch (Exception e)
- {
- return Ok(new { data = "", code = 1, msg = "鑾峰彇璇烽獙鍗曠浉鍏充俊鎭細" + e.Message });
- }
-
+ return await _pdaSoSvc.GetInspectionRequestInfo(qcNo);
}
/// <summary>
@@ -385,31 +281,9 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult SampleSetPick(SampleSoVm model)
+ public async Task SampleSetPick(SampleSoVm 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.SampleSetPick(model.QcNo, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, uid);
-
- return Ok(new { data = "", code = 0, msg = "(鏍囩)鍙栨牱鍑哄簱鎷ｈ揣" });
- }
- catch (Exception e)
- {
- return Ok(new { data = "", code = 1, msg = "(鏍囩)鍙栨牱鍑哄簱鎷ｈ揣閿欒锛�" + e.Message });
- }
-
+ await _pdaSoSvc.SampleSetPick(model.QcNo, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, _userManager.UserId);
}
/// <summary>
@@ -418,31 +292,9 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult SampleSetQtyPick(SampleSoVm model)
+ public async Task SampleSetQtyPick(SampleSoVm 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.SampleSetQtyPick(model.QcNo, model.PalletNo, model.PickQty, uid);
-
- return Ok(new { data = "", code = 0, msg = "(鏁伴噺)鍙栨牱鍑哄簱鎷ｈ揣" });
- }
- catch (Exception e)
- {
- return Ok(new { data = "", code = 1, msg = "(鏁伴噺)鍙栨牱鍑哄簱鎷ｈ揣閿欒锛�" + e.Message });
- }
-
+ await _pdaSoSvc.SampleSetQtyPick(model.QcNo, model.PalletNo, model.PickQty, _userManager.UserId);
}
#endregion
--
Gitblit v1.8.0