Merge pull request '6358-boxPicking_ultimate' (!2044) from 6358-boxPicking_ultimate into dev

Reviewed-on: #2044
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

db/routines/vn/procedures/sale_getBoxPickingList.sql

@@ -17,7 +17,6 @@ BEGIN
 
 	CALL productionControl(vWarehouseFk, 0);
 
-	-- Products with vn.item.isBoxPickingMode = TRUE, pay atention to vn.itemShelving.packing
 	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
 	(saleFk INT PRIMARY KEY)
 	SELECT
@@ -52,8 +51,8 @@ BEGIN
 			LEFT JOIN ticketState ts ON ts.ticketFk = s.ticketFk
 			LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = vWarehouseFk
 			LEFT JOIN buy b ON b.id = lb.buy_id
-		WHERE s.quantity BETWEEN ish.packing AND (ish.visible - IFNULL(tISS.reserve,0))
-			AND i.isBoxPickingMode
+		WHERE IF(i.isBoxPickingMode, ish.packing, i.packingOut) 
+				<= LEAST(s.quantity, ish.visible - IFNULL(tISS.reserve,0))
 			AND NOT pb.problem
 			AND sgd.saleFk IS NULL
 			AND p.sectorFk = vSectorFk
@@ -64,47 +63,13 @@ BEGIN
 		GROUP BY s.id
 		ORDER BY etd;
 
-	-- Remaining products, vn.item.packingOut
-	INSERT IGNORE INTO tmp.sale
-	SELECT
-		s.ticketFk,	
-		s.id saleFk,
-		s.itemFk,
-		s.concept,
-		s.quantity,
-		MAKETIME(pb.HH,pb.mm,0) etd, 
-		pb.routeFk,
-		s.quantity / i.packingOut stickers,
-		i.packingOut,
-		pc.defaultBigPackageFk
-		FROM sale s
-			JOIN item i ON i.id = s.itemFk
-			JOIN itemShelving ish ON ish.itemFk = s.itemFk
-			JOIN shelving sh ON sh.code = ish.shelvingFk
-			JOIN parking p ON p.id = sh.parkingFk
-			JOIN tmp.productionBuffer pb ON pb.ticketFk = s.ticketFk
-			JOIN agencyMode am ON am.id = pb.agencyModeFk
-			JOIN packagingConfig pc
-			LEFT JOIN routesMonitor rm ON rm.routeFk = pb.routeFk
-			LEFT JOIN itemShelvingStock iss ON iss.itemFk = s.itemFk AND iss.sectorFk = p.sectorFk
-			LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
-			LEFT JOIN ticketState ts ON ts.ticketFk = s.ticketFk
-		WHERE s.quantity >= i.packingOut 
-			AND NOT pb.problem
-			AND s.quantity > 0
-			AND sgd.saleFk IS NULL
-			AND p.sectorFk = vSectorFk
-			AND ts.isPreviousPreparable
-			AND iss.visible >= s.quantity
-			AND ((rm.bufferFk AND rm.isPickingAllowed)
-				OR am.code = 'REC_ALG') 
-			AND pb.shipped = vDated
-		GROUP BY s.id
-		ORDER BY etd;
-
-	SELECT * FROM tmp.sale;
+	SELECT *
+		FROM tmp.sale
+		WHERE stickers;
 
 	DROP TEMPORARY TABLE tmp.productionBuffer;
 	DROP TEMPORARY TABLE tmp.sale;
 	END$$
 DELIMITER ;
+
+CALL `vn`.`sale_getBoxPickingList`(1, curdate());