Merge branch 'master' into hotFixDefaulterFilter
gitea/salix/pipeline/pr-master This commit looks good
Details
gitea/salix/pipeline/pr-master This commit looks good
Details
This commit is contained in:
commit
0e8b4d92bf
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
|
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
|
||||||
const buildFilter = require('vn-loopback/util/filter').buildFilter;
|
const buildFilter = require('vn-loopback/util/filter').buildFilter;
|
||||||
const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
|
const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
|
||||||
|
@ -179,11 +178,11 @@ module.exports = Self => {
|
||||||
win.name warehouseInName,
|
win.name warehouseInName,
|
||||||
wout.name warehouseOutName,
|
wout.name warehouseOutName,
|
||||||
cnt.code continent
|
cnt.code continent
|
||||||
FROM vn.travel t
|
FROM travel t
|
||||||
JOIN vn.agencyMode am ON am.id = t.agencyModeFk
|
JOIN agencyMode am ON am.id = t.agencyModeFk
|
||||||
JOIN vn.warehouse win ON win.id = t.warehouseInFk
|
JOIN warehouse win ON win.id = t.warehouseInFk
|
||||||
JOIN vn.warehouse wout ON wout.id = t.warehouseOutFk
|
JOIN warehouse wout ON wout.id = t.warehouseOutFk
|
||||||
JOIN vn.awb a ON a.id = t.awbFk
|
LEFT JOIN awb a ON a.id = t.awbFk
|
||||||
JOIN warehouse wo ON wo.id = t.warehouseOutFk
|
JOIN warehouse wo ON wo.id = t.warehouseOutFk
|
||||||
JOIN country c ON c.id = wo.countryFk
|
JOIN country c ON c.id = wo.countryFk
|
||||||
LEFT JOIN continent cnt ON cnt.id = c.continentFk) AS t`
|
LEFT JOIN continent cnt ON cnt.id = c.continentFk) AS t`
|
||||||
|
|
Loading…
Reference in New Issue