diff --git a/src/BarCode.Web.Domain/Services/SerialNumberService.cs b/src/BarCode.Web.Domain/Services/SerialNumberService.cs index 334dccb..7fc52c2 100644 --- a/src/BarCode.Web.Domain/Services/SerialNumberService.cs +++ b/src/BarCode.Web.Domain/Services/SerialNumberService.cs @@ -94,12 +94,13 @@ namespace BarCode.Web.Domain.Services if (materials_result.IsSuccess) materials = materials_result.Data.ToList(); - + var cList = dto.Details.GroupBy(g => g.Specifications).Select(s => s.Key).ToList(); foreach (var s in cList) { - var m = materials.FirstOrDefault(w => w.Specifications.Equals(s)); + + var m = materials.FirstOrDefault(w => w.Specifications.Equals(s)&& w.isDis=="1"); var details = dto.Details.Where(w => w.Specifications.Equals(s)).ToList(); if (m == null) { @@ -110,6 +111,7 @@ namespace BarCode.Web.Domain.Services foreach (var de in details) { de.MaterialNumber = m.MaterialNumber; + //de.MaterialNumber = g.MaterialNumber; de.IdConvertBar = m.IdConvertBar; }