verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 68 Releases Wiki Activity

8713-testToMaster #3523

Merged
alexm merged 383 commits from 8713-testToMaster into master 2025-03-04 06:52:15 +00:00
Conversation 0 Commits 383 Files Changed 108 +18 -10
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ef4d639499 - Show all commits

28
db/routines/vn/procedures/ticket_canbePostponed.sql
View File

@ -30,11 +30,16 @@ BEGIN
st.code stateCode, st.code stateCode,
sub2.code futureStateCode, sub2.code futureStateCode,
st.classColor, st.classColor,
sub2.classColor futureClassColor sub2.classColor futureClassColor,
am.id agencyFk,
am.name agency,
sub2.agencyModeFk futureAgencyFk,
sub2.agencyMode futureAgency
FROM vn.saleVolume sv FROM vn.saleVolume sv
JOIN vn.sale s ON s.id = sv.saleFk JOIN vn.sale s ON s.id = sv.saleFk
JOIN vn.item i ON i.id = s.itemFk JOIN vn.item i ON i.id = s.itemFk
JOIN vn.ticket t ON t.id = sv.ticketFk JOIN vn.ticket t ON t.id = sv.ticketFk
JOIN vn.agencyMode am ON am.id = t.agencyModeFk
JOIN vn.address a ON a.id = t.addressFk JOIN vn.address a ON a.id = t.addressFk
JOIN vn.province p ON p.id = a.provinceFk JOIN vn.province p ON p.id = a.provinceFk
JOIN vn.country c ON c.id = p.countryFk JOIN vn.country c ON c.id = p.countryFk
@ -54,16 +59,19 @@ BEGIN
st.name state, st.name state,
st.code, st.code,
st.classColor, st.classColor,
am.id agencyModeFk,
am.name agencyMode,
GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) iptd GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) iptd
FROM vn.ticket t FROM vn.ticket t
JOIN vn.ticketState ts ON ts.ticketFk = t.id JOIN vn.agencyMode am ON am.id = t.agencyModeFk
JOIN vn.state st ON st.id = ts.stateFk JOIN vn.ticketState ts ON ts.ticketFk = t.id
JOIN vn.sale s ON s.ticketFk = t.id JOIN vn.state st ON st.id = ts.stateFk
JOIN vn.item i ON i.id = s.itemFk JOIN vn.sale s ON s.ticketFk = t.id
WHERE t.shipped BETWEEN vFutureDated JOIN vn.item i ON i.id = s.itemFk
AND util.dayend(vFutureDated) WHERE t.shipped BETWEEN vFutureDated
AND t.warehouseFk = vWarehouseFk AND util.dayend(vFutureDated)
GROUP BY t.id AND t.warehouseFk = vWarehouseFk
GROUP BY t.id
) sub ) sub
GROUP BY sub.addressFk GROUP BY sub.addressFk
) sub2 ON sub2.addressFk = t.addressFk AND t.id != sub2.id ) sub2 ON sub2.addressFk = t.addressFk AND t.id != sub2.id