db/routines/vn/procedures/item_getSimilar.sql

@@ -15,14 +15,13 @@ BEGIN
 * @param vDated Fecha
 * @param vShowType Mostrar tipos
 */
-	DECLARE vCalcFk INT;
+	DECLARE vAvailableCalcFk INT;
+	DECLARE vVisibleCalcFk INT;
 	DECLARE vTypeFk INT;
 	DECLARE vPriority INT DEFAULT 1;
 
-	CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vDated);
+	CALL cache.available_refresh(vAvailableCalcFk, FALSE, vWarehouseFk, vDated);
-
+	CALL cache.visible_refresh(vVisibleCalcFk, FALSE, vWarehouseFk);
-	-- Añadido temporalmente para que no se cuelgue la db
-	SET vShowType = TRUE;
 
 	WITH itemTags AS (
 		SELECT i.id,
@@ -65,21 +64,21 @@ BEGIN
 				WHEN b.groupingMode = 'packing' THEN b.packing
 				ELSE 1
 			END AS minQuantity,
-			iss.visible located,
+			v.visible located,
 			b.price2
 		FROM vn.item i
 			JOIN cache.available a ON a.item_id = i.id
-				AND a.calc_id = vCalcFk
+				AND a.calc_id = vAvailableCalcFk
+			LEFT JOIN cache.visible v ON v.item_id = 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
 				AND ip.itemFk = vSelf
 			LEFT JOIN vn.itemTag it ON it.itemFk = i.id
 				AND it.priority = vPriority
 			LEFT JOIN vn.tag t ON t.id = it.tagFk
-			LEFT JOIN cache.last_buy lb ON lb.item_id = i.id
-				AND lb.warehouse_id = vWarehouseFk
 			LEFT JOIN vn.buy b ON b.id = lb.buy_id
-			LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = i.id
-				AND iss.warehouseFk = vWarehouseFk
 			JOIN itemTags its
 		WHERE a.available > 0
 			AND (i.typeFk = its.typeFk OR NOT vShowType)

db/routines/vn/procedures/setParking.sql

@@ -23,6 +23,7 @@ proc: BEGIN
 		LEAVE proc;
 	END IF;
 	
+	IF  vParam REGEXP '^[0-9]+$' THEN
 		-- Se comprueba si es una preparación previa
 		SELECT COUNT(*) INTO vIsSaleGroup
 			FROM vn.saleGroup sg
@@ -54,8 +55,9 @@ proc: BEGIN
 			CALL vn.collection_setParking(vParam, vParkingFk);
 			LEAVE proc;
 		END IF;
-
+	ELSE
 		-- Por descarte, se considera una matrícula
 		CALL vn.shelving_setParking(vParam, vParkingFk);
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/procedures/ticket_splitItemPackingType.sql

@@ -44,7 +44,6 @@ BEGIN
 			WHERE s.ticketFk = vTicketFk;
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.saleGroup
-		(PRIMARY KEY (itemPackingTypeFk))
 		ENGINE = MEMORY
 		SELECT itemPackingTypeFk, SUM(litros) totalLitros
 			FROM tmp.sale
@@ -56,8 +55,7 @@ BEGIN
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT (
 		ticketFk INT,
-		itemPackingTypeFk VARCHAR(1),
+		itemPackingTypeFk VARCHAR(1)
-		PRIMARY KEY (ticketFk)
 	) ENGINE = MEMORY;
 
 	CASE vPackingTypesToSplit

modules/worker/back/models/operator.json

@@ -26,6 +26,10 @@
 		},
 		"labelerFk": {
 			"type": "number"
+		},
+		"isOnReservationMode": {
+			"type": "boolean",
+			"required": true
 		}
 	},
 	"relations": {