Merge pull request 'feat: refs #7363 item_getBalance saleTracking no mostrar duplicados' (!2438) from 7363-item_getBalance into dev

Reviewed-on: #2438
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

db/routines/vn/procedures/item_getBalance.sql

@@ -9,7 +9,7 @@ BEGIN
  * @vItemFk item a buscar
  * @vWarehouseFk almacen donde buscar
  * @vDate Si la fecha es null, muestra el histórico desde el inventario. 
- * Si la fecha no es null, muestra histórico desde la fecha pasada.
+ * Si la fecha no es null, muestra histórico desde la fecha de vDate.
  */
 	DECLARE vDateInventory DATETIME;
 
@@ -41,6 +41,7 @@ BEGIN
 	);
 
 	INSERT INTO tItemDiary
+		WITH entriesIn AS (
 			SELECT tr.landed shipped,
 					b.quantity `in`,
 					NULL `out`,
@@ -57,89 +58,125 @@ BEGIN
 					NULL clientType,
 					NULL claimFk,
 					ec.inventorySupplierFk
-			FROM buy b
+				FROM vn.buy b
-				JOIN entry e ON e.id = b.entryFk
+					JOIN vn.entry e ON e.id = b.entryFk
-				JOIN travel tr ON tr.id = e.travelFk
+					JOIN vn.travel tr ON tr.id = e.travelFk
-				JOIN supplier s ON s.id = e.supplierFk
+					JOIN vn.supplier s ON s.id = e.supplierFk
-				JOIN state st ON st.`code` = IF( tr.landed < util.VN_CURDATE() 
+					JOIN vn.state st ON st.`code` = IF( tr.landed < util.VN_CURDATE() 
 						OR (util.VN_CURDATE() AND tr.isReceived),
 							'DELIVERED',
 							'FREE')
-				JOIN entryConfig ec
+					JOIN vn.entryConfig ec
 				WHERE tr.landed >= vDateInventory
 					AND vWarehouseFk = tr.warehouseInFk
 					AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL) 
 					AND b.itemFk = vItemFk
-				AND e.isExcludedFromAvailable = FALSE
+					AND NOT e.isExcludedFromAvailable
-				AND e.isRaid = FALSE
+					AND NOT e.isRaid
-		UNION ALL
+		), entriesOut AS (
 			SELECT tr.shipped,
 					NULL,
 					b.quantity,
 					st.alertLevel,
-				st.name,
+					st.name stateName,
 					s.name ,
 					e.invoiceNumber,
-				e.id,
+					e.id entryFk,
-				s.id,
+					s.id supplierFk,
 					IF(st.`code` = 'DELIVERED' , TRUE, FALSE),
-				FALSE,
+					FALSE isTicket,
 					b.id,
-				NULL,
+					NULL `order`,
-				NULL,
+					NULL clientType,
-				NULL,
+					NULL claimFk,
 					ec.inventorySupplierFk
-			FROM buy b
+				FROM vn.buy b
-				JOIN entry e ON e.id = b.entryFk
+					JOIN vn.entry e ON e.id = b.entryFk
-				JOIN travel tr ON tr.id = e.travelFk
+					JOIN vn.travel tr ON tr.id = e.travelFk
-				JOIN warehouse w ON w.id = tr.warehouseOutFk
+					JOIN vn.warehouse w ON w.id = tr.warehouseOutFk
-				JOIN supplier s ON s.id = e.supplierFk
+					JOIN vn.supplier s ON s.id = e.supplierFk
-				JOIN state st ON st.`code` = IF(tr.shipped < util.VN_CURDATE() 
+					JOIN vn.state st ON st.`code` = IF(tr.shipped < util.VN_CURDATE()
 						OR (tr.shipped = util.VN_CURDATE() AND tr.isReceived),
 							'DELIVERED',
 							'FREE')
-				JOIN entryConfig ec
+					JOIN vn.entryConfig ec
 				WHERE tr.shipped >= vDateInventory
 					AND vWarehouseFk = tr.warehouseOutFk
 					AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL)
 						AND b.itemFk = vItemFk
-				AND e.isExcludedFromAvailable = FALSE
+						AND NOT e.isExcludedFromAvailable
-				AND w.isFeedStock = FALSE
+						AND NOT w.isFeedStock
-				AND e.isRaid = FALSE
+						AND NOT e.isRaid
-		UNION ALL
+		), sales AS (
-		SELECT DATE(t.shipped),
+			SELECT DATE(t.shipped) shipped,
-			NULL,
 					s.quantity,
 					st2.alertLevel,
 					st2.name,
 					t.nickname,
 					t.refFk,
-			t.id,
+					t.id ticketFk,
 					t.clientFk,
-			stk.id,
+					s.id saleFk,
-			TRUE,
-			s.id,
 					st.`order`,
 					c.typeFk,
-			cb.claimFk,
+					cb.claimFk
-			NULL
+				FROM vn.sale s
-		FROM sale s
+					JOIN vn.ticket t ON t.id = s.ticketFk
-			JOIN ticket t ON t.id = s.ticketFk
+					LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
-			LEFT JOIN ticketState ts ON ts.ticketFk = t.id
+					LEFT JOIN vn.state st ON st.`code` = ts.`code`
-			LEFT JOIN state st ON st.`code` = ts.`code`
+					JOIN vn.client c ON c.id = t.clientFk
-			JOIN client c ON c.id = t.clientFk
+					JOIN vn.state st2 ON st2.`code` = IF(t.shipped < util.VN_CURDATE(),
-			JOIN state st2 ON st2.`code` = IF(t.shipped < util.VN_CURDATE(),
 						'DELIVERED',
 						IF (t.shipped > util.dayEnd(util.VN_CURDATE()),
 							'FREE',
 							IFNULL(ts.code, 'FREE')))
-			LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
+					LEFT JOIN vn.claimBeginning cb ON s.id = cb.saleFk
-			LEFT JOIN saleTracking stk ON stk.saleFk = s.id 
-				AND stk.stateFk = stPrep.id
-			LEFT JOIN claimBeginning cb ON s.id = cb.saleFk
 				WHERE t.shipped >= vDateInventory
 					AND s.itemFk = vItemFk
 					AND vWarehouseFk = t.warehouseFk
+		),sale AS (
+			SELECT s.shipped,
+					NULL `in`,
+					s.quantity,
+					s.alertLevel,
+					s.name,
+					s.nickname,
+					s.refFk,
+					s.ticketFk,
+					s.clientFk,
+					IF(stk.saleFk, TRUE, NULL),
+					TRUE,
+					s.saleFk,
+					s.`order`,
+					s.typeFk,
+					s.claimFk,
+					NULL
+				FROM sales s
+					LEFT JOIN vn.state stPrep ON stPrep.`code` = 'PREPARED'
+					LEFT JOIN vn.saleTracking stk ON stk.saleFk = s.saleFk 
+						AND stk.stateFk = stPrep.id
+				GROUP BY s.saleFk
+		)	SELECT shipped,
+				`in`,
+				`out`,
+				alertLevel,
+				stateName,
+				`name`,
+				reference,
+				origin,
+				clientFk,
+				isPicked,
+				isTicket,
+				lineFk,
+				`order`,
+				clientType,
+				claimFk,
+				inventorySupplierFk
+				FROM entriesIn
+			UNION ALL
+			SELECT * FROM entriesOut
+			UNION ALL
+			SELECT * FROM sale
 			ORDER BY shipped,
 				(inventorySupplierFk = clientFk) DESC,
 				alertLevel DESC,