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

7167-testToMaster_2414 #2244

Merged
alexm merged 643 commits from 7167-testToMaster_2414 into master 2024-04-04 05:32:41 +00:00
Conversation 0 Commits 643 Files Changed 208 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 09c9a3d7ef - Show all commits

10
db/routines/vn/procedures/boxPicking_print.sql
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;