diff --git a/src/routes/articles.js b/src/routes/articles.js index 3968e90..474964f 100644 --- a/src/routes/articles.js +++ b/src/routes/articles.js @@ -275,11 +275,11 @@ router.get('/:id/dernier-fournisseur', async (req, res) => { m.QteMvt AS qte_entree, m.Prmp AS prmp FROM MvtArt m - LEFT JOIN fouident fi ON fi.code = m.CODEFOU + LEFT JOIN fouident fi ON fi.code = TRIM(m.CODEFOU) WHERE m.ArtNoId = $1 AND m.GenreMvt = 1 + AND TRIM(m.CODEFOU) != '' AND m.CODEFOU IS NOT NULL - AND m.CODEFOU != '' AND ($2 = '' OR m.Site LIKE $2) ORDER BY m.Site, m.DatMvt DESC `, [req.params.id, `%${site}%`]); diff --git a/src/routes/mouvements.js b/src/routes/mouvements.js index 7a9f123..53837fe 100644 --- a/src/routes/mouvements.js +++ b/src/routes/mouvements.js @@ -57,20 +57,20 @@ router.get('/articles', async (req, res) => { CASE WHEN m.GenreMvt = 3 THEN ( SELECT e.CODEFOU FROM MvtArt e WHERE e.ArtNoId = m.ArtNoId AND e.Site = m.Site - AND e.GenreMvt = 1 AND e.CODEFOU IS NOT NULL AND e.CODEFOU != '' + AND e.GenreMvt = 1 AND e.CODEFOU IS NOT NULL AND TRIM(e.CODEFOU) != '' AND e.DatMvt <= m.DatMvt ORDER BY e.DatMvt DESC LIMIT 1 - ) ELSE m.CODEFOU END AS codefou_reel, + ) ELSE TRIM(m.CODEFOU) END AS codefou_reel, CASE WHEN m.GenreMvt = 3 THEN ( SELECT fi.nom FROM MvtArt e - LEFT JOIN fouident fi ON fi.code = e.CODEFOU + LEFT JOIN fouident fi ON fi.code = TRIM(e.CODEFOU) WHERE e.ArtNoId = m.ArtNoId AND e.Site = m.Site - AND e.GenreMvt = 1 AND e.CODEFOU IS NOT NULL AND e.CODEFOU != '' + AND e.GenreMvt = 1 AND e.CODEFOU IS NOT NULL AND TRIM(e.CODEFOU) != '' AND e.DatMvt <= m.DatMvt ORDER BY e.DatMvt DESC LIMIT 1 ) ELSE ( SELECT fi2.nom FROM fouident fi2 - WHERE fi2.code = m.CODEFOU + WHERE fi2.code = TRIM(m.CODEFOU) ) END AS nom_fournisseur_reel FROM MvtArt m JOIN ARTICLES a ON a.NO_ID = m.ArtNoId