verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

hotfix: ticket168996 Now ticket_doCmr ignore deliveryMethod #2279

Merged
guillermo merged 2 commits from ticket168996-hotfix into master 2024-04-11 12:42:45 +00:00
Conversation 0 Commits 2 Files Changed 2 +37 -42
2 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
db/routines/vn/procedures/ticket_doCmr.sql
View File

@ -29,7 +29,6 @@ BEGIN
JOIN province p ON p.id = a.provinceFk JOIN province p ON p.id = a.provinceFk
JOIN country co ON co.id = p.countryFk JOIN country co ON co.id = p.countryFk
JOIN agencyMode am ON am.id = t.agencyModeFk JOIN agencyMode am ON am.id = t.agencyModeFk
JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
JOIN warehouse w ON w.id = t.warehouseFk JOIN warehouse w ON w.id = t.warehouseFk
JOIN company com ON com.id = t.companyFk JOIN company com ON com.id = t.companyFk
JOIN client c2 ON c2.id = com.clientFk JOIN client c2 ON c2.id = com.clientFk
@ -38,12 +37,10 @@ BEGIN
LEFT JOIN route r ON r.id = t.routeFk LEFT JOIN route r ON r.id = t.routeFk
LEFT JOIN worker wo ON wo.id = r.workerFk LEFT JOIN worker wo ON wo.id = r.workerFk
LEFT JOIN vehicle v ON v.id = r.vehicleFk LEFT JOIN vehicle v ON v.id = r.vehicleFk
WHERE t.shipped BETWEEN util.yesterday() AND util.dayEnd(util.VN_CURDATE()) WHERE al.code IN ('PACKED', 'DELIVERED')
AND al.code IN ('PACKED', 'DELIVERED')
AND co.code <> 'ES' AND co.code <> 'ES'
AND am.name <> 'ABONO' AND am.name <> 'ABONO'
AND w.code = 'ALG' AND w.code = 'ALG'
AND dm.code = 'DELIVERY'
AND t.id = vSelf AND t.id = vSelf
GROUP BY t.id; GROUP BY t.id;

2
modules/route/back/methods/route/getExternalCmrs.js
View File

@ -116,7 +116,6 @@ module.exports = Self => {
JOIN province p ON p.id = a.provinceFk JOIN province p ON p.id = a.provinceFk
JOIN country co ON co.id = p.countryFk JOIN country co ON co.id = p.countryFk
JOIN agencyMode am ON am.id = t.agencyModeFk JOIN agencyMode am ON am.id = t.agencyModeFk
JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
JOIN warehouse w ON w.id = t.warehouseFk JOIN warehouse w ON w.id = t.warehouseFk
LEFT JOIN ( LEFT JOIN (
SELECT td.ticketFk, d.id SELECT td.ticketFk, d.id
@ -128,7 +127,6 @@ module.exports = Self => {
WHERE co.code <> 'ES' WHERE co.code <> 'ES'
AND am.name <> 'ABONO' AND am.name <> 'ABONO'
AND w.code = 'ALG' AND w.code = 'ALG'
AND dm.code = 'DELIVERY'
AND t.cmrFk AND t.cmrFk
) sub ) sub
`); `);