8713-testToMaster #3523

Merged
alexm merged 383 commits from 8713-testToMaster into master 2025-03-04 06:52:15 +00:00
1 changed files with 7 additions and 2 deletions
Showing only changes of commit c0b1f3337c - Show all commits

View File

@ -1,5 +1,7 @@
DELIMITER $$
CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_doCmr`(vSelf INT)
CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_doCmr`(
vSelf INT
)
BEGIN
/**
* Crea u actualiza la información del CMR asociado con
@ -19,6 +21,7 @@ BEGIN
a.id addressFk,
c2.defaultAddressFk,
IFNULL(sat.supplierFk, su.id) supplierFk,
t.packages,
t.landed
FROM ticket t
JOIN client c ON c.id = t.clientFk
@ -52,9 +55,10 @@ BEGIN
c.addressToFk = t.addressFk,
c.addressFromFk = t.defaultAddressFk,
c.supplierFk = t.supplierFk,
c.packagesList = t.packages,
c.ead = t.landed
WHERE id = vCmrFk;
ELSE
ELSE
INSERT INTO cmr (
senderInstruccions,
truckPlate,
@ -62,6 +66,7 @@ BEGIN
addressToFk,
addressFromFk,
supplierFk,
packagesList,
ead
)
SELECT * FROM tTicket;