diff --git a/bindShelvingTag.js b/bindShelvingTag.js index 15116a8..dcac66b 100644 --- a/bindShelvingTag.js +++ b/bindShelvingTag.js @@ -1,27 +1,23 @@ const insertShelving = require('./insertShelving'); const bindShelving = require('./bindShelving'); +const filter = require('./filter'); -function smartTag(barcode, shelving, level){ - insertShelving.insertShelving(shelving, level); - bindShelving.bindShelving(barcode, shelving, level); +function bindShelvingTag(barcode, shelving, level){ + if(filter.filterBarcode(barcode)){ + if(filter.filterShelving(shelving)){ + insertShelving.insertShelving(shelving, level); + bindShelving.bindShelving(barcode, shelving, level); + }else{ + console.log("¡MATRICULA INCORRECTA!") + } + }else{ + console.log("¡CODIGO DE ETIQUETA INCORRECTO!") + } } - ///DATOS INTRODUCIDOS POR EL USUARIO//// var barcode = "A0A3B820690F"; //valido = "A0A3B82"+ 4 CARACTERES HEXADECIMALES (0-F) var shelving = "BCD"; //valido = 3 CARACTERES LETRAS (A-Z) var level = "1"; -smartTag(barcode, shelving, level); +bindShelvingTag(barcode, shelving, level); ////////////////////////////////////// -/*if(insert.filter(barcode,"barcode")){ - if(insert.filter(shelving,"shelving")){ - smartTag(barcode, shelving, level); - } - else{ - console.log("¡MATRICULA INCORRECTA!") - } -} -else{ - console.log("¡CODIGO DE ETIQUETA INCORRECTO!") -} -*/ \ No newline at end of file