verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

7729-devToTest_2430 #2739

Merged
alexm merged 339 commits from 7729-devToTest_2430 into test 2024-07-16 07:11:37 +00:00
Conversation 0 Commits 339 Files Changed 242 +80 -91
2 changed files with 80 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4f9552379e - Show all commits

158
db/routines/vn/procedures/entry_splitByShelving.sql
View File

@ -9,70 +9,81 @@ BEGIN
* @param vToEntryFk Entrada destino * @param vToEntryFk Entrada destino
*/ */
DECLARE vBuyFk INT; DECLARE vBuyFk INT;
DECLARE vIshStickers INT; DECLARE vIshStickers INT;
DECLARE vBuyStickers INT; DECLARE vBuyStickers INT;
DECLARE vDone BOOLEAN DEFAULT FALSE; DECLARE vDone BOOLEAN DEFAULT FALSE;
DECLARE cur CURSOR FOR DECLARE cur CURSOR FOR
SELECT bb.id buyFk, SELECT bb.id buyFk,
FLOOR(ish.visible / ish.packing) ishStickers, FLOOR(ish.visible / ish.packing) ishStickers,
bb.stickers buyStickers bb.stickers buyStickers
FROM vn.itemShelving ish FROM itemShelving ish
JOIN (SELECT b.id, b.itemFk, b.stickers JOIN (SELECT b.id, b.itemFk, b.stickers
FROM vn.buy b FROM buy b
WHERE b.entryFk = vFromEntryFk WHERE b.entryFk = vFromEntryFk
ORDER BY b.stickers DESC ORDER BY b.stickers DESC
LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk
AND bb.stickers >= FLOOR(ish.visible / ish.packing) AND bb.stickers >= FLOOR(ish.visible / ish.packing)
WHERE shelvingFk = vShelvingFk COLLATE utf8_general_ci WHERE ish.shelvingFk = vShelvingFk COLLATE utf8_general_ci
GROUP BY ish.id; AND NOT ish.isSplit
GROUP BY ish.id;
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-- Cantidades de la matrícula que exceden la de las entradas OPEN cur;
SELECT ish.itemFk,
i.longName,
FLOOR(ish.visible / ish.packing) AS etiEnMatricula,
bb.stickers etiEnEntrada
FROM vn.itemShelving ish
JOIN vn.item i ON i.id = ish.itemFk
LEFT JOIN (SELECT b.id, b.itemFk, b.stickers
FROM vn.buy b
WHERE b.entryFk = vFromEntryFk
ORDER BY b.stickers DESC
LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk
WHERE shelvingFk = vShelvingFk COLLATE utf8_general_ci
AND IFNULL(bb.stickers,0) < FLOOR(ish.visible / ish.packing)
GROUP BY ish.id;
OPEN cur; read_loop: LOOP
SET vDone = FALSE;
read_loop: LOOP FETCH cur INTO vBuyFk, vIshStickers, vBuyStickers;
SET vDone = FALSE;
FETCH cur INTO vBuyFk, vIshStickers, vBuyStickers; IF vDone THEN
LEAVE read_loop;
END IF;
IF vDone THEN IF vIshStickers = vBuyStickers THEN
LEAVE read_loop; UPDATE buy
END IF; SET entryFk = vToEntryFk
WHERE id = vBuyFk;
ELSE
UPDATE buy
SET stickers = stickers - vIshStickers,
quantity = stickers * packing
WHERE id = vBuyFk;
IF vIshStickers = vBuyStickers THEN INSERT INTO buy(entryFk,
UPDATE vn.buy itemFk,
SET entryFk = vToEntryFk quantity,
WHERE id = vBuyFk; buyingValue,
ELSE freightValue,
UPDATE vn.buy isIgnored,
SET stickers = stickers - vIshStickers, stickers,
quantity = stickers * packing packing,
WHERE id = vBuyFk; `grouping`,
groupingMode,
INSERT INTO vn.buy(entryFk, comissionValue,
packageValue,
location,
packagingFk,
price1,
price2,
price3,
minPrice,
workerFk,
isChecked,
isPickedOff,
ektFk,
weight,
deliveryFk,
itemOriginalFk)
SELECT
vToEntryFk,
itemFk, itemFk,
quantity, vIshStickers * packing,
buyingValue, buyingValue,
freightValue, freightValue,
isIgnored, isIgnored,
stickers, vIshStickers,
packing, packing,
`grouping`, `grouping`,
groupingMode, groupingMode,
@ -90,40 +101,17 @@ BEGIN
ektFk, ektFk,
weight, weight,
deliveryFk, deliveryFk,
itemOriginalFk) itemOriginalFk
SELECT FROM buy
vToEntryFk, WHERE id = vBuyFk;
itemFk,
vIshStickers * packing,
buyingValue,
freightValue,
isIgnored,
vIshStickers,
packing,
`grouping`,
groupingMode,
comissionValue,
packageValue,
location,
packagingFk,
price1,
price2,
price3,
minPrice,
workerFk,
isChecked,
isPickedOff,
ektFk,
weight,
deliveryFk,
itemOriginalFk
FROM vn.buy
WHERE id = vBuyFk;
UPDATE buy SET printedStickers = vIshStickers WHERE id = LAST_INSERT_ID(); UPDATE buy SET printedStickers = vIshStickers WHERE id = LAST_INSERT_ID();
END IF; END IF;
END LOOP;
CLOSE cur; UPDATE itemShelving
SET isSplit = TRUE
WHERE shelvingFk = vShelvingFk;
END LOOP;
CLOSE cur;
END$$ END$$
DELIMITER ; DELIMITER ;

1
db/versions/11131-brownPhormium/00-firstScript.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE vn.itemShelving ADD isSplit tinyint(1) NULL COMMENT 'Este valor cambia al splitar un carro que se ha quedado en holanda';