feat: refs #7709 revision

db/routines/vn/procedures/supplierPackaging_ReportSource.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`supplierPackaging_ReportSource`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`supplierPackaging_reportSource`(
 	vFromDated DATE,
 	vNif VARCHAR(50)
 )
@@ -12,11 +12,7 @@ BEGIN
  */
 	DECLARE vEntityId INT;
 
-	SELECT id INTO vEntityId
+	CREATE OR REPLACE TEMPORARY TABLE tPackaging
-		FROM supplier
-		WHERE nif = vNif;
-
-	CREATE OR REPLACE TEMPORARY TABLE tSupplierPackaging
 		SELECT itemFk,
 				longName,
 				`name`,
@@ -24,7 +20,7 @@ BEGIN
 				landed,
 				`in`,
 				`out`,
-				CAST(sref AS CHAR) sref,
+				CAST(cmrFk AS CHAR) sref,
 				buyingValue
 			FROM (
 				SELECT s.itemFk,
@@ -34,7 +30,7 @@ BEGIN
 						DATE(t.shipped) landed,
 						-LEAST(s.quantity, 0) `in`,
 						GREATEST(s.quantity, 0) `out`,
-						t.cmrFk sref,
+						t.cmrFk,
 						s.price * (100 - s.discount) / 100 buyingValue
 					FROM sale s
 						JOIN item i ON i.id = s.itemFk
@@ -50,8 +46,8 @@ BEGIN
 						c.name,
 						'T previous',
 						vFromDated,
-							SUM(-LEAST(s.quantity,0)) `in`,
+						SUM(-LEAST(s.quantity, 0)),
-							SUM(GREATEST(s.quantity,0)) `out`,
+						SUM(GREATEST(s.quantity, 0)),
 						NULL,
 						AVG(s.price * (100 - s.discount) / 100)
 					FROM sale s
@@ -68,10 +64,10 @@ BEGIN
 				SELECT p.itemFk,
 						i.longName,
 						c.name,
-							CONCAT('TP',tp.ticketFk) entryFk,
+						CONCAT('TP', tp.ticketFk),
 						DATE(t.shipped),
-							-LEAST(tp.quantity,0) `in`,
+						-LEAST(tp.quantity, 0),
-							GREATEST(tp.quantity,0) `out`,
+						GREATEST(tp.quantity, 0),
 						t.cmrFk,
 						0
 					FROM ticketPackaging tp
@@ -106,13 +102,16 @@ BEGIN
 			)sub
 			WHERE `out` OR `in`;
 
-	IF vEntityId IS NULL THEN
+	SELECT id INTO vEntityId
+		FROM supplier
+		WHERE nif = vNif;
 
+	IF vEntityId IS NULL THEN
 		SELECT id INTO vEntityId
 			FROM client
 			WHERE fi = vNif;
 
-		INSERT INTO tSupplierPackaging
+		INSERT INTO tPackaging
 			SELECT 	itemFk,
 					longName,
 					`name`,
@@ -125,12 +124,12 @@ BEGIN
 				FROM (
 					SELECT sp.itemFk,
 							sp.longName,
-							sp.supplier name,
+							sp.supplier,
-							CONCAT('E',sp.entryFk) entryFk,
+							CONCAT('E', sp.entryFk),
 							sp.landed,
 							sp.`in`,
 							sp.`out`,
-							e.invoiceNumber sref,
+							e.invoiceNumber,
 							sp.buyingValue
 						FROM supplierPackaging sp
 							JOIN entry e ON e.id = sp.entryFk
@@ -155,7 +154,6 @@ BEGIN
 						ORDER BY itemFk , landed, entryFk
 				) sub
 			WHERE `out` OR `in`;
-
 	END IF;
 
 	SELECT vEntityId,
@@ -168,11 +166,14 @@ BEGIN
 			CAST(`out` AS DECIMAL(10, 0)) `out`,
 			sref,
 			buyingValue,
-			CAST(SUM(IF(`in`=0, -`out`, `in`)) OVER (PARTITION BY itemFk ORDER BY itemFk , landed, entryFk) AS DECIMAL(10,2)) balance
+			CAST(SUM(IF(`in` = 0, -`out`, `in`)) OVER (
-		FROM tSupplierPackaging
+					PARTITION BY itemFk
-		WHERE NOT (landed < util.VN_CURDATE() - INTERVAL 1 YEAR)
+					ORDER BY itemFk , landed, entryFk
+				) AS DECIMAL(10,2)) balance
+		FROM tPackaging
+		WHERE landed >= util.VN_CURDATE() - INTERVAL 1 YEAR
 		ORDER BY itemFk, landed, entryFk;
 
-	DROP TEMPORARY TABLE tSupplierPackaging;
+	DROP TEMPORARY TABLE tPackaging;
 END$$
 DELIMITER ;