diff --git a/db/insertTicket.js b/db/insertTicket.js index 90a21db..d2f7cb6 100644 --- a/db/insertTicket.js +++ b/db/insertTicket.js @@ -1,14 +1,11 @@ const con = require('./connect'); function insertTicket(ticket, shelving, level) { - con.con.connect(function(err) { - if (err) throw err; - let sql = ` UPDATE vn.smartTag - SET ticketFk = '${ticket}' + let sql = `UPDATE vn.smartTag + SET ticketFk = ${ticket} WHERE level=${level} && shelvingFk='${shelving}';`; - con.con.query(sql, function(err, result) { - if (err) throw err; - }); + con.con.query(sql, function(err, result) { + if (err) throw err; }); } exports.insertTicket = insertTicket; diff --git a/db/selectCollection.js b/db/selectCollection.js index 2b9e69d..e7e7ea5 100644 --- a/db/selectCollection.js +++ b/db/selectCollection.js @@ -1,10 +1,12 @@ const con = require('./connect'); 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 + let consSql = `SELECT t.id AS Ticket, t.clientFk AS Client, am.name AS Agency, tc.level AS Level, tc.wagon AS Wagon, w.code AS Worker 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 + JOIN ticket t ON t.id = tc.ticketFk + JOIN collection c ON c.id = tc.collectionFk + JOIN worker w ON w.id = c.workerFk + JOIN agencyMode am ON am.id = t.agencyModeFk WHERE tc.collectionFk = ${collectionFk} ORDER BY tc.wagon, tc.level`; diff --git a/db/selectTicket.js b/db/selectTicket.js index 18657bb..804d7d4 100644 --- a/db/selectTicket.js +++ b/db/selectTicket.js @@ -1,7 +1,7 @@ const con = require('./connect'); function select(ticket, callback) { - let consSql = `SELECT st.ticketFk AS Ticket, st.shelvingFk AS Shelving, st.level AS Level, c.name AS Client, am.name AS Agency + let consSql = `SELECT st.ticketFk AS Ticket, st.shelvingFk AS Shelving, st.level AS Level, t.clientFk AS Client, am.name AS Agency FROM smartTag st JOIN ticket t ON st.ticketFk = t.id JOIN client c ON t.clientFk = c.id JOIN agencyMode am ON am.id = t.agencyModeFk WHERE st.ticketFk = ${ticket}`; diff --git a/methods/bindTicketShelving.js b/methods/bindTicketShelving.js index 45033e3..5109ac0 100644 --- a/methods/bindTicketShelving.js +++ b/methods/bindTicketShelving.js @@ -39,6 +39,7 @@ function insertTicket(consultaSql, shelving) { (async() => { for (let i = 0; i < consultaSql.length; i++) { for (let j = 0; j < consultaSql[i].Level.toString().length; j++) { + console.log('SHELVING: ', shelving[consultaSql[i].Wagon - 1]); const {body} = await got.post('http://app.etiquetaselectronicas.com:9999/item/batchImportItem', { // eslint-disable-line json: { agencyId: currentUser.agencyId, @@ -53,7 +54,9 @@ function insertTicket(consultaSql, shelving) { itemTitle: 'Etiqueta Con ticket', productCode: consultaSql[i].Ticket, // Ticket custFeature1: consultaSql[i].Client, // Client - custFeature2: consultaSql[i].Agency // Agencia de transporte + custFeature2: consultaSql[i].Agency, // Agencia de transporte + custFeature3: 0, // Agencia de transporte + custFeature4: consultaSql[i].Worker, // Agencia de transporte } ] }, diff --git a/methods/flashOn.js b/methods/flashOn.js index a40ac5f..4d32746 100644 --- a/methods/flashOn.js +++ b/methods/flashOn.js @@ -37,7 +37,7 @@ function insertFlash(consultaSql) { itemList: [ { attrCategory: 'verdnatura', - attrName: 'sinTicket', + attrName: 'conTicket', barCode: consultaSql[i].Shelving + consultaSql[i].Level, // Matricula + nivel itemTitle: 'Etiqueta Con ticket', productCode: consultaSql[i].Ticket, // Ticket