From d34d36d5c0478d1e5f56b92fc5b38fc5ca379e5c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 22 二月 2024 15:44:11 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Wms/Wms/Controllers/PdaAsnController.cs | 66 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 0 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaAsnController.cs b/Wms/Wms/Controllers/PdaAsnController.cs
index 384d831..bedbd3d 100644
--- a/Wms/Wms/Controllers/PdaAsnController.cs
+++ b/Wms/Wms/Controllers/PdaAsnController.cs
@@ -383,6 +383,26 @@
return Ok(new { code = 1, msg = e.Message });
}
}
+
+ /// <summary>
+ /// 楠岃瘉鍌ㄤ綅(鍦扮爜)鏄惁鍙敤
+ /// </summary>
+ /// <param name="model">LocatNo鍌ㄤ綅鍦板潃</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult CheckLocatNo(PalletBindVm model)
+ {
+ try
+ {
+ var result = _PdaAsnSvc.CheckLocatNo(model.LocatNo);
+
+ return Ok(new { code = 0, msg = "楠岃瘉鎴愬姛!", data = result });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
#endregion
#region 闆剁鍏ュ簱
@@ -462,7 +482,20 @@
return Ok(new { code = 1, msg = e.Message });
}
}
+ [HttpPost]
+ public IActionResult GetBindArrivalNoticeDetails(ArrivalNoticeVm model)
+ {
+ try
+ {
+ var models = _PdaAsnSvc.GetBindArrivalNoticeDetails(model);
+ return Ok(new { code = 0, msg = "鍏ュ簱鍗曟槑缁嗕俊鎭�", data = models });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
/// <summary>
/// 缁戝畾鎵樼洏
@@ -495,5 +528,38 @@
}
}
#endregion
+
+ #region 骞冲簱鍏ュ簱
+ /// <summary>
+ /// 骞冲簱纭鍏ュ簱
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult ConfirmInStock(PalletBindVm 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("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+ model.CreateUser = int.Parse(UserId);
+ _PdaAsnSvc.ConfirmInStock(model);
+
+ return Ok(new { code = 0, msg = "鍏ュ簱鎴愬姛!" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+ #endregion
}
}
--
Gitblit v1.8.0