From 17dbdcd36fcca8fe4358c2b9b8a3d2bc3d1c8b1c Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Wed, 6 Dec 2023 17:27:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/Controllers/InventoryController.cs | 9 +++++++++ src/WMS.Web.Domain/Values/ResultCodes.cs | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/WMS.Web.Api/Controllers/InventoryController.cs b/src/WMS.Web.Api/Controllers/InventoryController.cs index ddd78b7b..9ed22d70 100644 --- a/src/WMS.Web.Api/Controllers/InventoryController.cs +++ b/src/WMS.Web.Api/Controllers/InventoryController.cs @@ -30,15 +30,18 @@ namespace WMS.Web.Api.Controllers private readonly IInventoryDetailsRepositories _inventoryDetailsRepositories; private readonly IInventoryInOutDetailsRepositories _inventoryInOutDetailsRepositories; private readonly IBoxInventoryRepositories _boxInventoryRepositories; + private readonly IBoxRepositories _boxRepositories; public InventoryController(ILoginService loginService, IOptions option, IExportExcelService exportExcelService, + IBoxRepositories boxRepositories, IInventoryDetailsRepositories inventoryDetailsRepositories, IInventoryInOutDetailsRepositories inventoryInOutDetailsRepositories, IBoxInventoryRepositories boxInventoryRepositories) { _option = option?.Value; + this._boxRepositories = boxRepositories; this._exportExcelService = exportExcelService; this._loginService = loginService; this._inventoryDetailsRepositories = inventoryDetailsRepositories; @@ -176,6 +179,12 @@ namespace WMS.Web.Api.Controllers var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); if (loginInfo == null || loginInfo.UserInfo == null) return Result.ReFailure(ResultCodes.Token_Invalid_Error); + + //找这个:是为了一个错误的箱号的提示语 + var box= await _boxRepositories.GetByNo(boxBillNo); + if(box==null) + return Result.ReFailure(ResultCodes.BoxNoData); + var result = await _boxInventoryRepositories.GetInfoBy(boxBillNo); if(result==null) return Result.ReFailure(ResultCodes.BoxInventoryNoDataError); diff --git a/src/WMS.Web.Domain/Values/ResultCodes.cs b/src/WMS.Web.Domain/Values/ResultCodes.cs index bd5579d5..6ddf8e2b 100644 --- a/src/WMS.Web.Domain/Values/ResultCodes.cs +++ b/src/WMS.Web.Domain/Values/ResultCodes.cs @@ -58,7 +58,7 @@ namespace WMS.Web.Domain.Values public static ValueTuple BoxHaveError = (80008, "箱号已收货"); public static ValueTuple AdjustError = (80009, "与金蝶校准发生错误,请稍候再试!"); public static ValueTuple InventoryNoSourceError = (800010, "来源数据不存在,请稍候再试!"); - public static ValueTuple BoxInventoryNoDataError = (800011, "箱库存不存在,请稍候再试!"); + public static ValueTuple BoxInventoryNoDataError = (800011, "该箱号不存在库存"); public static ValueTuple BoxInventoryMaterialNoDataError = (800041, "箱物料库存数据不存在,请稍候再试!"); public static ValueTuple BoxInventoryNoInventoryError = (800012, "箱库存物料数量不足,请核对后再试!"); public static ValueTuple InventoryDetailsNoInventoryError = (800012, "物料库存数量不足,请核对后再试!");