From 109770b0a37059b9a53bf626b5adf230ea29cf42 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 17 Jul 2024 10:28:22 +0200
Subject: [PATCH] feat: refs #6822 return newEntry

---
 db/routines/vn/procedures/entry_transfer.sql | 14 +++++++++++++-
 modules/entry/back/methods/entry/transfer.js |  9 ++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/db/routines/vn/procedures/entry_transfer.sql b/db/routines/vn/procedures/entry_transfer.sql
index aedfdb7d61..64cafe043b 100644
--- a/db/routines/vn/procedures/entry_transfer.sql
+++ b/db/routines/vn/procedures/entry_transfer.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_transfer`(vOriginalEntry INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_transfer`(vOriginalEntry INT, OUT vNewEntry INT)
 BEGIN
 /**
 * Adelanta a mañana la mercancia de una entrada a partir de lo que hay ubicado en el almacén
@@ -11,6 +11,16 @@ BEGIN
 	DECLARE vTravelFk INT;
 	DECLARE vWarehouseFk INT;
 
+	DECLARE CONTINUE HANDLER FOR NOT FOUND
+	SET vDone = TRUE; 
+
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+	
+	START TRANSACTION;
 	-- Clonar la entrada
 	CALL entry_clone(vOriginalEntry,vNewEntryFk);
 
@@ -100,6 +110,8 @@ BEGIN
 		WHERE b.entryFk = vNewEntryFk
 			AND b.quantity = 0;
 
+	SET vNewEntry = vNewEntryFk;
+	COMMIT;
 	CALL cache.visible_refresh(@c,TRUE,7);
 	CALL cache.available_refresh(@c, TRUE, 7, util.VN_CURDATE());
 
diff --git a/modules/entry/back/methods/entry/transfer.js b/modules/entry/back/methods/entry/transfer.js
index 9778326943..53ae4b48c6 100644
--- a/modules/entry/back/methods/entry/transfer.js
+++ b/modules/entry/back/methods/entry/transfer.js
@@ -12,6 +12,10 @@ module.exports = Self => {
         http: {
             path: '/:id/transfer',
             verb: 'POST'
+        },
+        returns: {
+            arg: 'newEntryFk',
+            type: 'number'
         }
     });
 
@@ -28,8 +32,11 @@ module.exports = Self => {
         }
 
         try {
-            await Self.rawSql('CALL vn.entryTransfer(?)', [id], myOptions);
+            await Self.rawSql('CALL vn.entry_transfer(?, @vNewEntry)', [id], myOptions);
+            const newEntryFk = await Self.rawSql('SELECT @vNewEntry AS newEntryFk', [], myOptions);
+
             if (tx) await tx.commit();
+            return newEntryFk;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;