verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 49 Releases Wiki Activity

7152-devToTest_2414 #2228

Merged
alexm merged 636 commits from 7152-devToTest_2414 into test 2024-03-28 08:26:34 +00:00
Conversation 0 Commits 636 Files Changed 209 +34 -34
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c9431e605e - Show all commits

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

@ -25,7 +25,7 @@ BEGIN
DECLARE vNewTicketFk INT; DECLARE vNewTicketFk INT;
DECLARE vParkingCode VARCHAR(10); DECLARE vParkingCode VARCHAR(10);
DECLARE vQuantity INT; DECLARE vQuantity INT;
DECLARE vRest INT DEFAULT 0; DECLARE vRemainder INT DEFAULT 0;
DECLARE vRestSaleFk INT; DECLARE vRestSaleFk INT;
DECLARE vShelving VARCHAR(10); DECLARE vShelving VARCHAR(10);
DECLARE vTicketFk INT; DECLARE vTicketFk INT;
@ -43,19 +43,19 @@ BEGIN
FROM sale s FROM sale s
WHERE s.id = vSaleFk; WHERE s.id = vSaleFk;
IF vRest THEN IF vRemainder THEN
UPDATE sale SET quantity = quantity - vRest WHERE id = vSaleFk; UPDATE sale SET quantity = quantity - vRemainder WHERE id = vSaleFk;
INSERT INTO vn.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, vRest, price, discount, concept
FROM vn.sale FROM sale
WHERE id = vSaleFk; WHERE id = vSaleFk;
SET vRestSaleFk = LAST_INSERT_ID(); SET vRestSaleFk = LAST_INSERT_ID();
INSERT INTO vn.saleComponent(saleFk, componentFk, value) INSERT INTO saleComponent(saleFk, componentFk, value)
SELECT vRestSaleFk, componentFk, value SELECT vRestSaleFk, componentFk, value
FROM vn.saleComponent FROM saleComponent
WHERE saleFk = vSaleFk; WHERE saleFk = vSaleFk;
END IF; END IF;
@ -65,16 +65,16 @@ w1: WHILE vQuantity >= vPacking DO
SELECT sub.id SELECT sub.id
INTO vItemShelvingFk INTO vItemShelvingFk
FROM vn.productionConfig pc FROM productionConfig pc
JOIN ( JOIN (
SELECT ish.id, SELECT ish.id,
ish.visible - ifnull(SUM(iss.quantity),0) available, ish.visible - IFNULL(SUM(iss.quantity),0) available,
p.pickingOrder, p.pickingOrder,
ish.created ish.created
FROM vn.itemShelving ish FROM itemShelving ish
JOIN vn.shelving sh ON sh.code = ish.shelvingFk JOIN shelving sh ON sh.code = ish.shelvingFk
JOIN vn.parking p ON p.id = sh.parkingFk JOIN parking p ON p.id = sh.parkingFk
LEFT JOIN vn.itemShelvingSale iss LEFT JOIN itemShelvingSale iss
ON iss.itemShelvingFk = ish.id ON iss.itemShelvingFk = ish.id
AND iss.created >= CURDATE() AND iss.created >= CURDATE()
AND iss.isPicked = FALSE AND iss.isPicked = FALSE
@ -86,7 +86,7 @@ w1: WHILE vQuantity >= vPacking DO
LIMIT 1; LIMIT 1;
IF vItemShelvingFk THEN IF vItemShelvingFk THEN
INSERT INTO vn.itemShelvingSale INSERT INTO itemShelvingSale
SET itemShelvingFk = vItemShelvingFk, SET itemShelvingFk = vItemShelvingFk,
saleFk = vSaleFk, saleFk = vSaleFk,
quantity = vPacking, quantity = vPacking,
@ -95,7 +95,7 @@ w1: WHILE vQuantity >= vPacking DO
SET vItemShelvingSaleFk = LAST_INSERT_ID(); SET vItemShelvingSaleFk = LAST_INSERT_ID();
UPDATE vn.sale SET isPicked = FALSE WHERE id = vSaleFk; UPDATE sale SET isPicked = FALSE WHERE id = vSaleFk;
ELSE ELSE
LEAVE w1; LEAVE w1;
END IF; END IF;
@ -103,10 +103,10 @@ w1: WHILE vQuantity >= vPacking DO
SET vNewTicketFk = NULL; SET vNewTicketFk = NULL;
SELECT MAX(t.id) INTO vNewTicketFk SELECT MAX(t.id) INTO vNewTicketFk
FROM vn.ticket t FROM ticket t
JOIN vn.ticketLastState tls ON tls.ticketFk = t.id JOIN ticketLastState tls ON tls.ticketFk = t.id
JOIN (SELECT addressFk, clientFk, date(shipped) shipped, warehouseFk JOIN (SELECT addressFk, clientFk, date(shipped) shipped, warehouseFk
FROM vn.ticket FROM ticket
WHERE id = vTicketFk) tt WHERE id = vTicketFk) tt
ON tt.addressFk = t.addressFk ON tt.addressFk = t.addressFk
AND tt.clientFk = t.clientFk AND tt.clientFk = t.clientFk
@ -115,7 +115,7 @@ w1: WHILE vQuantity >= vPacking DO
WHERE tls.name = 'Encajado' ; WHERE tls.name = 'Encajado' ;
IF ISNULL(vNewTicketFk) THEN IF ISNULL(vNewTicketFk) THEN
INSERT INTO vn.ticket( clientFk, INSERT INTO ticket( clientFk,
shipped, shipped,
addressFk, addressFk,
agencyModeFk, agencyModeFk,
@ -145,7 +145,7 @@ w1: WHILE vQuantity >= vPacking DO
priority, priority,
hasPriority, hasPriority,
id id
FROM vn.ticket FROM ticket
WHERE id = vTicketFk; WHERE id = vTicketFk;
SET vNewTicketFk = LAST_INSERT_ID(); SET vNewTicketFk = LAST_INSERT_ID();
@ -175,16 +175,16 @@ w1: WHILE vQuantity >= vPacking DO
SET vItemShelvingSaleFk_old = NULL; SET vItemShelvingSaleFk_old = NULL;
SELECT MAX(id) INTO vItemShelvingSaleFk_old SELECT MAX(id) INTO vItemShelvingSaleFk_old
FROM vn.itemShelvingSale FROM itemShelvingSale
WHERE itemShelvingFk = vItemShelvingFk WHERE itemShelvingFk = vItemShelvingFk
AND saleFk = vNewSaleFk; AND saleFk = vNewSaleFk;
IF vItemShelvingSaleFk_old THEN IF vItemShelvingSaleFk_old THEN
UPDATE vn.itemShelvingSale UPDATE itemShelvingSale
SET quantity = quantity + vPacking SET quantity = quantity + vPacking
WHERE id = vItemShelvingSaleFk_old; WHERE id = vItemShelvingSaleFk_old;
DELETE FROM vn.itemShelvingSale DELETE FROM itemShelvingSale
WHERE id = vItemShelvingSaleFk; WHERE id = vItemShelvingSaleFk;
SET vItemShelvingSaleFk = vItemShelvingSaleFk_old; SET vItemShelvingSaleFk = vItemShelvingSaleFk_old;
@ -194,16 +194,16 @@ w1: WHILE vQuantity >= vPacking DO
WHERE id = vItemShelvingSaleFk; WHERE id = vItemShelvingSaleFk;
END IF; END IF;
ELSE ELSE
INSERT INTO vn.sale(ticketFk, itemFk, concept, quantity, discount, price) INSERT INTO sale(ticketFk, itemFk, concept, quantity, discount, price)
SELECT vNewTicketFk, itemFk, concept, vPacking, discount, price SELECT vNewTicketFk, itemFk, concept, vPacking, discount, price
FROM vn.sale FROM sale
WHERE id = vSaleFk; WHERE id = vSaleFk;
SET vNewSaleFk = LAST_INSERT_ID(); SET vNewSaleFk = LAST_INSERT_ID();
INSERT INTO vn.saleComponent(saleFk, componentFk, value, isGreuge) INSERT INTO saleComponent(saleFk, componentFk, value, isGreuge)
SELECT vNewSaleFk, componentFk, value, isGreuge SELECT vNewSaleFk, componentFk, value, isGreuge
FROM vn.saleComponent FROM saleComponent
WHERE saleFk = vSaleFk; WHERE saleFk = vSaleFk;
UPDATE itemShelvingSale UPDATE itemShelvingSale
@ -211,16 +211,16 @@ w1: WHILE vQuantity >= vPacking DO
WHERE id = vItemShelvingSaleFk; WHERE id = vItemShelvingSaleFk;
END IF; END IF;
INSERT IGNORE INTO vn.saleTracking(saleFk, isChecked, workerFk, stateFk) INSERT IGNORE INTO saleTracking(saleFk, isChecked, workerFk, stateFk)
SELECT vNewSaleFk, TRUE, vUserFk, id SELECT vNewSaleFk, TRUE, vUserFk, id
FROM vn.state FROM state
WHERE code = 'PREPARED'; WHERE code = 'PREPARED';
SELECT agencyModeFk INTO vAgencyModeFk SELECT agencyModeFk INTO vAgencyModeFk
FROM ticket FROM ticket
WHERE id = vNewTicketFk; WHERE id = vNewTicketFk;
INSERT INTO vn.expedition( INSERT INTO expedition(
agencyModeFk, agencyModeFk,
ticketFk, ticketFk,
freightItemFk, freightItemFk,
@ -242,8 +242,8 @@ w1: WHILE vQuantity >= vPacking DO
h.code, h.code,
vPackingSiteFk, vPackingSiteFk,
ps.monitorId, ps.monitorId,
IFNULL(vLastExpeditionTimeStamp, Now()), IFNULL(vLastExpeditionTimeStamp, NOW()),
Now() NOW()
FROM packingSite ps FROM packingSite ps
JOIN host h ON h.id = ps.hostFk JOIN host h ON h.id = ps.hostFk
JOIN item i ON i.name = 'Shipping cost' JOIN item i ON i.name = 'Shipping cost'
@ -252,7 +252,7 @@ w1: WHILE vQuantity >= vPacking DO
SET vExpeditionFk = LAST_INSERT_ID(); SET vExpeditionFk = LAST_INSERT_ID();
SET vLastExpeditionTimeStamp = Now(); SET vLastExpeditionTimeStamp = NOW();
CALL dipole.expedition_Add(vExpeditionFk,vPrinterFk, TRUE); CALL dipole.expedition_Add(vExpeditionFk,vPrinterFk, TRUE);
@ -274,7 +274,7 @@ w1: WHILE vQuantity >= vPacking DO
street = RIGHT(street, vMAxStreetLength) street = RIGHT(street, vMAxStreetLength)
WHERE expeditionFk = vExpeditionFk; WHERE expeditionFk = vExpeditionFk;
DELETE FROM vn.sale DELETE FROM sale
WHERE quantity = 0 WHERE quantity = 0
AND id = vSaleFk; AND id = vSaleFk;
END WHILE; END WHILE;