Merge pull request 'feat: refs #7712 sizeLimit' (!2797) from 7712-sizeLimit into dev

Reviewed-on: #2797
Reviewed-by: Pako Natek <pako@verdnatura.es>

db/routines/vn/procedures/collection_new.sql

@@ -9,10 +9,11 @@ BEGIN
 	DECLARE vWarehouseFk INT;
 	DECLARE vWagons INT;
 	DECLARE vTrainFk INT;
-	DECLARE vLinesLimit INT DEFAULT NULL;
+	DECLARE vLinesLimit INT;
 	DECLARE vTicketLines INT;
-	DECLARE vVolumeLimit DECIMAL DEFAULT NULL;
+	DECLARE vVolumeLimit DECIMAL;
 	DECLARE vTicketVolume DECIMAL;
+	DECLARE vSizeLimit INT;
 	DECLARE vMaxTickets INT;
 	DECLARE vStateFk VARCHAR(45);
 	DECLARE vFirstTicketFk INT;
@@ -77,6 +78,7 @@ BEGIN
 			o.trainFk,
 			o.linesLimit,
 			o.volumeLimit,
+			o.sizeLimit,
 			pc.collection_new_lockname
 		INTO vMaxTickets,
 				vHasUniqueCollectionTime,
@@ -88,6 +90,7 @@ BEGIN
 				vTrainFk,
 				vLinesLimit,
 				vVolumeLimit,
+				vSizeLimit,
 				vLockName
 		FROM productionConfig pc
 			JOIN worker w ON w.id = vUserFk
@@ -172,6 +175,14 @@ BEGIN
 				JOIN state s ON s.id = pb.state
 				JOIN agencyMode am ON am.id = pb.agencyModeFk
 				JOIN agency a ON a.id = am.agencyFk
+				LEFT JOIN (
+					SELECT pb.ticketFk, MAX(i.`size`) maxSize
+						FROM tmp.productionBuffer pb
+							JOIN ticket t ON t.id = pb.ticketfk
+							JOIN sale s ON s.ticketFk = t.id
+							JOIN item i ON i.id = s.itemFk
+						GROUP BY pb.ticketFk
+				) sub ON sub.ticketFk = pb.ticketFk
 				JOIN productionConfig pc
 			WHERE pb.shipped <> util.VN_CURDATE()
 				OR (pb.ubicacion IS NULL AND a.isOwn)
@@ -183,8 +194,9 @@ BEGIN
 				OR (NOT pb.V AND vItemPackingTypeFk = 'V')
 				OR (pc.isPreviousPreparationRequired AND pb.previousWithoutParking)
 				OR LENGTH(pb.problem) > 0
-				OR (pb.lines >= vLinesLimit AND vLinesLimit IS NOT NULL)
-				OR (pb.m3 >= vVolumeLimit AND vVolumeLimit IS NOT NULL);
+				OR (pb.lines > vLinesLimit AND vLinesLimit IS NOT NULL)
+				OR (pb.m3 > vVolumeLimit AND vVolumeLimit IS NOT NULL)
+				OR ((sub.maxSize > vSizeLimit OR sub.maxSize IS NOT NULL) AND vSizeLimit IS NOT NULL);
 	END IF;
 
 	-- Es importante que el primer ticket se coja en todos los casos

db/versions/11171-maroonMoss/00-firstScript.sql

@@ -0,0 +1,3 @@
+ALTER TABLE vn.operator
+    ADD COLUMN sizeLimit int(10) unsigned DEFAULT 90 NULL COMMENT 'Límite de altura en una colección para la asignación de pedidos' AFTER volumeLimit,
+    MODIFY COLUMN linesLimit int(10) unsigned DEFAULT 20 NULL COMMENT 'Límite de lineas en una colección para la asignación de pedidos';