7152-devToTest_2414 #2228

Merged
alexm merged 636 commits from 7152-devToTest_2414 into test 2024-03-28 08:26:34 +00:00
1 changed files with 5 additions and 5 deletions
Showing only changes of commit 09c9a3d7ef - Show all commits

View File

@ -26,7 +26,7 @@ BEGIN
DECLARE vParkingCode VARCHAR(10); DECLARE vParkingCode VARCHAR(10);
DECLARE vQuantity INT; DECLARE vQuantity INT;
DECLARE vRemainder INT DEFAULT 0; DECLARE vRemainder INT DEFAULT 0;
DECLARE vRestSaleFk INT; DECLARE vRemainderSaleFk INT;
DECLARE vShelving VARCHAR(10); DECLARE vShelving VARCHAR(10);
DECLARE vTicketFk INT; DECLARE vTicketFk INT;
@ -36,7 +36,7 @@ BEGIN
s.itemFk, s.itemFk,
s.concept s.concept
INTO vQuantity, INTO vQuantity,
vRest, vRemainder,
vTicketFk, vTicketFk,
vItemFk, vItemFk,
vConcept vConcept
@ -47,14 +47,14 @@ BEGIN
UPDATE sale SET quantity = quantity - vRemainder WHERE id = vSaleFk; UPDATE sale SET quantity = quantity - vRemainder WHERE id = vSaleFk;
INSERT INTO sale(ticketFk, itemFk, quantity, price, discount, concept) INSERT INTO sale(ticketFk, itemFk, quantity, price, discount, concept)
SELECT ticketFk, itemFk, vRest, price, discount, concept SELECT ticketFk, itemFk, vRemainder, price, discount, concept
FROM sale FROM sale
WHERE id = vSaleFk; WHERE id = vSaleFk;
SET vRestSaleFk = LAST_INSERT_ID(); SET vRemainderSaleFk = LAST_INSERT_ID();
INSERT INTO saleComponent(saleFk, componentFk, value) INSERT INTO saleComponent(saleFk, componentFk, value)
SELECT vRestSaleFk, componentFk, value SELECT vRemainderSaleFk, componentFk, value
FROM saleComponent FROM saleComponent
WHERE saleFk = vSaleFk; WHERE saleFk = vSaleFk;
END IF; END IF;