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

7199-devToTest_2316 #2287

Merged
alexm merged 169 commits from 7199-devToTest_2316 into test 2024-04-11 06:25:23 +00:00
Conversation 0 Commits 169 Files Changed 105 +22 -14
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c942786783 - Show all commits

22
db/routines/vn/procedures/boxPicking_print.sql
View File

@ -59,6 +59,8 @@ BEGIN
WHERE saleFk = vSaleFk;
END IF;
SELECT vQuantity , vPacking;
w1: WHILE vQuantity >= vPacking DO
SET vItemShelvingFk = NULL;
@ -86,13 +88,13 @@ w1: WHILE vQuantity >= vPacking DO
LIMIT 1;
IF vItemShelvingFk THEN
INSERT INTO itemShelvingSale
/* INSERT INTO itemShelvingSale
SET itemShelvingFk = vItemShelvingFk,
saleFk = vSaleFk,
quantity = vPacking,
userFk = vUserFk,
isPicked = TRUE;
*/
SET vItemShelvingSaleFk = LAST_INSERT_ID();
UPDATE sale SET isPicked = FALSE WHERE id = vSaleFk;
@ -188,10 +190,12 @@ w1: WHILE vQuantity >= vPacking DO
WHERE id = vItemShelvingSaleFk;
SET vItemShelvingSaleFk = vItemShelvingSaleFk_old;
ELSE
UPDATE itemShelvingSale
/*ELSE
* UPDATE itemShelvingSale
SET saleFk = vNewSaleFk
WHERE id = vItemShelvingSaleFk;
*/
END IF;
ELSE
INSERT INTO sale(ticketFk, itemFk, concept, quantity, discount, price)
@ -206,9 +210,11 @@ w1: WHILE vQuantity >= vPacking DO
FROM saleComponent
WHERE saleFk = vSaleFk;
UPDATE itemShelvingSale
/*
* UPDATE itemShelvingSale
SET saleFk = vNewSaleFk
WHERE id = vItemShelvingSaleFk;
*/
END IF;
INSERT IGNORE INTO saleTracking(saleFk, isChecked, workerFk, stateFk)
@ -231,7 +237,8 @@ w1: WHILE vQuantity >= vPacking DO
packingSiteFk,
monitorId,
started,
ended
ended,
counter
)
SELECT vAgencyModeFk,
vNewTicketFk,
@ -243,7 +250,8 @@ w1: WHILE vQuantity >= vPacking DO
vPackingSiteFk,
ps.monitorId,
IFNULL(vLastExpeditionTimeStamp, NOW()),
NOW()
NOW(),
0
FROM packingSite ps
JOIN host h ON h.id = ps.hostFk
JOIN item i ON i.name = 'Shipping cost'

14
db/routines/vn/procedures/sale_boxPickingPrint.sql
View File

@ -86,7 +86,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 +94,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 +188,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 +206,9 @@ w1: WHILE vQuantity >= vPacking DO
FROM saleComponent
WHERE saleFk = vSaleFk;
UPDATE itemShelvingSale
SET saleFk = vNewSaleFk
WHERE id = vItemShelvingSaleFk;
/* UPDATE itemShelvingSale
SET saleFk = vNewSaleFk */
END IF;
INSERT IGNORE INTO saleTracking(saleFk, isChecked, workerFk, stateFk)