From 1f2bb6d2f47f3e94322ec437d85ec6ed1fbcfb75 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期三, 11 六月 2025 17:03:39 +0800
Subject: [PATCH] 修改申请空托入库接口信息
---
Wms/Wms/Controllers/UpApiController.cs | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index eefb118..79cb4b6 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -24,6 +24,8 @@
using System.Threading.Tasks;
using WMS.BLL.BllPdaServer;
using WMS.IBLL.IPdaServer;
+using WMS.BLL.BllQualityServer;
+using WMS.IBLL;
namespace Wms.Controllers
{
@@ -41,7 +43,9 @@
private readonly IStockCheckServer _stockCheckSvc;//鐩樼偣鍗昐vc
private readonly IProcurePlanServer _procurePlanSvc;//閲囪喘鍗昐vs
private readonly IPdaAsnServer _pdaAsnServer;// PDA
- public UpApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IArrivalNoticeServer arrivalNoticeServer, IStockCheckServer stockCheckSvc, IProcurePlanServer procurePlanSvc, IPdaAsnServer pdaAsnServer)
+ private readonly IHttpServer _http;
+
+ public UpApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IArrivalNoticeServer arrivalNoticeServer, IStockCheckServer stockCheckSvc, IProcurePlanServer procurePlanSvc, IPdaAsnServer pdaAsnServer, IHttpServer http)
{
_config = setting.Value;
_exNoticeSvc = exNoticeSvc;
@@ -49,6 +53,7 @@
_stockCheckSvc = stockCheckSvc;
_procurePlanSvc = procurePlanSvc;
_pdaAsnServer = pdaAsnServer;
+ _http = http;
}
#endregion
@@ -237,7 +242,7 @@
await _stockCheckSvc.StockAdjustAuto(model.Id);
}
//绯荤粺瀵规帴鍚庢斁寮�
- //var bl =_stockCheckSvc.FinishCr(model.Id,_config.ErpHost + _config.DataChangeUrl, int.Parse(userId));
+ var bl =_stockCheckSvc.FinishCr(model.Id,_config.ErpHost + _config.DataChangeUrl, int.Parse(userId));
//if (bl)
//{
return Ok(new { code = 0, count = 0, msg = "鐩樼偣鍗曡皟鏁翠笂浼犳垚鍔�" });
@@ -268,7 +273,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠璇锋眰绠辩爜淇℃伅" });
}
- var models = _pdaAsnServer.GetFMBindBoxInfos(BoxNo);
+ var models = _pdaAsnServer.GetFMBindBoxInfos(BoxNo, _config.BoxHost + _config.GetBoxUrl);
return Ok(new { code = 0, msg = "鏍囩绠辩爜淇℃伅", data = models });
}
@@ -278,6 +283,40 @@
}
}
+
+ /// <summary>
+ /// 鍙戦�佽楠屽崟鎹�
+ /// </summary>
+ /// <param name="model">涓婚敭ID</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult SendInspectionRequest(IdVm model)
+ {
+ try
+ {
+ 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 userName = claimsIdentity.FindFirst(ClaimTypes.NameIdentifier)?.Value;
+
+ string url = _config.LimesHost + _config.SendInspection;
+ var models = _http.SendInspectionRequest(model, int.Parse(userId), url, userName);
+
+ return Ok(new HttpReturnModel { Success = "0", Message = "鍚慙imes璇烽獙鎴愬姛!", Data = models });
+ }
+ catch (Exception e)
+ {
+ return Ok(new HttpReturnModel { Success = "1", Message = e.Message });
+ }
+ }
+
#endregion
#region 琚皟涓婃父璋冪敤鎺ュ彛
--
Gitblit v1.8.0