Models: Add Dtos/
This commit is contained in:
@ -1,4 +1,5 @@
|
||||
using Elwig.Documents;
|
||||
using Elwig.Models.Dtos;
|
||||
using Elwig.Models.Entities;
|
||||
using Elwig.Windows;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
@ -84,17 +85,9 @@ namespace Elwig.Dialogs {
|
||||
list = list.Where((_, n) => n % 10 == r);
|
||||
}
|
||||
|
||||
var deliveries = await Context.DeliveryParts.FromSqlRaw($"""
|
||||
SELECT p.*
|
||||
FROM v_delivery v
|
||||
JOIN delivery_part p ON (p.year, p.did, p.dpnr) = (v.year, v.did, v.dpnr)
|
||||
WHERE v.year = {Year}
|
||||
ORDER BY v.sortid, v.abgewertet ASC, v.attribute_prio DESC, COALESCE(v.attrid, '~'), v.kmw DESC, v.lsnr, v.dpnr
|
||||
""")
|
||||
.ToListAsync();
|
||||
|
||||
var data = await DeliveryConfirmationData.ForSeason(Context.DeliveryParts, Year);
|
||||
using var doc = Document.Merge(list.Select(m =>
|
||||
new DeliveryConfirmation(Context, Year, m, deliveries.Where(d => d.Delivery.MgNr == m.MgNr).ToList()) {
|
||||
new DeliveryConfirmation(Context, Year, m, data[m.MgNr]) {
|
||||
//DoubleSided = true
|
||||
}
|
||||
));
|
||||
|
Reference in New Issue
Block a user