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

8524-devToTest #3415

Merged
alexm merged 343 commits from 8524-devToTest into test 2025-02-04 13:42:16 +00:00
Conversation 0 Commits 343 Files Changed 127 +10 -11
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ab1eed66df - Show all commits

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

@ -18,7 +18,7 @@ BEGIN
DECLARE vRef INT; DECLARE vRef INT;
DECLARE vIsReceived INT; DECLARE vIsReceived INT;
DECLARE vAgencyModeFk INT; DECLARE vAgencyModeFk INT;
DECLARE vNewTravelFk INT; DECLARE vTomorrow DATETIME DEFAULT util.tomorrow();
DECLARE EXIT HANDLER FOR SQLEXCEPTION DECLARE EXIT HANDLER FOR SQLEXCEPTION
BEGIN BEGIN
@ -32,24 +32,23 @@ BEGIN
START TRANSACTION; START TRANSACTION;
-- Hay que crear un nuevo travel, con salida hoy y llegada mañana y asignar la entrada nueva al nuevo travel. -- Hay que crear un nuevo travel, con salida hoy y llegada mañana y asignar la entrada nueva al nuevo travel.
SELECT warehouseInFk,warehouseOutFk,`ref`,isReceived ,agencyModeFk SELECT t.warehouseInFk, t.warehouseOutFk, t.`ref`, t.isReceived, t.agencyModeFk
INTO vWarehouseInFk,vWarehouseOutFk, vRef,vIsReceived, vAgencyModeFk INTO vWarehouseInFk, vWarehouseOutFk, vRef, vIsReceived, vAgencyModeFk
FROM travel t FROM travel t
JOIN entry e ON e.travelFk = t.id JOIN entry e ON e.travelFk = t.id
WHERE e.id = vOriginalEntry; WHERE e.id = vOriginalEntry;
SELECT t.id INTO vNewTravelFk SELECT id INTO vTravelFk
FROM travel t FROM travel t
JOIN entry e ON e.travelFk = t.id WHERE shipped = util.VN_CURDATE()
WHERE t.shipped = util.VN_CURDATE() AND landed = vTomorrow
AND t.landed = util.VN_CURDATE() + INTERVAL 1 DAY
AND warehouseInFk = vWarehouseInFk AND warehouseInFk = vWarehouseInFk
AND warehouseOutFk = vWarehouseOutFk AND warehouseOutFk = vWarehouseOutFk
AND `ref` = vRef AND `ref` = vRef
AND isReceived =vIsReceived AND isReceived =vIsReceived
AND agencyModeFk = vAgencyModeFk; AND agencyModeFk = vAgencyModeFk;
IF vNewTravelFk IS NULL THEN IF vTravelFk IS NULL THEN
INSERT INTO travel( INSERT INTO travel(
shipped, shipped,
landed, landed,
@ -59,7 +58,7 @@ BEGIN
isReceived, isReceived,
agencyModeFk) agencyModeFk)
SELECT util.VN_CURDATE(), SELECT util.VN_CURDATE(),
util.VN_CURDATE() + INTERVAL 1 DAY, vTomorrow,
t.warehouseInFk, t.warehouseInFk,
t.warehouseOutFk, t.warehouseOutFk,
t.`ref`, t.`ref`,
@ -70,8 +69,6 @@ BEGIN
WHERE e.id = vOriginalEntry; WHERE e.id = vOriginalEntry;
SET vTravelFk = LAST_INSERT_ID(); SET vTravelFk = LAST_INSERT_ID();
ELSE
SET vTravelFk = vNewTravelFk;
END IF; END IF;
UPDATE entry UPDATE entry
@ -115,6 +112,7 @@ BEGIN
JOIN vn.sector s ON s.id = p.sectorFk JOIN vn.sector s ON s.id = p.sectorFk
JOIN vn.buy b ON b.id = ish.buyFk JOIN vn.buy b ON b.id = ish.buyFk
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
WHERE s.warehouseFk = vWarehouseFk WHERE s.warehouseFk = vWarehouseFk
AND sh.parked >= util.VN_CURDATE() AND sh.parked >= util.VN_CURDATE()
GROUP BY ish.itemFk GROUP BY ish.itemFk
@ -126,6 +124,7 @@ BEGIN
JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id
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
WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE()) WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
AND s2.parked >= util.VN_CURDATE() AND s2.parked >= util.VN_CURDATE()
GROUP BY s.itemFk GROUP BY s.itemFk