From 1855b23c3fed84e7d867e0a23a8ea34c5e8485bf Mon Sep 17 00:00:00 2001 From: 18923810322 <1666941798@qq.com> Date: Mon, 4 Aug 2025 16:37:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/SerialNumberService.cs | 36 +++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/src/BarCode.Web.Domain/Services/SerialNumberService.cs b/src/BarCode.Web.Domain/Services/SerialNumberService.cs index 558714c..4e081b0 100644 --- a/src/BarCode.Web.Domain/Services/SerialNumberService.cs +++ b/src/BarCode.Web.Domain/Services/SerialNumberService.cs @@ -300,31 +300,55 @@ namespace BarCode.Web.Domain.Services { if (dto.IsTwo == 2)//说明为两件装 { + //// 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]); + // s.Add(y[1]); + // olist = snGRList.Where(w => dto.SerialNumbers.Contains(y[0])).ToList(); + // olist = snGRList.Where(w => dto.SerialNumbers.Contains(y[1])).ToList(); + //} + //s.Distinct(); + //var snGRList2 = await _serialNumbersRepositories.GetEntityList(s); + // olist=snGRList2; + + // 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; - + olist = snGRList2; + olist.ForEach(f => f.DownLoad()); + } else { olist = snGRList.Where(w => dto.SerialNumbers.Contains(w.SerialNumber)).ToList(); + olist.ForEach(f => f.DownLoad()); + } //olist = snGRList.Where(w => dto.SerialNumbers.Contains(w.TwoSerialNumber)).ToList(); } - olist.ForEach(f => f.DownLoad()); + //if(dto.IsTwo == 2) //{