diff --git a/debo/validacion.js b/debo/validacion.js index 1305cbf..6d97352 100644 --- a/debo/validacion.js +++ b/debo/validacion.js @@ -1,20 +1,17 @@ -module.exports = function(debo, wsServer, gln) { +module.exports = function (fileString) { - return new Promise(function(resolve, reject) { + return new Promise(function (resolve, reject) { - wsServer - .getEntidad(gln, 'PMAEFACT_TEMP', { - TIP: debo.cabecera.TIP, - TCO: debo.cabecera.TCO, - SUC: debo.cabecera.SUC, - NCO: debo.cabecera.NCO, - COD: debo.cabecera.COD - }).then(function(values) { + var nameFileDest = fileString.split('\\')[fileString.split('\\').length - 1]; - if (values) { + knex('planex_transacciones') + .where({ archivoRecibido: nameFileDest }) + .then(function (values) { + + if (values.length) { reject('Ya existe el comprobante', values); } else { - resolve(debo); + resolve(); } }); }); diff --git a/index.js b/index.js index efb09ec..d5fa9ea 100644 --- a/index.js +++ b/index.js @@ -30,31 +30,30 @@ function onGetFile(fileString, nameFile) { if (!fileString) return; - var planex = require('./planex/index')(fileString); + require('./debo/validacion')(fileString).then(function() { - // Traigo proveedor, empresa - require('./debo/relaciones')(planex, wsServer).then(function(result) { + var planex = require('./planex/index')(fileString); - var planex = result.planex; + // Traigo proveedor, empresa + require('./debo/relaciones')(planex, wsServer).then(function(result) { - var entities = {}; + var planex = result.planex; - entities.proveedores = result.values[0]; - entities.empresa = result.values[1]; + var entities = {}; - var debo = require('./debo/index')(planex, entities); + entities.proveedores = result.values[0]; + entities.empresa = result.values[1]; - require('./debo/validacion')(debo, wsServer, planex.identificaxSucursalReceptorFactura.glnSucursal) - .then(function(debo) { + var debo = require('./debo/index')(planex, entities); - require('./db/index')(debo, nameFile); - }).catch(function(err) { + require('./db/index')(debo, nameFile); - console.log(err); - }); - - }).catch(function(e) { - console.log(e); + }).catch(function(e) { + console.log(e); + }); + }).catch(function(err) { + + console.log(err); }); } diff --git a/rutas/comprobantes.js b/rutas/comprobantes.js index c8b13d3..93dd77f 100644 --- a/rutas/comprobantes.js +++ b/rutas/comprobantes.js @@ -53,7 +53,7 @@ router.post('/comprobante', function(req, res) { delete req.body.cabecera.C_HD2; delete req.body.cabecera.E_HD2; - //smalldatetime + //smalldatetime TODO: USAR MOMENT JS req.body.cabecera.FEC = new Date(req.body.cabecera.FEC).toISOString().slice(0, 19).replace('T', ' '); req.body.cabecera.FECCAI = new Date(req.body.cabecera.FECCAI).toISOString().slice(0, 19).replace('T', ' '); req.body.cabecera.FECVEN = new Date(req.body.cabecera.FECVEN).toISOString().slice(0, 19).replace('T', ' ');