diff --git a/WMS.Web.sln b/WMS.Web.sln index 71b15351..3865d87d 100644 --- a/WMS.Web.sln +++ b/WMS.Web.sln @@ -5,11 +5,11 @@ VisualStudioVersion = 16.0.31729.503 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WMS.Web.Api", "src\WMS.Web.Api\WMS.Web.Api.csproj", "{6BC3A5E0-0590-4F16-B7A0-DAAC5591001C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WMS.Web.Core", "src\WMS.Web.Core\WMS.Web.Core.csproj", "{91559D76-6794-4066-AF0F-89C8A3266F5D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WMS.Web.Core", "src\WMS.Web.Core\WMS.Web.Core.csproj", "{91559D76-6794-4066-AF0F-89C8A3266F5D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WMS.Web.Domain", "src\WMS.Web.Domain\WMS.Web.Domain.csproj", "{7A84DED8-81AC-436A-9083-5897E160B670}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WMS.Web.Domain", "src\WMS.Web.Domain\WMS.Web.Domain.csproj", "{7A84DED8-81AC-436A-9083-5897E160B670}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WMS.Web.Repositories", "src\WMS.Web.Repositories\WMS.Web.Repositories.csproj", "{C028C52D-FD52-4710-998C-C3BE120DB61E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WMS.Web.Repositories", "src\WMS.Web.Repositories\WMS.Web.Repositories.csproj", "{C028C52D-FD52-4710-998C-C3BE120DB61E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index eb6cf322..9ff5164b 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -990,11 +990,6 @@ 箱号明细数量的总和 - - - 比对结果:true为比对成功,false为比对失败 - - 入库任务单明细详情 diff --git a/src/WMS.Web.Core/Dto/InStockTask/ContrastMaterialsResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/ContrastMaterialsResponse.cs index e1574912..bdd06a80 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/ContrastMaterialsResponse.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/ContrastMaterialsResponse.cs @@ -23,10 +23,5 @@ namespace WMS.Web.Core.Dto.InStockTask /// 箱号明细数量的总和 /// public decimal TotalCount { get; set; } - - /// - /// 比对结果:true为比对成功,false为比对失败 - /// - public bool IsRight { get; set; } } } diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs index 9903a4eb..cf203d77 100644 --- a/src/WMS.Web.Domain/Services/InStockService.cs +++ b/src/WMS.Web.Domain/Services/InStockService.cs @@ -241,13 +241,14 @@ namespace WMS.Web.Domain.Services //3.比对 bool isRight = box.Details.All(x => task.Details.Any(t => t.MaterialId == x.MaterialId && t.AccruedQty == x.Qty)) && box.Details.Count == task.Details.Count; + if(!isRight) + return Result.ReFailure(ResultCodes.ContrastError); //4.返回对比结果:true为比对成功,false为比对失败;并把箱ID和箱号返回 var response = new ContrastMaterialsResponse(); response.BoxBillNo = box.BoxBillNo; response.BoxId = box.Id; - response.TotalCount = box.Details.Sum(x => x.Qty); - response.IsRight = isRight; + response.TotalCount = box.Details.Sum(x => x.Qty); return Result.ReSuccess(response); } } diff --git a/src/WMS.Web.Domain/Values/ResultCodes.cs b/src/WMS.Web.Domain/Values/ResultCodes.cs index 8da26f2b..3af13835 100644 --- a/src/WMS.Web.Domain/Values/ResultCodes.cs +++ b/src/WMS.Web.Domain/Values/ResultCodes.cs @@ -33,6 +33,7 @@ namespace WMS.Web.Domain.Values public static ValueTuple ErpStockNoData = (900000, "Erp仓库信息不完整"); public static ValueTuple Box_NoBind_Task_Data = (80001, "该箱号不在收货信息中,请核对再试!"); public static ValueTuple OrderNoData = (80002, "单据信息不存在,请核对后再试!"); + public static ValueTuple ContrastError = (80003, "箱物料对应的采购订单匹配失败,请核对后再试!"); } }