From 06bc1ebcdbc217a7f53be2926ee4c25eb2990903 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期四, 29 八月 2024 09:07:25 +0800
Subject: [PATCH] 修改组托收货箱码关联，和平库出库单页面
---
Wms/Wms/Controllers/UpApiController.cs | 58 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index 2d549d0..eefb118 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -21,6 +21,9 @@
using System.Text;
using Newtonsoft.Json.Linq;
using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using WMS.BLL.BllPdaServer;
+using WMS.IBLL.IPdaServer;
namespace Wms.Controllers
{
@@ -37,13 +40,15 @@
private readonly IArrivalNoticeServer _arrivalNoticeSvc;
private readonly IStockCheckServer _stockCheckSvc;//鐩樼偣鍗昐vc
private readonly IProcurePlanServer _procurePlanSvc;//閲囪喘鍗昐vs
- public UpApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IArrivalNoticeServer arrivalNoticeServer, IStockCheckServer stockCheckSvc, IProcurePlanServer procurePlanSvc)
+ private readonly IPdaAsnServer _pdaAsnServer;// PDA
+ public UpApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IArrivalNoticeServer arrivalNoticeServer, IStockCheckServer stockCheckSvc, IProcurePlanServer procurePlanSvc, IPdaAsnServer pdaAsnServer)
{
_config = setting.Value;
_exNoticeSvc = exNoticeSvc;
_arrivalNoticeSvc = arrivalNoticeServer;
_stockCheckSvc = stockCheckSvc;
_procurePlanSvc = procurePlanSvc;
+ _pdaAsnServer = pdaAsnServer;
}
#endregion
@@ -207,7 +212,7 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult FinishCr(AdjustStockCheckVm model)
+ public async Task<IActionResult> FinishCr(AdjustStockCheckVm model)
{
try
{
@@ -222,27 +227,24 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- bool bolls = false;
+ //bool bolls = false;
if (model.Origin == "0")
{
- bolls = _stockCheckSvc.StockAdjust(model.Id, int.Parse(userId));
+ await _stockCheckSvc.StockAdjust(model.Id);
}
else
{
- bolls = _stockCheckSvc.StockAdjustAuto(model.Id, int.Parse(userId));
+ await _stockCheckSvc.StockAdjustAuto(model.Id);
}
- if (bolls)
- {
- //绯荤粺瀵规帴鍚庢斁寮�
- //var bl =_stockCheckSvc.FinishCr(model.Id,_config.ErpHost + _config.DataChangeUrl, int.Parse(userId));
- //if (bl)
- //{
- return Ok(new { code = 0, count = 0, msg = "鐩樼偣鍗曡皟鏁翠笂浼犳垚鍔�" });
- //}
- //return Ok(new { code = 1, count = 0, msg = "鍑哄簱鍗曞叧鍗曟垚鍔熶絾涓婁紶澶辫触" });
- }
+ //绯荤粺瀵规帴鍚庢斁寮�
+ //var bl =_stockCheckSvc.FinishCr(model.Id,_config.ErpHost + _config.DataChangeUrl, int.Parse(userId));
+ //if (bl)
+ //{
+ return Ok(new { code = 0, count = 0, msg = "鐩樼偣鍗曡皟鏁翠笂浼犳垚鍔�" });
+ //}
+ //return Ok(new { code = 1, count = 0, msg = "鍑哄簱鍗曞叧鍗曟垚鍔熶絾涓婁紶澶辫触" });
- return Ok(new { code = 1, msg = "鐩樼偣鍗曡皟鏁村け璐�" });
+ //return Ok(new { code = 1, msg = "鐩樼偣鍗曡皟鏁村け璐�" });
}
catch (Exception e)
@@ -251,8 +253,30 @@
}
}
- //绠辩爜淇℃伅 鎵嬫寔缁勬墭鐢� (鎵鐮佸悜杩芥函瑕佷俊鎭�)
+ //
+ /// <summary>
+ /// 绠辩爜淇℃伅 鎵嬫寔缁勬墭鐢� (鎵鐮佸悜杩芥函瑕佷俊鎭�)
+ /// </summary>
+ /// <param name="model">BoxNo:绠卞彿</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult GetFMBindBoxInfos(string BoxNo)
+ {
+ try
+ {
+ if (string.IsNullOrWhiteSpace(BoxNo))
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠璇锋眰绠辩爜淇℃伅" });
+ }
+ var models = _pdaAsnServer.GetFMBindBoxInfos(BoxNo);
+ return Ok(new { code = 0, msg = "鏍囩绠辩爜淇℃伅", data = models });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
#endregion
--
Gitblit v1.8.0