From 90b0fb16d2d7ef864edb83d34ed07c7aa28404bb Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 25 六月 2025 13:23:17 +0800
Subject: [PATCH] pda增加uni.webview.1.5.2.js
---
Wms/Wms/Controllers/PdaCrController.cs | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaCrController.cs b/Wms/Wms/Controllers/PdaCrController.cs
index 616062a..6a97983 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杞繍鍛煎彨灏忚溅鍙栬揣
@@ -308,7 +312,51 @@
}
var uId = int.Parse(userId);
- _pdaCrSvc.AddLableByDevanning(model.BoxNo, model.DevanQty,uId);
+ var list = _pdaCrSvc.AddLableByDevanning(model.BoxNo, model.DevanQty,uId);
+
+ return Ok(new { data = list, 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 = "鎴愬姛" });
}
@@ -317,6 +365,7 @@
return Ok(new { data = "", code = 1, msg = $"寮傚父锛歿e.Message}" });
}
}
+
#endregion
}
--
Gitblit v1.8.0