db/routines/vn/procedures/clean.sql

@@ -12,7 +12,7 @@ BEGIN
 	DECLARE v1Years DATE DEFAULT util.VN_CURDATE() - INTERVAL 1 YEAR;
 	DECLARE v2Years DATE DEFAULT util.VN_CURDATE() - INTERVAL 2 YEAR;
 	DECLARE v4Years DATE DEFAULT util.VN_CURDATE() - INTERVAL 4 YEAR;
-	DECLARE v5Years DATE DEFAULT util.VN_CURDATE() - INTERVAL 5 YEAR;	
+	DECLARE v5Years DATE DEFAULT util.VN_CURDATE() - INTERVAL 5 YEAR;
 	DECLARE vTrashId VARCHAR(15);
 	DECLARE vCompanyBlk INT;
 
@@ -30,8 +30,9 @@ BEGIN
 	DELETE IGNORE FROM expedition WHERE created < v26Months;
 	DELETE FROM sms WHERE created < v18Months;
 	DELETE FROM saleTracking WHERE created < v1Years;
+	DELETE FROM productionError WHERE dated < v1Years;
 	DELETE FROM ticketTracking WHERE created < v18Months;
-	DELETE tobs FROM ticketObservation tobs 
+	DELETE tobs FROM ticketObservation tobs
 		JOIN ticket t ON tobs.ticketFk = t.id
 		WHERE t.shipped < v5Years;
 	DELETE sc.* FROM saleCloned sc JOIN sale s ON s.id = sc.saleClonedFk JOIN ticket t ON t.id = s.ticketFk WHERE t.shipped < v1Years;
@@ -113,12 +114,12 @@ BEGIN
 		FROM travel t
 			LEFT JOIN entry e ON e.travelFk = t.id
 		WHERE t.shipped < v3Months AND e.travelFk IS NULL;
-	
+
 	UPDATE dms d
-			JOIN dmsType dt ON dt.id = d.dmsTypeFk 
+			JOIN dmsType dt ON dt.id = d.dmsTypeFk
-		SET d.dmsTypeFk = vTrashId 
+		SET d.dmsTypeFk = vTrashId
 		WHERE created < util.VN_CURDATE() - INTERVAL dt.monthToDelete MONTH;
-	
+
 	-- borrar entradas sin compras
 	CREATE OR REPLACE TEMPORARY TABLE tEntryToDelete
 		SELECT e.*
@@ -136,7 +137,7 @@ BEGIN
 	CREATE OR REPLACE TEMPORARY TABLE tRouteToDelete
 		SELECT *
 			FROM route r
-			WHERE created < v4Years;   
+			WHERE created < v4Years;
 
 	UPDATE tRouteToDelete tmp
 			JOIN dms d ON d.id = tmp.gestdocFk
@@ -180,7 +181,7 @@ BEGIN
 	DELETE FROM mail WHERE creationDate < v2Months;
 	DELETE FROM split WHERE dated < v18Months;
 	DELETE FROM remittance WHERE dated < v18Months;
-	
+
 	CREATE OR REPLACE TEMPORARY TABLE tTicketDelete
 		SELECT DISTINCT tl.originFk ticketFk
 			FROM ticketLog tl
@@ -189,11 +190,11 @@ BEGIN
 						FROM ticket t
 							JOIN ticketLog tl ON tl.originFk = t.id
 							LEFT JOIN ticketWeekly tw ON tw.ticketFk = t.id
-						WHERE t.shipped BETWEEN '2000-01-01' AND '2000-12-31' 
+						WHERE t.shipped BETWEEN '2000-01-01' AND '2000-12-31'
 							AND t.isDeleted
 							AND tw.ticketFk IS NULL
 						GROUP BY t.id
-				) sub ON sub.ids = tl.id 
+				) sub ON sub.ids = tl.id
 			WHERE tl.creationDate <= v2Months;
 	DELETE t
 		FROM ticket t

db/routines/vn/procedures/creditInsurance_getRisk.sql

@@ -0,0 +1,42 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`creditInsurance_getRisk`()
+BEGIN
+/**
+ * Devuelve el riesgo de los clientes que estan asegurados
+ */
+	CREATE OR REPLACE TEMPORARY TABLE tmp.client_list
+	    (PRIMARY KEY (Id_Cliente))
+	    ENGINE = MEMORY
+	        SELECT * FROM (
+	                SELECT cc.client Id_Cliente, ci.grade
+	                    FROM creditClassification cc
+	                        JOIN creditInsurance ci ON cc.id = ci.creditClassification
+	                    WHERE dateEnd IS NULL
+	                ORDER BY ci.creationDate DESC
+	                LIMIT 10000000000000000000) t1
+	            GROUP BY Id_Cliente;
+
+	CALL vn2008.risk_vs_client_list(util.VN_CURDATE());
+
+	SELECT
+	        c.id,
+	        c.name,
+	        c.credit clientCredit,
+	        c.creditInsurance solunion,
+	        CAST(r.risk AS DECIMAL(10,0)) risk,
+	        CAST(c.creditInsurance - r.risk AS DECIMAL(10,0)) riskAlive,
+	        cac.invoiced billedAnnually,
+	        c.dueDay,
+	        ci.grade,
+	        c2.country
+	    FROM tmp.client_list ci
+	        LEFT JOIN tmp.risk r ON r.Id_Cliente = ci.Id_Cliente
+	        JOIN client c ON c.id = ci.Id_Cliente
+	        JOIN bs.clientAnnualConsumption cac ON c.id = cac.clientFk
+	        JOIN country c2 ON c2.id = c.countryFk
+	    GROUP BY c.id;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.risk;
+	DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
+END$$
+DELIMITER ;

db/routines/vn/procedures/solunionRiskRequest.sql

@@ -1,31 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`solunionRiskRequest`()
-BEGIN
-	
-	DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
-    CREATE TEMPORARY TABLE tmp.client_list
-    (PRIMARY KEY (Id_Cliente))
-		ENGINE = MEMORY
-		SELECT * FROM (SELECT cc.client Id_Cliente, ci.grade FROM vn.creditClassification cc 
-				JOIN vn.creditInsurance ci ON cc.id = ci.creditClassification
-                WHERE dateEnd IS NULL
-                ORDER BY ci.creationDate DESC
-				LIMIT 10000000000000000000) t1 GROUP BY Id_Cliente;
-    
-    CALL vn2008.risk_vs_client_list(util.VN_CURDATE());
-    
-	SELECT 
-		c.Id_Cliente, c.Cliente, c.Credito credito_vn, c.creditInsurance solunion, cast(r.risk as DECIMAL(10,0)) riesgo_vivo,
-        cast(c.creditInsurance - r.risk as decimal(10,0)) margen_vivo,
-		f.Consumo consumo_anual, c.Vencimiento, ci.grade
-	FROM
-		vn2008.Clientes c
-			JOIN tmp.risk r ON r.Id_Cliente = c.Id_Cliente
-			JOIN tmp.client_list ci ON c.Id_Cliente = ci.Id_Cliente
-			JOIN bi.facturacion_media_anual f ON c.Id_Cliente = f.Id_Cliente
-		GROUP BY Id_cliente;
-        
-	DROP TEMPORARY TABLE IF EXISTS tmp.risk;
-    DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
-END$$
-DELIMITER ;