7691-testToMaster #2703

Merged
alexm merged 268 commits from 7691-testToMaster into master 2024-07-09 05:38:28 +00:00
1 changed files with 6 additions and 4 deletions
Showing only changes of commit 22a6c3695c - Show all commits

View File

@ -37,12 +37,12 @@ proc: BEGIN
IF(pc.orderMode = 'Location', p.pickingOrder, ish.created);
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
/* DECLARE EXIT HANDLER FOR SQLEXCEPTION
DECLARE EXIT HANDLER FOR SQLEXCEPTION
BEGIN
ROLLBACK;
RESIGNAL;
END;
*/
SELECT MAX(p.pickingOrder), s.quantity - SUM(IFNULL(iss.quantity, 0))
INTO vLastPickingOrder, vOutStanding
FROM sale s
@ -67,6 +67,8 @@ proc: BEGIN
LEAVE l;
END IF;
START TRANSACTION;
SELECT id INTO vItemShelvingFk
FROM itemShelving
WHERE id = vItemShelvingFk
@ -76,7 +78,6 @@ proc: BEGIN
SET vOutStanding = vOutStanding - vReservedQuantity;
IF vReservedQuantity > 0 THEN
-- START TRANSACTION;
INSERT INTO itemShelvingSale(
itemShelvingFk,
@ -92,8 +93,9 @@ proc: BEGIN
SET available = available - vReservedQuantity
WHERE id = vItemShelvingFk;
-- COMMIT;
END IF;
COMMIT;
END LOOP;
CLOSE vItemShelvingAvailable;
END$$