From e644b249b5a3d4b3b0e72f00d60eb06ae3743d3a Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期六, 19 四月 2025 17:48:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS
---
Wms/Wms/Controllers/PdaCrController.cs | 90 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 88 insertions(+), 2 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaCrController.cs b/Wms/Wms/Controllers/PdaCrController.cs
index 86c1d5e..9a2d0d9 100644
--- a/Wms/Wms/Controllers/PdaCrController.cs
+++ b/Wms/Wms/Controllers/PdaCrController.cs
@@ -15,6 +15,8 @@
using Model.ModelDto.PdaDto;
using Microsoft.AspNetCore.Identity;
using System.Security.Cryptography;
+using Wms.Tools;
+using Microsoft.Extensions.Options;
namespace Wms.Controllers
{
@@ -23,11 +25,13 @@
[Authorize]
public class PdaCrController : ControllerBase
{
+ private readonly ApiUrlConfig _config; //鎺ュ彛浜や簰璺緞
private readonly IPdaCrServer _pdaCrSvc;
private readonly UserManager _userManager;
- public PdaCrController(IPdaCrServer pdaCrSvc, UserManager userManager)
+ public PdaCrController(IOptions<ApiUrlConfig> setting, IPdaCrServer pdaCrSvc, UserManager userManager)
{
+ _config = setting.Value;
_pdaCrSvc = pdaCrSvc;
_userManager = userManager;
}
@@ -231,7 +235,7 @@
[UnitOfWork]
public async Task AgvTransport(PdaAgvTransportVm model)
{
- await _pdaCrSvc.AgvTransport(model.PalletNo, model.AreaNo, model.Ruku, _userManager.UserId);
+ await _pdaCrSvc.AgvTransport(model.PalletNo, model.AreaNo, model.Ruku, _config.WcsHost+ _config.IssueComApiUrl, _userManager.UserId);
}
/// <summary>
/// agv杞繍鍛煎彨灏忚溅鍙栬揣
@@ -282,5 +286,87 @@
}
}
#endregion
+
+ #region 鎷嗙璐存爣
+
+ /// <summary>
+ /// 鎷嗙璐存爣
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult AddLableByDevanning(PdaDevaningVm 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 = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+
+ var uId = int.Parse(userId);
+ _pdaCrSvc.AddLableByDevanning(model.BoxNo, model.DevanQty,uId);
+
+ return Ok(new { data = "", code = 0, msg = "鎴愬姛" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = $"寮傚父锛歿e.Message}" });
+ }
+ }
+ #endregion
+
+ #region 纭鏀惰揣
+
+ /// <summary>
+ /// 鏍规嵁鏀惰揣鎵樼洏鑾峰彇鍑哄簱鍗曚俊鎭�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult GetReceiptSoNoByPallet(PdaReceiptVm model)
+ {
+ try
+ {
+
+ var soNo = _pdaCrSvc.GetReceiptSoNoByPallet(model.PalletNo);
+
+ return Ok(new { data = soNo, code = 0, msg = "鎴愬姛" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = $"寮傚父锛歿e.Message}" });
+ }
+ }
+
+ /// <summary>
+ /// 纭鏀惰揣
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult ConfirmReceipt(PdaReceiptVm model)
+ {
+ try
+ {
+ _pdaCrSvc.ConfirmReceipt(model.PalletNo, _userManager.UserId);
+
+ return Ok(new { data = "", code = 0, msg = "鎴愬姛" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = $"寮傚父锛歿e.Message}" });
+ }
+ }
+
+ #endregion
+
}
}
--
Gitblit v1.8.0