7596-devToTest_2426 #2600

Merged
alexm merged 115 commits from 7596-devToTest_2426 into test 2024-06-18 06:19:51 +00:00
1 changed files with 5 additions and 6 deletions
Showing only changes of commit 4cf5c0775c - Show all commits

View File

@ -16,7 +16,7 @@ BEGIN
a.nickname,
sub2.itemPackingTypeConcat,
est.code,
sub5.isScanned
es.isScanned
FROM expedition e
JOIN ticket t ON t.id = e.ticketFk
JOIN ticketState ts ON ts.ticketFk = e.ticketFk
@ -34,11 +34,10 @@ BEGIN
GROUP BY sub.ticketFk
) sub2 ON sub2.ticketFk = t.id
LEFT JOIN expeditionStateType est ON est.id = e.stateTypeFk
LEFT JOIN (SELECT es.expeditionFk, isScanned
FROM expeditionState es
JOIN (SELECT expeditionFk, MAX(id) maxId
FROM expeditionState es
GROUP BY expeditionFk)sub4 ON sub4.maxId = es.id)sub5 ON sub5.expeditionFk = e.id
LEFT JOIN expeditionState es ON es.id = (
SELECT MAX(id)
FROM expeditionState es
WHERE expeditionFk = e.id)
WHERE t.routeFk = vRouteFk AND e.freightItemFk <> FALSE
ORDER BY r.created, t.priority DESC;
END$$