diff --git a/db/routines/vn/procedures/item_getBalance.sql b/db/routines/vn/procedures/item_getBalance.sql index c4974491cc..4c425e20be 100644 --- a/db/routines/vn/procedures/item_getBalance.sql +++ b/db/routines/vn/procedures/item_getBalance.sql @@ -30,7 +30,7 @@ BEGIN WITH entriesIn AS ( SELECT 'entry' originType, e.id originId, - tr.landed shipped, + IFNULL(tr.availabled, tr.landed) shipped, b.quantity `in`, NULL `out`, st.alertLevel , @@ -54,7 +54,7 @@ BEGIN OR (util.VN_CURDATE() AND tr.isReceived), 'DELIVERED', 'FREE') - WHERE tr.landed >= vDateInventory + WHERE IFNULL(tr.availabled, tr.landed) >= vDateInventory AND tr.warehouseInFk = vWarehouseFk AND (s.id <> vSupplierInventoryFk OR vDated IS NULL) AND b.itemFk = vItemFk @@ -99,7 +99,7 @@ BEGIN ), sales AS ( WITH itemSales AS ( - SELECT DATE(t.shipped) shipped, + SELECT DATE(t.shipped) + INTERVAL HOUR(z.`hour`) HOUR shipped, s.quantity, st2.alertLevel, st2.name, @@ -114,6 +114,7 @@ BEGIN cb.claimFk FROM vn.sale s JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.`zone` z ON z.id = t.zoneFk LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id LEFT JOIN vn.state st ON st.code = ts.code JOIN vn.client c ON c.id = t.clientFk @@ -189,14 +190,15 @@ BEGIN SELECT * FROM sales UNION ALL SELECT * FROM orders - ORDER BY shipped, + ORDER BY DATE(shipped), (inventorySupplierFk = entityId) DESC, alertLevel DESC, isTicket, `order` DESC, isPicked DESC, `in` DESC, - `out` DESC; + `out` DESC, + shipped; IF vDated IS NULL THEN SET @a := 0; @@ -205,7 +207,7 @@ BEGIN SELECT t.originType, t.originId, - DATE(@shipped:= t.shipped) shipped, + @shipped:= t.shipped, t.alertLevel, t.stateName, t.reference,