This commit is contained in:
2025-08-04 15:41:31 +08:00
parent dd6dc3f26a
commit 951498a77a

View File

@@ -300,18 +300,20 @@ namespace BarCode.Web.Domain.Services
{ {
if (dto.IsTwo == 2)//说明为两件装 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<string> s = new List<string>(); List<string> s = new List<string>();
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[0]);
s.Add(y[1]); s.Add(y[1]);
} }
s.Distinct(); s.Distinct();
var snGRList2 = await _serialNumbersRepositories.GetEntityList(s); var snGRList2 = await _serialNumbersRepositories.GetEntityList(s);
olist=snGRList2; olist=snGRList2;
} }
else else
{ {
@@ -322,10 +324,10 @@ namespace BarCode.Web.Domain.Services
} }
olist.ForEach(f => f.DownLoad()); olist.ForEach(f => f.DownLoad());
if(dto.IsTwo == 2) //if(dto.IsTwo == 2)
{ //{
snGRList.Union(olist); //snGRList.Find(olist.)
} //}
foreach (var g in generateRecords) foreach (var g in generateRecords)