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

Hotfix Ticket #194195 Error radar negativos
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Andrés 2024-06-14 16:01:27 +02:00
parent 00d0703493
commit 5473f7a308
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
db/routines/vn/procedures/item_getAtp.sql
View File

@ -20,11 +20,13 @@ BEGIN
SELECT itemFk, warehouseFk, vDated, 0 SELECT itemFk, warehouseFk, vDated, 0
FROM (SELECT DISTINCT itemFk, warehouseFk FROM tmp.itemCalc) t2 FROM (SELECT DISTINCT itemFk, warehouseFk FROM tmp.itemCalc) t2
) t1 ) t1
GROUP BY itemFk, warehouseFk, dated; GROUP BY itemFk, warehouseFk, dated
HAVING warehouseFk
ORDER BY itemFk, warehouseFk, dated;
SET @lastItemFk = 0; SET @lastItemFk := 0;
SET @lastWareHouseFk = 0; SET @lastWareHouseFk := 0;
SET @lastQuantity = 0; SET @lastQuantity := 0;
CREATE OR REPLACE TEMPORARY TABLE tmp.itemAtp CREATE OR REPLACE TEMPORARY TABLE tmp.itemAtp
(INDEX (itemFk, wareHouseFk)) (INDEX (itemFk, wareHouseFk))
@ -32,15 +34,13 @@ BEGIN
FROM ( FROM (
SELECT SELECT
itemFk, itemFk,
IF(itemFk <> @lastItemFk OR wareHouseFk <> @lastWareHouseFk OR wareHouseFk IS NULL, IF(itemFk <> @lastItemFk OR wareHouseFk <> @lastWareHouseFk,
@lastQuantity := quantity, @lastQuantity := quantity,
@lastQuantity := @lastQuantity + quantity) quantityAccumulated, @lastQuantity := @lastQuantity + quantity) quantityAccumulated,
wareHouseFk, wareHouseFk,
@lastItemFk := itemFk, @lastItemFk := itemFk,
@lastWareHouseFk := wareHouseFk @lastWareHouseFk := wareHouseFk
FROM tItemOrdered FROM tItemOrdered
ORDER BY itemFk, warehouseFk, dated
LIMIT 10000000000000000000
)sub )sub
GROUP BY itemFk, wareHouseFk; GROUP BY itemFk, wareHouseFk;

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

@ -30,6 +30,7 @@ BEGIN
FROM sale s FROM sale s
JOIN ticket t ON t.id = s.ticketFk JOIN ticket t ON t.id = s.ticketFk
WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
AND t.warehouseFk
AND s.quantity != 0 AND s.quantity != 0
AND (vItemFk IS NULL OR s.itemFk = vItemFk) AND (vItemFk IS NULL OR s.itemFk = vItemFk)
AND (vWarehouseFk IS NULL OR t.warehouseFk = vWarehouseFk) AND (vWarehouseFk IS NULL OR t.warehouseFk = vWarehouseFk)
@ -40,7 +41,7 @@ BEGIN
t.warehouseInFk t.warehouseInFk
FROM buy b FROM buy b
JOIN entry e ON e.id = b.entryFk JOIN entry e ON e.id = b.entryFk
LEFT JOIN travel t ON t.id = e.travelFk JOIN travel t ON t.id = e.travelFk
WHERE t.landed BETWEEN vDatedFrom AND vDatedTo WHERE t.landed BETWEEN vDatedFrom AND vDatedTo
AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk) AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
AND !e.isExcludedFromAvailable AND !e.isExcludedFromAvailable
@ -53,7 +54,7 @@ BEGIN
t.warehouseOutFk t.warehouseOutFk
FROM buy b FROM buy b
JOIN entry e ON e.id = b.entryFk JOIN entry e ON e.id = b.entryFk
LEFT JOIN travel t ON t.id = e.travelFk JOIN travel t ON t.id = e.travelFk
WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
AND (vWarehouseFk IS NULL OR t.warehouseOutFk = vWarehouseFk) AND (vWarehouseFk IS NULL OR t.warehouseOutFk = vWarehouseFk)
AND !e.isExcludedFromAvailable AND !e.isExcludedFromAvailable