7199-devToTest_2316 #2287

Merged
alexm merged 169 commits from 7199-devToTest_2316 into test 2024-04-11 06:25:23 +00:00
1 changed files with 11 additions and 7 deletions
Showing only changes of commit 9aae9677e6 - Show all commits

View File

@ -61,6 +61,8 @@ BEGIN
w1: WHILE vQuantity >= vPacking DO
SET vQuantity = vQuantity - vPacking;
SET vItemShelvingFk = NULL;
SELECT sub.id
@ -86,7 +88,7 @@ w1: WHILE vQuantity >= vPacking DO
LIMIT 1;
IF vItemShelvingFk THEN
/* INSERT INTO itemShelvingSale
INSERT INTO itemShelvingSale
SET itemShelvingFk = vItemShelvingFk,
saleFk = vSaleFk,
quantity = vPacking,
@ -94,7 +96,7 @@ w1: WHILE vQuantity >= vPacking DO
isPicked = TRUE;
SET vItemShelvingSaleFk = LAST_INSERT_ID();
*/
UPDATE sale SET isPicked = FALSE WHERE id = vSaleFk;
ELSE
LEAVE w1;
@ -188,10 +190,10 @@ w1: WHILE vQuantity >= vPacking DO
WHERE id = vItemShelvingSaleFk;
SET vItemShelvingSaleFk = vItemShelvingSaleFk_old;
/* ELSE
ELSE
UPDATE itemShelvingSale
SET saleFk = vNewSaleFk
WHERE id = vItemShelvingSaleFk; */
WHERE id = vItemShelvingSaleFk;
END IF;
ELSE
INSERT INTO sale(ticketFk, itemFk, concept, quantity, discount, price)
@ -206,9 +208,10 @@ w1: WHILE vQuantity >= vPacking DO
FROM saleComponent
WHERE saleFk = vSaleFk;
/* UPDATE itemShelvingSale
SET saleFk = vNewSaleFk */
UPDATE itemShelvingSale
SET saleFk = vNewSaleFk
WHERE id = vItemShelvingSaleFk;
END IF;
INSERT IGNORE INTO saleTracking(saleFk, isChecked, workerFk, stateFk)
@ -277,6 +280,7 @@ w1: WHILE vQuantity >= vPacking DO
DELETE FROM sale
WHERE quantity = 0
AND id = vSaleFk;
END WHILE;
END$$