diff --git a/src/BarCode.Web.Domain/Services/SerialNumberService.cs b/src/BarCode.Web.Domain/Services/SerialNumberService.cs index 7d9bdd4..dde0447 100644 --- a/src/BarCode.Web.Domain/Services/SerialNumberService.cs +++ b/src/BarCode.Web.Domain/Services/SerialNumberService.cs @@ -300,44 +300,47 @@ namespace BarCode.Web.Domain.Services { if (dto.IsTwo == 2)//说明为两件装 { + var olistTmp = snGRList.Where(w => dto.SerialNumbers.Contains(w.SerialNumber)).ToList(); + + List s = new List(); + for (var i = 0; i < olistTmp.Count; i++) + { + + string[] y = olistTmp[i].TwoSerialNumber.Split(','); + s.Add(y[0]); + s.Add(y[1]); + + } + s.Distinct(); + dto.SerialNumbers.AddRange(s); + dto.SerialNumbers.Distinct(); + //var snGRList2 = await _serialNumbersRepositories.GetEntityList(s); + //olist = snGRList2; + olist = snGRList.Where(w => dto.SerialNumbers.Contains(w.SerialNumber)).ToList(); + + olist.ForEach(f => f.DownLoad()); + //// var olistTmp=snGRList.Where(w => dto.SerialNumbers.Contains(w.SerialNumber)).ToList(); //olist = snGRList.Where(w => dto.SerialNumbers.Contains(w.SerialNumber)).ToList(); //List s = new List(); //for (var i = 0; i < olist.Count; i++) //{ - // string[] y= olist[i].TwoSerialNumber.Split(','); + // string[] y = olist[i].TwoSerialNumber.Split(','); // s.Add(y[0]); + // _logger.LogInformation($"序列号为{y[0]}"); // s.Add(y[1]); - // olist = snGRList.Where(w => dto.SerialNumbers.Contains(y[0])).ToList(); - // olist = snGRList.Where(w => dto.SerialNumbers.Contains(y[1])).ToList(); + // var olist1 = snGRList.Where(w => dto.SerialNumbers.Contains(y[0])).ToList(); + // olist1.ForEach(f => f.DownLoad()); + // var olist2 = snGRList.Where(w => dto.SerialNumbers.Contains(y[1])).ToList(); + // olist2.ForEach(f => f.DownLoad()); + // _logger.LogInformation($"序列号为{y[1]}"); //} - //s.Distinct(); - //var snGRList2 = await _serialNumbersRepositories.GetEntityList(s); - // olist=snGRList2; + ////s.Distinct(); + ////var snGRList2 = await _serialNumbersRepositories.GetEntityList(s); + ////olist = snGRList2; + ////olist.ForEach(f => f.DownLoad()); - - // var olistTmp=snGRList.Where(w => dto.SerialNumbers.Contains(w.SerialNumber)).ToList(); - olist = snGRList.Where(w => dto.SerialNumbers.Contains(w.SerialNumber)).ToList(); - List s = new List(); - for (var i = 0; i < olist.Count; i++) - { - - string[] y = olist[i].TwoSerialNumber.Split(','); - s.Add(y[0]); - _logger.LogInformation($"序列号为{y[0]}"); - s.Add(y[1]); - var olist1 = snGRList.Where(w => dto.SerialNumbers.Contains(y[0])).ToList(); - olist1.ForEach(f => f.DownLoad()); - var olist2 = snGRList.Where(w => dto.SerialNumbers.Contains(y[1])).ToList(); - olist2.ForEach(f => f.DownLoad()); - _logger.LogInformation($"序列号为{y[1]}"); - } - //s.Distinct(); - //var snGRList2 = await _serialNumbersRepositories.GetEntityList(s); - //olist = snGRList2; - //olist.ForEach(f => f.DownLoad()); - } else {