verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 49 Releases Wiki Activity

feat: refs #6822 change request
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Robert Ferrús 2025-01-23 12:59:32 +01:00
parent 1816ff6cf4
commit d8847d3d09
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ BEGIN
DECLARE vIsReceived INT; DECLARE vIsReceived INT;
DECLARE vAgencyModeFk INT; DECLARE vAgencyModeFk INT;
DECLARE vTomorrow DATETIME DEFAULT util.tomorrow(); DECLARE vTomorrow DATETIME DEFAULT util.tomorrow();
DECLARE vCurDate DATE DEFAULT util.VN_CURDATE();
DECLARE vIsRequiredTx BOOL DEFAULT NOT @@in_transaction; DECLARE vIsRequiredTx BOOL DEFAULT NOT @@in_transaction;
DECLARE EXIT HANDLER FOR SQLEXCEPTION DECLARE EXIT HANDLER FOR SQLEXCEPTION
@ -41,7 +42,7 @@ BEGIN
SELECT id INTO vTravelFk SELECT id INTO vTravelFk
FROM travel t FROM travel t
WHERE shipped = util.VN_CURDATE() WHERE shipped = vCurDate
AND landed = vTomorrow AND landed = vTomorrow
AND warehouseInFk = vWarehouseInFk AND warehouseInFk = vWarehouseInFk
AND warehouseOutFk = vWarehouseOutFk AND warehouseOutFk = vWarehouseOutFk
@ -58,7 +59,7 @@ BEGIN
`ref`, `ref`,
isReceived, isReceived,
agencyModeFk) agencyModeFk)
SELECT util.VN_CURDATE(), SELECT vCurDate,
vTomorrow, vTomorrow,
t.warehouseInFk, t.warehouseInFk,
t.warehouseOutFk, t.warehouseOutFk,
@ -116,7 +117,7 @@ BEGIN
JOIN vn.entry e ON e.id = b.entryFk JOIN vn.entry e ON e.id = b.entryFk
JOIN tBuy t ON t.itemFk = ish.itemFk JOIN tBuy t ON t.itemFk = ish.itemFk
WHERE s.warehouseFk = vWarehouseFk WHERE s.warehouseFk = vWarehouseFk
AND sh.parked >= util.VN_CURDATE() AND sh.parked >= vCurDate
GROUP BY ish.itemFk GROUP BY ish.itemFk
), ),
sales AS ( sales AS (
@ -127,8 +128,8 @@ BEGIN
JOIN vn.itemShelving is2 ON is2.id = iss.itemShelvingFk JOIN vn.itemShelving is2 ON is2.id = iss.itemShelvingFk
JOIN vn.shelving s2 ON s2.id = is2.shelvingFk JOIN vn.shelving s2 ON s2.id = is2.shelvingFk
JOIN tBuy t ON t.itemFk = s.itemFk JOIN tBuy t ON t.itemFk = s.itemFk
WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE()) WHERE t.shipped BETWEEN vCurDate AND util.dayend(vCurDate)
AND s2.parked >= util.VN_CURDATE() AND s2.parked >= vCurDate
GROUP BY s.itemFk GROUP BY s.itemFk
) )
SELECT tmp.itemFk, SELECT tmp.itemFk,
@ -152,6 +153,6 @@ BEGIN
CALL util.tx_commit(vIsRequiredTx); CALL util.tx_commit(vIsRequiredTx);
CALL cache.visible_refresh(@c,TRUE,vWarehouseFk); CALL cache.visible_refresh(@c,TRUE,vWarehouseFk);
CALL cache.available_refresh(@c, TRUE, vWarehouseFk, util.VN_CURDATE()); CALL cache.available_refresh(@c, TRUE, vWarehouseFk, vCurDate);
END$$ END$$
DELIMITER ; DELIMITER ;