verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 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 +39 -38
2 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 690d935429 - Show all commits

4
db/routines/vn/procedures/ticket_Clone.sql
View File

@ -1,5 +1,5 @@
DELIMITER $$ DELIMITER $$
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_Clone`(vOriginalTicket INT, OUT vNewTicket INT,vWithWarehouse BOOLEAN) CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_Clone`(vOriginalTicket INT, OUT vNewTicket INT)
BEGIN BEGIN
/** /**
* Clona el contenido de un ticket en otro * Clona el contenido de un ticket en otro
@ -32,7 +32,7 @@ BEGIN
addressFk, addressFk,
agencyModeFk, agencyModeFk,
nickname, nickname,
IF(vWithWarehouse, warehouseFk, NULL), warehouseFk,
companyFk, companyFk,
landed, landed,
zoneFk, zoneFk,

19
db/routines/vn/procedures/ticket_CloneAll.sql
View File

@ -8,18 +8,19 @@ BEGIN
DECLARE cur1 CURSOR FOR DECLARE cur1 CURSOR FOR
SELECT id SELECT id
FROM vn.sale FROM sale
WHERE ticketFk = vTicketFk; WHERE ticketFk = vTicketFk;
DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
SET vNewShipped = IFNULL(vNewShipped, util.VN_CURDATE()); SET vNewShipped = IFNULL(vNewShipped, util.VN_CURDATE());
CALL vn.ticket_Clone(vTicketFk, vNewTicketFk, vWithWarehouse); CALL ticket_Clone(vTicketFk, vNewTicketFk, vWithWarehouse);
UPDATE vn.ticket UPDATE ticket
SET landed = TIMESTAMPADD(DAY, DATEDIFF(vNewShipped, shipped), landed), SET landed = TIMESTAMPADD(DAY, DATEDIFF(vNewShipped, shipped), landed),
shipped = vNewShipped shipped = vNewShipped,
warehouseFk = IF(vWithWarehouse, warehouseFk, NULL)
WHERE id = vNewTicketFk; WHERE id = vNewTicketFk;
OPEN cur1; OPEN cur1;
@ -32,18 +33,18 @@ BEGIN
LEAVE read_loop; LEAVE read_loop;
END IF; END IF;
INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price, discount, priceFixed, isPriceFixed) INSERT INTO sale(ticketFk, itemFk, quantity, concept, price, discount, priceFixed, isPriceFixed)
SELECT vNewTicketFk, itemFk, quantity, concept, price, discount, priceFixed, isPriceFixed SELECT vNewTicketFk, itemFk, quantity, concept, price, discount, priceFixed, isPriceFixed
FROM vn.sale FROM sale
WHERE id = vOldSaleFk; WHERE id = vOldSaleFk;
SELECT max(id) INTO vNewSaleFk SELECT max(id) INTO vNewSaleFk
FROM vn.sale FROM sale
WHERE ticketFk = vNewTicketFk; WHERE ticketFk = vNewTicketFk;
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 = vOldSaleFk; WHERE saleFk = vOldSaleFk;
END LOOP; END LOOP;