diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 7860e0da..1d25ce6c 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -1797,6 +1797,11 @@ 所选物料 + + + 是否是采购上架 + + 箱号集合 diff --git a/src/WMS.Web.Core/Dto/InStockTask/ContrastMaterialsRequest.cs b/src/WMS.Web.Core/Dto/InStockTask/ContrastMaterialsRequest.cs index 9f739d44..0cc72286 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/ContrastMaterialsRequest.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/ContrastMaterialsRequest.cs @@ -28,6 +28,11 @@ namespace WMS.Web.Core.Dto.InStockTask /// public string MaterialNumber { get; set; } + /// + /// 是否是采购上架 + /// + public bool IsPurchase { get; set; } = true; + /// /// 箱号集合 /// diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs index 756f510f..7151da3f 100644 --- a/src/WMS.Web.Domain/Services/InStockService.cs +++ b/src/WMS.Web.Domain/Services/InStockService.cs @@ -659,14 +659,17 @@ namespace WMS.Web.Domain.Services if (boxs == null || boxs.Count == 0) return Result.ReFailure(ResultCodes.BoxNoData); - //判断箱不存在所选的物料 - foreach (var item in boxs) + //只有采购入库-是选择了物料明细 + if (dto.IsPurchase) { - var isAnyHave= item.Details.Any(x => x.MaterialNumber == dto.MaterialNumber); - if(!isAnyHave) - return Result.ReFailure(ResultCodes.Contrast_Purchase_Count_Error); - //return Result.ReFailure(item.BoxBillNo + ResultCodes.BoxNoMaterialError.Item2, ResultCodes.BoxNoMaterialError.Item1); - + //判断箱不存在所选的物料 + foreach (var item in boxs) + { + var isAnyHave = item.Details.Any(x => x.MaterialNumber == dto.MaterialNumber); + if (!isAnyHave) + return Result.ReFailure(ResultCodes.Contrast_Purchase_Count_Error); + //return Result.ReFailure(item.BoxBillNo + ResultCodes.BoxNoMaterialError.Item2, ResultCodes.BoxNoMaterialError.Item1); + } }