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

fixes: refs #7760 collection problems #2888

Merged
carlosap merged 7 commits from 7760-Refactor-collection_assign into dev 2024-08-28 15:27:16 +00:00
Conversation 0 Commits 7 Files Changed 7 +8 -8
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 16fd69904b - Show all commits

2
db/routines/vn/procedures/collection_new.sql
View File

@ -165,7 +165,7 @@ BEGIN
OR (NOT pb.H AND pb.V > 0 AND vItemPackingTypeFk = 'H') OR (NOT pb.H AND pb.V > 0 AND vItemPackingTypeFk = 'H')
OR (NOT pb.V AND vItemPackingTypeFk = 'V') OR (NOT pb.V AND vItemPackingTypeFk = 'V')
OR (pc.isPreviousPreparationRequired AND pb.previousWithoutParking) OR (pc.isPreviousPreparationRequired AND pb.previousWithoutParking)
OR LENGTH(pb.problem) > 0 OR LENGTH(pb.problem)
carlosap marked this conversation as resolved Outdated
guillermo commented 2024-08-27 12:38:08 +00:00
Outdated
Review
Copy Link

LENGTH(pb.problem)

`LENGTH(pb.problem)`
OR pb.lines > vLinesLimit OR pb.lines > vLinesLimit
OR pb.m3 > vVolumeLimit OR pb.m3 > vVolumeLimit
OR sub.maxSize > vSizeLimit; OR sub.maxSize > vSizeLimit;

2
db/routines/vn/procedures/sales_mergeByCollection.sql
View File

@ -26,7 +26,7 @@ BEGIN
LEAVE myLoop; LEAVE myLoop;
END IF; END IF;
CALL vn.ticket_mergeSales(vTicketFk); CALL ticket_mergeSales(vTicketFk);
carlosap marked this conversation as resolved Outdated
guillermo commented 2024-08-27 12:31:47 +00:00
Outdated
Review
Copy Link

No poner vn.

No poner `vn.`
END LOOP; END LOOP;

12
db/routines/vn/procedures/ticket_splitItemPackingType.sql
View File

@ -18,7 +18,7 @@ BEGIN
DECLARE vItemPackingTypes CURSOR FOR DECLARE vItemPackingTypes CURSOR FOR
SELECT DISTINCT itemPackingTypeFk SELECT DISTINCT itemPackingTypeFk
FROM tmp.salesToMove; FROM tSalesToMove;
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
@ -33,13 +33,13 @@ BEGIN
CALL util.throw('The ticket has not sales with the itemPackingType'); CALL util.throw('The ticket has not sales with the itemPackingType');
END IF; END IF;
CREATE OR REPLACE TEMPORARY TABLE tmp.salesToMove ( CREATE OR REPLACE TEMPORARY TABLE tSalesToMove (
carlosap marked this conversation as resolved Outdated
guillermo commented 2024-08-27 12:33:36 +00:00
Outdated
Review
Copy Link

Como es una tabla que no sale del procedimiento, reenombrar a tSalesToMove

Como es una tabla que no sale del procedimiento, reenombrar a `tSalesToMove`
ticketFk INT, ticketFk INT,
saleFk INT, saleFk INT,
itemPackingTypeFk INT itemPackingTypeFk INT
) ENGINE=MEMORY; ) ENGINE=MEMORY;
INSERT INTO tmp.salesToMove (saleFk, itemPackingTypeFk) INSERT INTO tSalesToMove (saleFk, itemPackingTypeFk)
SELECT s.id, i.itemPackingTypeFk SELECT s.id, i.itemPackingTypeFk
FROM ticket t FROM ticket t
JOIN sale s ON s.ticketFk = t.id JOIN sale s ON s.ticketFk = t.id
@ -59,7 +59,7 @@ BEGIN
CALL ticket_Clone(vSelf, vNewTicketFk); CALL ticket_Clone(vSelf, vNewTicketFk);
UPDATE tmp.salesToMove UPDATE tSalesToMove
SET ticketFk = vNewTicketFk SET ticketFk = vNewTicketFk
WHERE itemPackingTypeFk = vItemPackingTypeFk; WHERE itemPackingTypeFk = vItemPackingTypeFk;
@ -68,10 +68,10 @@ BEGIN
CLOSE vItemPackingTypes; CLOSE vItemPackingTypes;
UPDATE sale s UPDATE sale s
JOIN tmp.salesToMove stm ON stm.saleFk = s.id JOIN tSalesToMove stm ON stm.saleFk = s.id
SET s.ticketFk = stm.ticketFk SET s.ticketFk = stm.ticketFk
WHERE stm.ticketFk; WHERE stm.ticketFk;
DROP TEMPORARY TABLE tmp.salesToMove; DROP TEMPORARY TABLE tSalesToMove;
END$$ END$$
DELIMITER ; DELIMITER ;