verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 66 Releases Wiki Activity

Merge pull request '#8266 changed expedition item name' (!3297) from 8266-changeExpeditionItemName into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #3297
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
This commit is contained in:
Jose Antonio Tubau 2024-12-12 10:11:30 +00:00
parent a14989ddcf 03ba892581
commit 47a7fac0fe
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ticket/back/methods/expedition/filter.js
View File

@ -49,7 +49,8 @@ module.exports = Self => {
es.workerFk expeditionScanWorkerFk,
su.name scannerUserName,
es.scanned,
est.description state
est.description state,
de.longName
FROM vn.expedition e
LEFT JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk
INNER JOIN vn.item i1 ON i1.id = e.freightItemFk
@ -59,6 +60,7 @@ module.exports = Self => {
LEFT JOIN account.user u ON u.id = e.workerFk
LEFT JOIN vn.expeditionScan es ON es.expeditionFk = e.id
LEFT JOIN account.user su ON su.id = es.workerFk
LEFT JOIN dipole.expedition_PrintOut de ON de.expeditionFk = e.id
) e
`);
stmt.merge(conn.makeWhere(filter.where));