db/routines/vn/procedures/item_getSimilar.sql

@@ -1,48 +1,64 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_getSimilar`(
-	vSelf INT,
+    vSelf INT,
-	vWarehouseFk INT,
+    vWarehouseFk INT,
-	vDated DATE,
+    vDated DATE,
-	vShowType BOOL
+    vShowType BOOL,
+    vDaysInForward INT
 )
 BEGIN
 /**
-* Propone articulos disponibles ordenados, con la cantidad
+* Propone articulos ordenados, con la cantidad
 * de veces usado y segun sus caracteristicas.
 *
 * @param vSelf Id de artículo
 * @param vWarehouseFk Id de almacen
 * @param vDated Fecha
 * @param vShowType Mostrar tipos
+* @param vDaysInForward Días de alcance para las ventas
 */
-	DECLARE vAvailableCalcFk INT;
+    DECLARE vAvailableCalcFk INT;
-	DECLARE vVisibleCalcFk INT;
+    DECLARE vPriority INT DEFAULT 1;
-	DECLARE vTypeFk INT;
-	DECLARE vPriority INT DEFAULT 1;
 
-	CALL cache.available_refresh(vAvailableCalcFk, FALSE, vWarehouseFk, vDated);
+    CALL cache.available_refresh(vAvailableCalcFk, FALSE, vWarehouseFk, vDated);
-	CALL cache.visible_refresh(vVisibleCalcFk, FALSE, vWarehouseFk);
 
-	WITH itemTags AS (
+    WITH itemTags AS (
-		SELECT i.id,
+        SELECT i.id,
-				typeFk,
+               typeFk,
-				tag5,
+               tag5,
-				value5,
+               value5,
-				tag6,
+               tag6,
-				value6,
+               value6,
-				tag7,
+               tag7,
-				value7,
+               value7,
-				tag8,
+               tag8,
-				value8,
+               value8,
-				t.name,
+               t.name,
-				it.value
+               it.value
 			FROM vn.item i
 				LEFT JOIN vn.itemTag it ON it.itemFk = i.id
 					AND it.priority = vPriority
 				LEFT JOIN vn.tag t ON t.id = it.tagFk
 			WHERE i.id = vSelf
-	)
+    ),
-	SELECT i.id itemFk,
+    stock AS (
+        SELECT itemFk, SUM(visible) stock
+			FROM vn.itemShelvingStock
+			WHERE warehouseFk = vWarehouseFk
+			GROUP BY itemFk
+    ),
+    sold AS (
+        SELECT SUM(s.quantity) quantity, s.itemFk
+			FROM vn.sale s
+				JOIN vn.ticket t ON t.id = s.ticketFk
+				LEFT JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id
+			WHERE t.shipped BETWEEN CURDATE() AND CURDATE() + INTERVAL vDaysInForward DAY
+				AND iss.saleFk IS NULL
+				AND t.warehouseFk = vWarehouseFk
+			GROUP BY s.itemFk
+    )
+    SELECT i.id itemFk,
+			CAST(sd.quantity AS INT) advanceable,
 			i.longName,
 			i.subName,
 			i.tag5,
@@ -64,13 +80,13 @@ BEGIN
 				WHEN b.groupingMode = 'packing' THEN b.packing
 				ELSE 1
 			END minQuantity,
-			v.visible located,
+			sk.stock located,
 			b.price2
 		FROM vn.item i
+			LEFT JOIN sold sd ON sd.itemFk = i.id
 			JOIN cache.available a ON a.item_id = i.id
 				AND a.calc_id = vAvailableCalcFk
-			LEFT JOIN cache.visible v ON v.item_id = i.id
+			LEFT JOIN stock sk ON sk.itemFk = i.id
-				AND v.calc_id = vVisibleCalcFk
 			LEFT JOIN cache.last_buy lb ON lb.item_id = i.id
 				AND lb.warehouse_id = vWarehouseFk
 			LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id
@@ -80,20 +96,21 @@ BEGIN
 			LEFT JOIN vn.tag t ON t.id = it.tagFk
 			LEFT JOIN vn.buy b ON b.id = lb.buy_id
 			JOIN itemTags its
-		WHERE a.available > 0
+		WHERE (a.available > 0 OR sd.quantity < sk.stock)
 			AND (i.typeFk = its.typeFk OR NOT vShowType)
 			AND i.id <> vSelf
-		ORDER BY `counter` DESC,
+		ORDER BY (a.available > 0) DESC,
-			(t.name = its.name) DESC,
+				`counter` DESC,
-			(it.value = its.value) DESC,
+				(t.name = its.name) DESC,
-			(i.tag5 = its.tag5) DESC,
+				(it.value = its.value) DESC,
-			match5 DESC,
+				(i.tag5 = its.tag5) DESC,
-			(i.tag6 = its.tag6) DESC,
+				match5 DESC,
-			match6 DESC,
+				(i.tag6 = its.tag6) DESC,
-			(i.tag7 = its.tag7) DESC,
+				match6 DESC,
-			match7 DESC,
+				(i.tag7 = its.tag7) DESC,
-			(i.tag8 = its.tag8) DESC,
+				match7 DESC,
-			match8 DESC
+				(i.tag8 = its.tag8) DESC,
+				match8 DESC
 		LIMIT 100;
 END$$
 DELIMITER ;