From c942786783ea8bc9650e20ba690fcf095e98624b Mon Sep 17 00:00:00 2001
From: Pako <pako@verdnatura.es>
Date: Thu, 28 Mar 2024 14:54:30 +0100
Subject: [PATCH] pruebas

---
 .../vn/procedures/boxPicking_print.sql        | 22 +++++++++++++------
 .../vn/procedures/sale_boxPickingPrint.sql    | 14 ++++++------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/db/routines/vn/procedures/boxPicking_print.sql b/db/routines/vn/procedures/boxPicking_print.sql
index 5eea4ee1e..31485be1d 100644
--- a/db/routines/vn/procedures/boxPicking_print.sql
+++ b/db/routines/vn/procedures/boxPicking_print.sql
@@ -59,6 +59,8 @@ BEGIN
 				WHERE saleFk = vSaleFk;
 	END IF;
 
+SELECT vQuantity , vPacking;
+
 w1:	WHILE vQuantity >= vPacking DO
 
 		SET vItemShelvingFk = NULL;
@@ -86,13 +88,13 @@ w1:	WHILE vQuantity >= vPacking DO
 			LIMIT 1;
 
 		IF vItemShelvingFk THEN
-			INSERT INTO itemShelvingSale
+		/*	INSERT INTO itemShelvingSale
 				SET itemShelvingFk = vItemShelvingFk,
 					saleFk = vSaleFk,
 					quantity = vPacking,
 					userFk = vUserFk,
 					isPicked = TRUE;
-
+*/
 			SET vItemShelvingSaleFk = LAST_INSERT_ID();
 
 			UPDATE sale SET isPicked = FALSE WHERE id = vSaleFk;
@@ -188,10 +190,12 @@ w1:	WHILE vQuantity >= vPacking DO
 					WHERE id = vItemShelvingSaleFk;
 
 				SET vItemShelvingSaleFk = vItemShelvingSaleFk_old;
-			ELSE
-				UPDATE itemShelvingSale
+			/*ELSE
+				
+			 * UPDATE itemShelvingSale
 					SET saleFk = vNewSaleFk
 					WHERE id = vItemShelvingSaleFk;
+					*/
 			END IF;
 		ELSE
 			INSERT INTO sale(ticketFk, itemFk, concept, quantity, discount, price)
@@ -206,9 +210,11 @@ w1:	WHILE vQuantity >= vPacking DO
 					FROM saleComponent
 					WHERE saleFk = vSaleFk;
 
-			UPDATE itemShelvingSale 
+		/*	
+		 * UPDATE itemShelvingSale 
 				SET saleFk = vNewSaleFk
 				WHERE id = vItemShelvingSaleFk;
+				*/
 		END IF;
 
 		INSERT IGNORE INTO saleTracking(saleFk, isChecked, workerFk, stateFk)
@@ -231,7 +237,8 @@ w1:	WHILE vQuantity >= vPacking DO
 									packingSiteFk,
 									monitorId,
 									started,
-									ended
+									ended,
+									counter
 								)
 			SELECT	vAgencyModeFk,
 					vNewTicketFk,
@@ -243,7 +250,8 @@ w1:	WHILE vQuantity >= vPacking DO
 					vPackingSiteFk,
 					ps.monitorId,
 					IFNULL(vLastExpeditionTimeStamp, NOW()),
-					NOW()
+					NOW(),
+					0
 				FROM packingSite ps
 					JOIN host h ON h.id = ps.hostFk
 					JOIN item i ON i.name = 'Shipping cost'
diff --git a/db/routines/vn/procedures/sale_boxPickingPrint.sql b/db/routines/vn/procedures/sale_boxPickingPrint.sql
index 6cd8eeb20..7872ff000 100644
--- a/db/routines/vn/procedures/sale_boxPickingPrint.sql
+++ b/db/routines/vn/procedures/sale_boxPickingPrint.sql
@@ -86,7 +86,7 @@ w1:	WHILE vQuantity >= vPacking DO
 			LIMIT 1;
 
 		IF vItemShelvingFk THEN
-			INSERT INTO itemShelvingSale
+		/*	INSERT INTO itemShelvingSale
 				SET itemShelvingFk = vItemShelvingFk,
 					saleFk = vSaleFk,
 					quantity = vPacking,
@@ -94,7 +94,7 @@ w1:	WHILE vQuantity >= vPacking DO
 					isPicked = TRUE;
 
 			SET vItemShelvingSaleFk = LAST_INSERT_ID();
-
+*/
 			UPDATE sale SET isPicked = FALSE WHERE id = vSaleFk;
 		ELSE
 			LEAVE w1;
@@ -188,10 +188,10 @@ w1:	WHILE vQuantity >= vPacking DO
 					WHERE id = vItemShelvingSaleFk;
 
 				SET vItemShelvingSaleFk = vItemShelvingSaleFk_old;
-			ELSE
+		/*	ELSE
 				UPDATE itemShelvingSale
 					SET saleFk = vNewSaleFk
-					WHERE id = vItemShelvingSaleFk;
+					WHERE id = vItemShelvingSaleFk; */
 			END IF;
 		ELSE
 			INSERT INTO sale(ticketFk, itemFk, concept, quantity, discount, price)
@@ -206,9 +206,9 @@ w1:	WHILE vQuantity >= vPacking DO
 					FROM saleComponent
 					WHERE saleFk = vSaleFk;
 
-			UPDATE itemShelvingSale 
-				SET saleFk = vNewSaleFk
-				WHERE id = vItemShelvingSaleFk;
+		/*	UPDATE itemShelvingSale 
+				SET saleFk = vNewSaleFk */
+				
 		END IF;
 
 		INSERT IGNORE INTO saleTracking(saleFk, isChecked, workerFk, stateFk)