This commit is contained in:
tongfei
2024-04-19 09:32:31 +08:00
parent d7be459dc6
commit 19a98126a0
4 changed files with 29 additions and 9 deletions

View File

@@ -190,7 +190,8 @@ namespace WMS.Web.Repositories
ReceiveTime = x.box.CreateTime.HasValue ? x.box.CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
Receiver = x.box.ReceiverId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, companyId, x.box.ReceiverId.Value) : "",
Qty = x.detail.ReceiveQty,
ReceiveQty = x.detail.ReceiveQty
ReceiveQty = x.detail.ReceiveQty,
SerialNumbers= (string.Join(",", x.detail.SerialNumbers).TrimEnd(','))
}).ToListAsync();
if (boxList != null && boxList.Count != 0)
@@ -218,14 +219,14 @@ namespace WMS.Web.Repositories
});
}
//序列号
var materNumbs = boxList.GroupBy(x => x.MaterialNumber).Select(x => x.Key).ToList();
var serialNumbList = _context.SerialNumbers.Where(x => materNumbs.Contains(x.MaterialNumber)).ToList();
////序列号
//var materNumbs = boxList.GroupBy(x => x.MaterialNumber).Select(x => x.Key).ToList();
//var serialNumbList = _context.SerialNumbers.Where(x => materNumbs.Contains(x.MaterialNumber)).ToList();
boxList.ForEach(x =>
{
x.SerialNumbers = (string.Join(",", serialNumbList.Where(t => t.BoxId == x.BoxId && t.MaterialNumber == x.MaterialNumber).Select(t => t.SerialNumber).ToList())).TrimEnd(',');
});
//boxList.ForEach(x =>
//{
// x.SerialNumbers = (string.Join(",", serialNumbList.Where(t => t.BoxId == x.BoxId && t.MaterialNumber == x.MaterialNumber).Select(t => t.SerialNumber).ToList())).TrimEnd(',');
//});
}