fix: refs #6778 Fix and tested
This commit is contained in:
parent
18c10e2dd7
commit
35fc8930ce
|
@ -75,7 +75,7 @@ BEGIN
|
||||||
DELETE g.*
|
DELETE g.*
|
||||||
FROM vn.greuge g
|
FROM vn.greuge g
|
||||||
JOIN tmp.ticket_list t ON g.ticketFk = t.Id_Ticket
|
JOIN tmp.ticket_list t ON g.ticketFk = t.Id_Ticket
|
||||||
WHERE t.greugeTypeFk = 2;
|
WHERE g.greugeTypeFk = 2;
|
||||||
|
|
||||||
INSERT INTO vn.greuge(clientFk, description, amount,shipped,
|
INSERT INTO vn.greuge(clientFk, description, amount,shipped,
|
||||||
greugeTypeFk, ticketFk)
|
greugeTypeFk, ticketFk)
|
||||||
|
|
|
@ -98,7 +98,7 @@ BEGIN
|
||||||
GROUP BY c.Id_Cliente) CmLy ON CmLy.Id_Cliente = c.Id_Cliente
|
GROUP BY c.Id_Cliente) CmLy ON CmLy.Id_Cliente = c.Id_Cliente
|
||||||
LEFT JOIN
|
LEFT JOIN
|
||||||
(SELECT c.Id_Cliente,
|
(SELECT c.Id_Cliente,
|
||||||
IF(MAX(Fecha) < DATE_FORMAT(TIMESTAMPADD(MONTH, - 1, vDate), '%Y- %m-01'), TRUE, FALSE) muerto
|
IF(MAX(io.issued) < DATE_FORMAT(TIMESTAMPADD(MONTH, - 1, vDate), '%Y- %m-01'), TRUE, FALSE) muerto
|
||||||
FROM vn.invoiceOut io
|
FROM vn.invoiceOut io
|
||||||
JOIN vn2008.Clientes c ON c.Id_cliente = io.clientFk
|
JOIN vn2008.Clientes c ON c.Id_cliente = io.clientFk
|
||||||
LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador
|
LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador
|
||||||
|
|
|
@ -16,7 +16,7 @@ BEGIN
|
||||||
FROM (
|
FROM (
|
||||||
SELECT DISTINCT t.Id_Ruta
|
SELECT DISTINCT t.Id_Ruta
|
||||||
FROM vn2008.scan_line sl
|
FROM vn2008.scan_line sl
|
||||||
JOIN expeditions e ON e.id = sl.code
|
JOIN expedition e ON e.id = sl.code
|
||||||
JOIN vn2008.Tickets t ON t.Id_Ticket = e.ticketFk
|
JOIN vn2008.Tickets t ON t.Id_Ticket = e.ticketFk
|
||||||
WHERE sl.scan_id = vScanId
|
WHERE sl.scan_id = vScanId
|
||||||
AND t.Id_Ruta
|
AND t.Id_Ruta
|
||||||
|
|
|
@ -7,9 +7,9 @@ BEGIN
|
||||||
date_format(e.created,'%Y-%m-%d') as expeditionDate,
|
date_format(e.created,'%Y-%m-%d') as expeditionDate,
|
||||||
e.ticketFk,
|
e.ticketFk,
|
||||||
t.routeFk as routeFk
|
t.routeFk as routeFk
|
||||||
FROM expeditions e
|
FROM expedition e
|
||||||
INNER JOIN vn.ticket t ON t.id = e.ticketFk
|
INNER JOIN ticket t ON t.id = e.ticketFk
|
||||||
WHERE DATE(odbc_date) = util.VN_CURDATE();
|
WHERE DATE(e.created) = util.VN_CURDATE();
|
||||||
|
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
@ -143,8 +143,8 @@ proc:BEGIN
|
||||||
CREATE TEMPORARY TABLE tmp.itemOutTime
|
CREATE TEMPORARY TABLE tmp.itemOutTime
|
||||||
SELECT *,SUM(amount) quantity
|
SELECT *,SUM(amount) quantity
|
||||||
FROM
|
FROM
|
||||||
(SELECT item_id itemFk,
|
(SELECT io.itemFk,
|
||||||
amount,
|
io.quantity amount,
|
||||||
IF(HOUR(t.shipped), HOUR(t.shipped), HOUR(z.`hour`)) as hours,
|
IF(HOUR(t.shipped), HOUR(t.shipped), HOUR(z.`hour`)) as hours,
|
||||||
IF(MINUTE(t.shipped), MINUTE(t.shipped), MINUTE(z.`hour`)) as minutes
|
IF(MINUTE(t.shipped), MINUTE(t.shipped), MINUTE(z.`hour`)) as minutes
|
||||||
FROM itemTicketOut io
|
FROM itemTicketOut io
|
||||||
|
|
|
@ -47,7 +47,7 @@ BEGIN
|
||||||
|
|
||||||
UNION ALL
|
UNION ALL
|
||||||
|
|
||||||
SELECT d.companyFk, io.clientFk Id_Cliente, - io.amount
|
SELECT io.companyFk, io.clientFk Id_Cliente, - io.amount
|
||||||
FROM vn.invoiceOut io
|
FROM vn.invoiceOut io
|
||||||
JOIN Clientes c ON c.Id_Cliente = io.clientFk
|
JOIN Clientes c ON c.Id_Cliente = io.clientFk
|
||||||
JOIN pay_met pm on pm.id = pay_met_id
|
JOIN pay_met pm on pm.id = pay_met_id
|
||||||
|
|
|
@ -13,9 +13,9 @@ SELECT Agencia,
|
||||||
FROM Tickets ti
|
FROM Tickets ti
|
||||||
INNER JOIN Consignatarios ON ti.Id_Consigna = Consignatarios.Id_consigna
|
INNER JOIN Consignatarios ON ti.Id_Consigna = Consignatarios.Id_consigna
|
||||||
INNER JOIN Agencias ON ti.Id_Agencia = Agencias.Id_Agencia
|
INNER JOIN Agencias ON ti.Id_Agencia = Agencias.Id_Agencia
|
||||||
LEFT JOIN (SELECT ticketFk,count(*) AS ncajas FROM vn.expedition WHERE Id_Article=94 GROUP BY ticket_id) sub1 ON ti.Id_Ticket=sub1.ticketFk
|
LEFT JOIN (SELECT ticketFk,count(*) AS ncajas FROM vn.expedition WHERE packagingFk=94 GROUP BY ticketFk) sub1 ON ti.Id_Ticket=sub1.ticketFk
|
||||||
LEFT JOIN (SELECT ticketFk,count(*) AS nbultos FROM vn.expedition WHERE Id_Article IS NULL GROUP BY ticket_id) sub2 ON ti.Id_Ticket=sub2.ticketFk
|
LEFT JOIN (SELECT ticketFk,count(*) AS nbultos FROM vn.expedition WHERE packagingFk IS NULL GROUP BY ticketFk) sub2 ON ti.Id_Ticket=sub2.ticketFk
|
||||||
LEFT JOIN (SELECT ticketFk,count(*) AS notros FROM vn.expedition WHERE Id_Article >0 GROUP BY ticket_id) sub3 ON ti.Id_Ticket=sub3.ticketFk
|
LEFT JOIN (SELECT ticketFk,count(*) AS notros FROM vn.expedition WHERE packagingFk >0 GROUP BY ticketFk) sub3 ON ti.Id_Ticket=sub3.ticketFk
|
||||||
INNER JOIN vn.ticketState ts ON ti.Id_ticket = ts.ticketFk
|
INNER JOIN vn.ticketState ts ON ti.Id_ticket = ts.ticketFk
|
||||||
WHERE ti.Fecha=util.VN_CURDATE() AND
|
WHERE ti.Fecha=util.VN_CURDATE() AND
|
||||||
ts.userFk=intId_Trabajador
|
ts.userFk=intId_Trabajador
|
||||||
|
|
|
@ -69,7 +69,7 @@ proc: BEGIN
|
||||||
ENGINE = MEMORY
|
ENGINE = MEMORY
|
||||||
SELECT i.itemFk, vWarehouseLanding warehouseFk, i.shipped dated, i.quantity
|
SELECT i.itemFk, vWarehouseLanding warehouseFk, i.shipped dated, i.quantity
|
||||||
FROM vn.itemTicketOut i
|
FROM vn.itemTicketOut i
|
||||||
JOIN itemRangeLive ir ON ir.itemFK = i.item_id
|
JOIN itemRangeLive ir ON ir.itemFK = i.itemFk
|
||||||
WHERE i.shipped >= vDatedFrom
|
WHERE i.shipped >= vDatedFrom
|
||||||
AND (ir.dated IS NULL OR i.shipped <= ir.dated)
|
AND (ir.dated IS NULL OR i.shipped <= ir.dated)
|
||||||
AND i.warehouseFk = vWarehouseLanding
|
AND i.warehouseFk = vWarehouseLanding
|
||||||
|
|
|
@ -18,11 +18,11 @@ SELECT * FROM
|
||||||
WHERE Id_Cliente = vCustomer
|
WHERE Id_Cliente = vCustomer
|
||||||
AND Fechacobro >= '2017-01-01'
|
AND Fechacobro >= '2017-01-01'
|
||||||
UNION ALL
|
UNION ALL
|
||||||
SELECT vn.getDueDate(io.issued,c.Vencimiento), - Importe
|
SELECT vn.getDueDate(io.issued,c.Vencimiento), - io.amount
|
||||||
FROM vn.invoiceOut io
|
FROM vn.invoiceOut io
|
||||||
JOIN Clientes c ON io.clientFk = c.Id_Cliente
|
JOIN Clientes c ON io.clientFk = c.Id_Cliente
|
||||||
WHERE io.clientFk = vCustomer
|
WHERE io.clientFk = vCustomer
|
||||||
AND Fecha >= '2017-01-01'
|
AND io.issued >= '2017-01-01'
|
||||||
UNION ALL
|
UNION ALL
|
||||||
SELECT '2016-12-31', Debt
|
SELECT '2016-12-31', Debt
|
||||||
FROM bi.customerDebtInventory
|
FROM bi.customerDebtInventory
|
||||||
|
|
Loading…
Reference in New Issue