This commit is contained in:
2025-08-04 16:37:12 +08:00
parent 3dc39b9a73
commit 1855b23c3f

View File

@@ -300,31 +300,55 @@ namespace BarCode.Web.Domain.Services
{ {
if (dto.IsTwo == 2)//说明为两件装 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<string> s = new List<string>();
//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(); // var olistTmp=snGRList.Where(w => dto.SerialNumbers.Contains(w.SerialNumber)).ToList();
olist = 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 < olist.Count; i++) for (var i = 0; i < olist.Count; i++)
{ {
string[] y= olist[i].TwoSerialNumber.Split(','); string[] y = olist[i].TwoSerialNumber.Split(',');
s.Add(y[0]); s.Add(y[0]);
_logger.LogInformation($"序列号为{y[0]}");
s.Add(y[1]); s.Add(y[1]);
olist = snGRList.Where(w => dto.SerialNumbers.Contains(y[0])).ToList(); var olist1 = snGRList.Where(w => dto.SerialNumbers.Contains(y[0])).ToList();
olist = snGRList.Where(w => dto.SerialNumbers.Contains(y[1])).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(); s.Distinct();
var snGRList2 = await _serialNumbersRepositories.GetEntityList(s); var snGRList2 = await _serialNumbersRepositories.GetEntityList(s);
olist=snGRList2; olist = snGRList2;
olist.ForEach(f => f.DownLoad());
} }
else else
{ {
olist = snGRList.Where(w => dto.SerialNumbers.Contains(w.SerialNumber)).ToList(); 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 = snGRList.Where(w => dto.SerialNumbers.Contains(w.TwoSerialNumber)).ToList();
} }
olist.ForEach(f => f.DownLoad());
//if(dto.IsTwo == 2) //if(dto.IsTwo == 2)
//{ //{