From e5b529a7c6eba8b579982c0c55aedf593e555788 Mon Sep 17 00:00:00 2001
From: alexmorenograu <61759297+alexmorenograu@users.noreply.github.com>
Date: Tue, 16 Mar 2021 08:58:58 +0100
Subject: [PATCH] update

---
 bindShelving.js       |  4 ++--
 bindShelvingTag.js    |  9 ++++++---
 bindTicketShelving.js | 15 +++++++--------
 db/selectDB.js        |  6 +++---
 insertShelving.js     |  2 +-
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/bindShelving.js b/bindShelving.js
index 5e222da..ba60d0b 100644
--- a/bindShelving.js
+++ b/bindShelving.js
@@ -1,7 +1,7 @@
 const config = require('./config');
 const got = require('got');
 
-function bindShelving(barcode, shelving, level){
+function bindShelving(barcode, shelvingId){
     (async() => {
         const info = await config.info
         let key = info.data.token;
@@ -11,7 +11,7 @@ function bindShelving(barcode, shelving, level){
                     storeId: config.storeId,
                     tagItemBinds: [{
                             eslBarcode: barcode,
-                            itemBarcode: shelving + level
+                            itemBarcode: shelvingId
                         }
                     ]
                 },
diff --git a/bindShelvingTag.js b/bindShelvingTag.js
index 77c66ff..f202e51 100644
--- a/bindShelvingTag.js
+++ b/bindShelvingTag.js
@@ -4,10 +4,11 @@ const filter = require('./filter');
 const insertDB = require('./db/insertDB')
 
 function bindShelvingTag(barcode, shelving, level){
+    let shelvingId = shelving + level;
     if(filter.filterBarcode(barcode)){
         if(filter.filterShelving(shelving)){
-            bindShelving.bindShelving(barcode, shelving, level);
-            insertShelving.insertShelving(shelving, level);
+            bindShelving.bindShelving(barcode, shelvingId);
+            insertShelving.insertShelving(shelvingId);
             insertDB.insertDB(barcode, shelving, level);
         }else{
             console.log("¡MATRICULA INCORRECTA!")
@@ -20,6 +21,8 @@ function bindShelvingTag(barcode, shelving, level){
 var barcode = "A0A3B8224DBF"; //valido = "A0A3B82"+ 4 CARACTERES HEXADECIMALES (0-F)
 var shelving = "BCD";   //valido = 3 CARACTERES LETRAS (A-Z)
 var level = "1";
-bindShelvingTag(barcode, shelving, level);
 //////////////////////////////////////
 
+bindShelvingTag(barcode, shelving, level);
+
+
diff --git a/bindTicketShelving.js b/bindTicketShelving.js
index 0a0c237..80f6d80 100644
--- a/bindTicketShelving.js
+++ b/bindTicketShelving.js
@@ -1,20 +1,19 @@
 const insert = require('./insertTicket');
 const filter = require('./filter');
-//const select = require('./db/selectDB');
-import select from './db/selectDB';
+const select = require('./db/selectDB');
 
 var barcode = "A0A3B820690F";
-var shelving = "BCD";///introducida por el usuario O en leida de la bbdd?
+var shelving = "BCD";///introducida por el usuario
 var collectionFk = '254';
 
 function ticketCollection(collectionFk, shelving){//parametro collectionFk
-    select(collectionFk, function(err,data){
+    select.select(collectionFk, function(err,data){
         if(filter.filterShelving(shelving)){
-            insert.insertTicket(data, shelving)
-         }
-         else{
+            insert.insertTicket(data, shelving,)
+        }
+        else{
          console.log("¡MATRICULA INCORRECTA!")
-         }
+        }
     });
 }
 
diff --git a/db/selectDB.js b/db/selectDB.js
index 85d5a0b..f2aacca 100644
--- a/db/selectDB.js
+++ b/db/selectDB.js
@@ -1,8 +1,8 @@
 const con = require('./connect')
 
 
-module.exports = function (collectionFk, callback){
-    let consSql = `SELECT t.id AS Ticket, c.name AS Client, am.name AS Agency, tc.level AS Level
+function select(collectionFk, callback){
+    let consSql = `SELECT t.id AS Ticket, c.name AS Client, am.name AS Agency, tc.level AS Level, tc.wagon AS Wagon
     FROM ticketCollection tc 
     JOIN ticket t ON t.id = tc.ticketFk JOIN client c ON t.clientFk = c.id
     JOIN agencyMode am ON am.id = t.agencyModeFk 
@@ -14,7 +14,7 @@ module.exports = function (collectionFk, callback){
     });
 }
 
-console.log("PROBA");
+exports.select =select;
 
 
 
diff --git a/insertShelving.js b/insertShelving.js
index e902bbd..00298ff 100644
--- a/insertShelving.js
+++ b/insertShelving.js
@@ -17,7 +17,7 @@ function insertShelving(shelving, level){
                             {
                                 attrCategory: "verdnatura",
                                 attrName: "sinTicket",
-                                barCode: shelving + level,//Matricula + nivel
+                                barCode: shelvingId,//Matricula + nivel
                                 itemTitle: "Etiqueta Sin ticket",
                             }
                         ]