verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

#7010 added filter fields to show packing type field in ticket list #3024

Merged
jon merged 6 commits from 7010-AddPackingField into dev 2024-10-18 07:40:36 +00:00
Conversation 0 Commits 6 Files Changed 1 +51 -45
1 changed files with 51 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
modules/ticket/back/methods/ticket/filter.js
View File

@ -228,52 +228,57 @@ module.exports = Self => {
stmt = new ParameterizedSQL(` stmt = new ParameterizedSQL(`
CREATE OR REPLACE TEMPORARY TABLE tmp.filter CREATE OR REPLACE TEMPORARY TABLE tmp.filter
(INDEX (id)) (INDEX (id))
ENGINE = MEMORY ENGINE = InnoDB
SELECT t.id, SELECT t.id,
jon marked this conversation as resolved Outdated
alexm commented 2024-10-18 06:56:04 +00:00
Outdated
Review
Copy Link

Crec que no cal el distimct

Crec que no cal el distimct
t.shipped, t.shipped,
CAST(DATE(t.shipped) AS CHAR) shippedDate, CAST(DATE(t.shipped) AS CHAR) shippedDate,
HOUR(t.shipped) shippedHour, HOUR(t.shipped) shippedHour,
t.nickname, t.nickname,
t.refFk, t.refFk,
t.routeFk, t.routeFk,
t.warehouseFk, t.warehouseFk,
t.clientFk, t.clientFk,
t.totalWithoutVat, t.totalWithoutVat,
t.totalWithVat, t.totalWithVat,
io.id invoiceOutId, io.id invoiceOutId,
a.provinceFk, a.provinceFk,
p.name province, p.name province,
w.name warehouse, w.name warehouse,
am.name agencyMode, am.name agencyMode,
am.id agencyModeFk, am.id agencyModeFk,
st.name state, st.name state,
st.classColor, st.classColor,
wk.lastName salesPerson, wk.lastName salesPerson,
ts.stateFk stateFk, ts.stateFk stateFk,
ts.alertLevel alertLevel, ts.alertLevel alertLevel,
ts.code alertLevelCode, ts.code alertLevelCode,
u.name userName, u.name userName,
c.salesPersonFk, c.salesPersonFk,
z.hour zoneLanding, z.hour zoneLanding,
HOUR(z.hour) zoneHour, HOUR(z.hour) zoneHour,
MINUTE(z.hour) zoneMinute, MINUTE(z.hour) zoneMinute,
z.name zoneName, z.name zoneName,
z.id zoneFk, z.id zoneFk,
CAST(z.hour AS CHAR) hour, CAST(z.hour AS CHAR) hour,
a.nickname addressNickname a.nickname addressNickname,
FROM ticket t (SELECT GROUP_CONCAT(DISTINCT i2.itemPackingTypeFk ORDER BY i2.itemPackingTypeFk SEPARATOR ',')
LEFT JOIN invoiceOut io ON t.refFk = io.ref FROM sale s2
LEFT JOIN zone z ON z.id = t.zoneFk JOIN item i2 ON i2.id = s2.itemFk
LEFT JOIN address a ON a.id = t.addressFk WHERE s2.ticketFk = t.id
LEFT JOIN province p ON p.id = a.provinceFk ) AS packing
LEFT JOIN warehouse w ON w.id = t.warehouseFk FROM ticket t
LEFT JOIN agencyMode am ON am.id = t.agencyModeFk LEFT JOIN invoiceOut io ON t.refFk = io.ref
LEFT JOIN ticketState ts ON ts.ticketFk = t.id LEFT JOIN zone z ON z.id = t.zoneFk
LEFT JOIN state st ON st.id = ts.stateFk LEFT JOIN address a ON a.id = t.addressFk
LEFT JOIN client c ON c.id = t.clientFk LEFT JOIN province p ON p.id = a.provinceFk
LEFT JOIN worker wk ON wk.id = c.salesPersonFk LEFT JOIN warehouse w ON w.id = t.warehouseFk
LEFT JOIN account.user u ON u.id = wk.id LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
LEFT JOIN route r ON r.id = t.routeFk LEFT JOIN ticketState ts ON ts.ticketFk = t.id
LEFT JOIN state st ON st.id = ts.stateFk
LEFT JOIN client c ON c.id = t.clientFk
LEFT JOIN worker wk ON wk.id = c.salesPersonFk
LEFT JOIN account.user u ON u.id = wk.id
LEFT JOIN route r ON r.id = t.routeFk
`); `);
if (args.orderFk) { if (args.orderFk) {
@ -292,6 +297,7 @@ module.exports = Self => {
} }
stmt.merge(conn.makeWhere(filter.where)); stmt.merge(conn.makeWhere(filter.where));
stmts.push(stmt); stmts.push(stmt);
stmt = new ParameterizedSQL(` stmt = new ParameterizedSQL(`