From 951498a77ab811150773e6d27abdd3fee1c2f557 Mon Sep 17 00:00:00 2001 From: 18923810322 <1666941798@qq.com> Date: Mon, 4 Aug 2025 15:41:31 +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 | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/BarCode.Web.Domain/Services/SerialNumberService.cs b/src/BarCode.Web.Domain/Services/SerialNumberService.cs index 97b3bf9..a9b76ae 100644 --- a/src/BarCode.Web.Domain/Services/SerialNumberService.cs +++ b/src/BarCode.Web.Domain/Services/SerialNumberService.cs @@ -300,18 +300,20 @@ namespace BarCode.Web.Domain.Services { if (dto.IsTwo == 2)//说明为两件装 { - var olistTmp=snGRList.Where(w => dto.SerialNumbers.Contains(w.SerialNumber)).ToList(); + // 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 < olistTmp.Count; i++) + for (var i = 0; i < olist.Count; i++) { - string[] y= olistTmp[i].TwoSerialNumber.Split(','); + string[] y= olist[i].TwoSerialNumber.Split(','); s.Add(y[0]); s.Add(y[1]); } s.Distinct(); var snGRList2 = await _serialNumbersRepositories.GetEntityList(s); - olist=snGRList2; + olist=snGRList2; + } else { @@ -322,10 +324,10 @@ namespace BarCode.Web.Domain.Services } olist.ForEach(f => f.DownLoad()); - if(dto.IsTwo == 2) - { - snGRList.Union(olist); - } + //if(dto.IsTwo == 2) + //{ + //snGRList.Find(olist.) + //} foreach (var g in generateRecords)