diff --git a/src/routes/articles.js b/src/routes/articles.js index 82a065d..3968e90 100644 --- a/src/routes/articles.js +++ b/src/routes/articles.js @@ -269,13 +269,13 @@ router.get('/:id/dernier-fournisseur', async (req, res) => { const result = await pool.query(` SELECT DISTINCT ON (m.Site) m.Site, - m.DatMvt AS date_derniere_entree, - m.CODEFOU AS codefou, - fa.RAISONSOCIALE AS nom_fournisseur, - m.QteMvt AS qte_entree, - m.Prmp AS prmp + m.DatMvt AS date_derniere_entree, + m.CODEFOU AS codefou, + fi.nom AS nom_fournisseur, + m.QteMvt AS qte_entree, + m.Prmp AS prmp FROM MvtArt m - LEFT JOIN FOUADR1 fa ON fa.CODE = m.CODEFOU AND fa.SIT_CODE = '000' + LEFT JOIN fouident fi ON fi.code = m.CODEFOU WHERE m.ArtNoId = $1 AND m.GenreMvt = 1 AND m.CODEFOU IS NOT NULL diff --git a/src/routes/fournisseurs.js b/src/routes/fournisseurs.js index 62698ff..7ead16b 100644 --- a/src/routes/fournisseurs.js +++ b/src/routes/fournisseurs.js @@ -11,7 +11,7 @@ router.get('/', async (req, res) => { const result = await pool.query(` SELECT f.CODE AS CODEFOU, - MAX(fa.RAISONSOCIALE) AS NOM, + MAX(fi.nom) AS NOM, MAX(fa.ADRLIGNE1) AS ADRESSE, MAX(fa.TELEPHONE) AS TELEPHONE, MAX(fa.EMAIL) AS EMAIL, @@ -21,6 +21,7 @@ router.get('/', async (req, res) => { SUM(CASE WHEN f.SUSPENDU IS NULL THEN 1 ELSE 0 END) AS NB_ACTIFS, SUM(CASE WHEN f.SUSPENDU IS NOT NULL THEN 1 ELSE 0 END) AS NB_SUSPENDUS FROM ARTFOU1 f + LEFT JOIN fouident fi ON fi.code = f.CODE LEFT JOIN FOUADR1 fa ON fa.CODE = f.CODE AND fa.SIT_CODE = '000' WHERE f.CODE LIKE $1 GROUP BY f.CODE diff --git a/src/routes/mouvements.js b/src/routes/mouvements.js index 8ede504..7a9f123 100644 --- a/src/routes/mouvements.js +++ b/src/routes/mouvements.js @@ -62,15 +62,15 @@ router.get('/articles', async (req, res) => { ORDER BY e.DatMvt DESC LIMIT 1 ) ELSE m.CODEFOU END AS codefou_reel, CASE WHEN m.GenreMvt = 3 THEN ( - SELECT fa.RAISONSOCIALE FROM MvtArt e - LEFT JOIN FOUADR1 fa ON fa.CODE = e.CODEFOU AND fa.SIT_CODE = '000' + SELECT fi.nom FROM MvtArt e + LEFT JOIN fouident fi ON fi.code = 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.DatMvt <= m.DatMvt ORDER BY e.DatMvt DESC LIMIT 1 ) ELSE ( - SELECT fa2.RAISONSOCIALE FROM FOUADR1 fa2 - WHERE fa2.CODE = m.CODEFOU AND fa2.SIT_CODE = '000' + SELECT fi2.nom FROM fouident fi2 + WHERE fi2.code = m.CODEFOU ) END AS nom_fournisseur_reel FROM MvtArt m JOIN ARTICLES a ON a.NO_ID = m.ArtNoId