fix: refs #7781 prevent pallet merge

db/routines/vn/procedures/expeditionPallet_build.sql

@@ -18,9 +18,11 @@ BEGIN
  */
 	DECLARE vCounter INT;
 	DECLARE vExpeditionFk INT;
+	DECLARE vExpeditionWithPallet INT;
 	DECLARE vTruckFk INT;
 	DECLARE vPrinterFk INT;
 	DECLARE vExpeditionStateTypeFk INT;
+	DECLARE vExpeditionWithOutPallet INT;
 
 	CREATE OR REPLACE TEMPORARY TABLE tExpedition (
 		expeditionFk INT,
@@ -44,48 +46,55 @@ BEGIN
 				WHERE e.id = vExpeditionFk;
 	END WHILE;
 
-	SELECT palletFk INTO vPalletFk
-		FROM (
-			SELECT palletFk, count(*) n
-				FROM tExpedition
-					WHERE palletFk > 0
-				GROUP BY palletFk
-				ORDER BY n DESC
-				LIMIT 100 
-		) sub
-		LIMIT 1;
+	SELECT COUNT(palletFk) INTO vExpeditionWithPallet FROM tExpedition;
+	SELECT GROUP_CONCAT(expeditionFk SEPARATOR ', ') INTO vExpeditionWithOutPallet
+		FROM tExpedition 
+		WHERE palletFk;
 
-	IF vPalletFk IS NULL THEN
-		SELECT roadmapStopFk INTO vTruckFk
-			FROM (
-				SELECT rm.roadmapStopFk, count(*) n
-					FROM routesMonitor rm
-						JOIN tExpedition e ON e.routeFk = rm.routeFk
-					GROUP BY roadmapStopFk
-					ORDER BY n DESC
-					LIMIT 1
-			) sub;
-
-		IF vTruckFk IS NULL THEN
-				CALL util.throw ('TRUCK_NOT_AVAILABLE');
-		END IF;
-
-		INSERT INTO expeditionPallet SET truckFk = vTruckFk;
-
-		SET vPalletFk = LAST_INSERT_ID();
+	IF NOT vExpeditionWithPallet THEN
+		CALL util.throw ('NO_FREE_EXPEDITIONS');
 	END IF;
 
+	SELECT roadmapStopFk INTO vTruckFk
+		FROM (
+			SELECT rm.roadmapStopFk, count(*) n
+				FROM routesMonitor rm
+					JOIN tExpedition e ON e.routeFk = rm.routeFk
+				WHERE e.palletFk IS NULL
+				GROUP BY roadmapStopFk
+				ORDER BY n DESC
+				LIMIT 1
+		) sub;
+
+	IF vTruckFk IS NULL THEN
+		CALL util.throw ('TRUCK_NOT_AVAILABLE');
+	END IF;
+
+	INSERT INTO expeditionPallet SET truckFk = vTruckFk;
+
+	SET vPalletFk = LAST_INSERT_ID();
+
 	INSERT INTO expeditionScan(expeditionFk, palletFk, workerFk)
 		SELECT expeditionFk, vPalletFk, vWorkerFk
 			FROM tExpedition
-			ON DUPLICATE KEY UPDATE palletFk = vPalletFk, workerFk = vWorkerFk;
+			WHERE palletFk IS NULL;
 
 	SELECT id INTO vExpeditionStateTypeFk
 		FROM expeditionStateType
 		WHERE code = 'PALLETIZED';
-
+	
 	INSERT INTO expeditionState(expeditionFk, typeFk)
-		SELECT expeditionFk, vExpeditionStateTypeFk FROM tExpedition;
+		SELECT expeditionFk, vExpeditionStateTypeFk 
+		FROM tExpedition
+		WHERE palletFk IS NULL;
+
+	IF vExpeditionWithPallet THEN
+		UPDATE arcRead 
+			SET error = vExpeditionWithOutPallet
+		WHERE id = vArcId;
+	ELSE
+		UPDATE arcRead SET error = NULL WHERE id = vArcId;
+	END IF;
 
 	SELECT printerFk INTO vPrinterFk FROM arcRead WHERE id = vArcId;