verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 53 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 +6 -6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b97b61c7dd - Show all commits

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

@ -36,9 +36,9 @@ BEGIN
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 = 1; WHERE e.id = vOriginalEntry;
SELECT t.di INTO vNewTravelFk SELECT t.id INTO vNewTravelFk
FROM travel t FROM travel t
JOIN entry e ON e.travelFk = t.id JOIN entry e ON e.travelFk = t.id
WHERE t.shipped = util.VN_CURDATE() WHERE t.shipped = util.VN_CURDATE()
@ -49,7 +49,7 @@ BEGIN
AND isReceived =vIsReceived AND isReceived =vIsReceived
AND agencyModeFk = vAgencyModeFk; AND agencyModeFk = vAgencyModeFk;
IF NOT vNewTravelFk THEN IF vNewTravelFk IS NULL THEN
INSERT INTO travel( INSERT INTO travel(
shipped, shipped,
landed, landed,
@ -113,7 +113,7 @@ BEGIN
JOIN vn.parking p ON p.id = sh.parkingFk JOIN vn.parking p ON p.id = sh.parkingFk
JOIN vn.sector s ON s.id = p.sectorFk JOIN vn.sector s ON s.id = p.sectorFk
WHERE s.warehouseFk = vWarehouseFk WHERE s.warehouseFk = vWarehouseFk
AND sh.parked = util.VN_CURDATE() AND sh.parked BETWEEN CURDATE() AND util.dayend(CURDATE())
GROUP BY ish.itemFk GROUP BY ish.itemFk
), ),
sales AS ( sales AS (
@ -124,7 +124,7 @@ 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
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 BETWEEN CURDATE() AND util.dayend(CURDATE())
GROUP BY s.itemFk GROUP BY s.itemFk
) )
SELECT tmp.itemFk, SELECT tmp.itemFk,
@ -134,7 +134,7 @@ BEGIN
FROM tBuy tmp FROM tBuy tmp
LEFT JOIN itemShelvings iss ON tmp.itemFk = iss.itemFk LEFT JOIN itemShelvings iss ON tmp.itemFk = iss.itemFk
LEFT JOIN sales s ON s.itemFk = tmp.itemFk LEFT JOIN sales s ON s.itemFk = tmp.itemFk
WHERE visible = tmp.totalQuantity WHERE visible < tmp.totalQuantity
OR iss.itemFk IS NULL; OR iss.itemFk IS NULL;
UPDATE buy b UPDATE buy b