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

7226-testToMaster_2416 #2320

Merged
alexm merged 188 commits from 7226-testToMaster_2416 into master 2024-04-18 05:39:36 +00:00
Conversation 0 Commits 188 Files Changed 106 +43 -45
4 changed files with 43 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2226922366 - Show all commits

4
db/routines/vn/procedures/inventoryMake.sql
View File

@ -232,8 +232,6 @@ BEGIN
CLOSE cWarehouses; CLOSE cWarehouses;
UPDATE config SET inventoried = vInventoryDate; UPDATE config SET inventoried = vInventoryDate;
SET @isModeInventory := FALSE;
CREATE OR REPLACE TEMPORARY TABLE tEntryToDelete CREATE OR REPLACE TEMPORARY TABLE tEntryToDelete
(INDEX(entryId)) ENGINE = MEMORY (INDEX(entryId)) ENGINE = MEMORY
@ -262,6 +260,8 @@ BEGIN
FROM travel t FROM travel t
JOIN tEntryToDelete tmp ON tmp.travelId = t.id; JOIN tEntryToDelete tmp ON tmp.travelId = t.id;
SET @isModeInventory := FALSE;
DROP TEMPORARY TABLE IF EXISTS tEntryToDelete; DROP TEMPORARY TABLE IF EXISTS tEntryToDelete;
COMMIT; COMMIT;

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

@ -1,5 +1,5 @@
DELIMITER $$ DELIMITER $$
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_doCmr`(vSelf INT) CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_doCmr`(vSelf INT)
BEGIN BEGIN
/** /**
* Crea u actualiza la información del CMR asociado con * Crea u actualiza la información del CMR asociado con
@ -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;
@ -85,5 +82,5 @@ BEGIN
COMMIT; COMMIT;
DROP TEMPORARY TABLE tTicket; DROP TEMPORARY TABLE tTicket;
END$$ END$$
DELIMITER ; DELIMITER ;

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

@ -98,40 +98,38 @@ module.exports = Self => {
let stmts = []; let stmts = [];
const stmt = new ParameterizedSQL(` const stmt = new ParameterizedSQL(`
SELECT * SELECT *
FROM ( FROM (
SELECT t.cmrFk, SELECT t.cmrFk,
t.id ticketFk, t.id ticketFk,
t.routeFk, t.routeFk,
co.country, co.country,
t.clientFk, t.clientFk,
IF(sub.id, TRUE, FALSE) hasCmrDms, IF(sub.id, TRUE, FALSE) hasCmrDms,
DATE(t.shipped) shipped DATE(t.shipped) shipped
FROM ticket t FROM ticket t
JOIN ticketState ts ON ts.ticketFk = t.id JOIN ticketState ts ON ts.ticketFk = t.id
JOIN state s ON s.id = ts.stateFk JOIN state s ON s.id = ts.stateFk
JOIN alertLevel al ON al.id = s.alertLevel JOIN alertLevel al ON al.id = s.alertLevel
JOIN client c ON c.id = t.clientFk JOIN client c ON c.id = t.clientFk
JOIN address a ON a.id = t.addressFk JOIN address a ON a.id = t.addressFk
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 FROM ticketDms td
FROM ticketDms td JOIN dms d ON d.id = td.dmsFk
JOIN dms d ON d.id = td.dmsFk JOIN dmsType dt ON dt.id = d.dmsTypeFk
JOIN dmsType dt ON dt.id = d.dmsTypeFk WHERE dt.name = 'cmr'
WHERE dt.name = 'cmr' ) sub ON sub.ticketFk = t.id
) sub ON sub.ticketFk = t.id 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 t.cmrFk
AND dm.code = 'DELIVERY' ) sub
AND t.cmrFk `);
) sub
`);
stmt.merge(conn.makeSuffix(filter)); stmt.merge(conn.makeSuffix(filter));
const itemsIndex = stmts.push(stmt) - 1; const itemsIndex = stmts.push(stmt) - 1;

5
modules/ticket/back/methods/ticket/closure.js
View File

@ -152,7 +152,10 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
VALUES ('invoicingTicketError', ?) VALUES ('invoicingTicketError', ?)
`, [ticket.id + ' - ' + error]); `, [ticket.id + ' - ' + error]);
// Domain not found // Domain not found
if (error.responseCode == 450) return invalidEmail(ticket); if (error.responseCode == 450) {
await invalidEmail(ticket);
continue;
}
// Save tickets on a list of failed ids // Save tickets on a list of failed ids
failedtickets.push({ failedtickets.push({