From f2ab44bb8f3e8bbdeeac2be8ed0deb422697ef2b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 1 Dec 2023 10:14:32 +0100
Subject: [PATCH] refs #6276 itemShelving_return

---
 .../item/back/methods/item-shelving/return.js   | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/item/back/methods/item-shelving/return.js b/modules/item/back/methods/item-shelving/return.js
index dc17719de..6e0f80824 100644
--- a/modules/item/back/methods/item-shelving/return.js
+++ b/modules/item/back/methods/item-shelving/return.js
@@ -8,7 +8,7 @@ module.exports = Self => {
             required: true,
         }],
         returns: {
-            type: 'object',
+            type: ['object'],
             root: true
         },
         http: {
@@ -50,8 +50,7 @@ module.exports = Self => {
 
         let itemShelvings = await models.ItemShelving.find(filterItemShelvings, myOptions);
 
-        let alternatives = await models.ItemShelving.rawSql('CALL vn.itemShelving_getAlternatives(?)', [shelvingFk]);
-        console.log(alternatives);
+        const alternatives = await models.ItemShelving.rawSql('CALL vn.itemShelving_getAlternatives(?)', [shelvingFk]);
 
         if (itemShelvings) {
             itemShelvings = itemShelvings.map(itemShelving => {
@@ -59,19 +58,23 @@ module.exports = Self => {
                 const shelving = itemShelving.shelving();
                 const parking = shelving ? shelving.parking() : null;
 
+                const carros = alternatives.filter(el => el.item == itemShelving.itemFk);
+
                 return {
+                    id: itemShelving.id,
                     item: itemShelving.itemFk,
-                    description: item ? item.longName || `${item.name} ${item.size}` : '',
-                    visible: itemShelving.visible,
+                    longName: item ? item.longName || `${item.name} ${item.size}` : '',
+                    quantity: itemShelving.visible,
                     stickers: Math.ceil(itemShelving.visible / itemShelving.packing),
                     packing: itemShelving.packing,
                     grouping: itemShelving.grouping,
                     code: parking ? parking.code : '',
-                    id: itemShelving.id,
                     priority: shelving ? shelving.priority : 0,
-                    isChecked: itemShelving.isChecked
+                    isChecked: itemShelving.isChecked,
+                    carros
                 };
             });
         }
+        return itemShelvings;
     };
 };