diff --git a/src/lib/pg-ff-client.ts b/src/lib/pg-ff-client.ts index f798413..db6eaaf 100644 --- a/src/lib/pg-ff-client.ts +++ b/src/lib/pg-ff-client.ts @@ -83,19 +83,18 @@ export interface PgRankingRow { // --------------------------------------------------------------------------- /** - * Retourne la liste des fournisseurs depuis fouadr1 + artfou1. + * Retourne la liste des fournisseurs depuis fouident (vrais noms) + artfou1. */ export async function pgGetFournisseurs(search?: string): Promise<{ code: string; nom: string }[]> { try { const result = await db.execute(sql` - SELECT DISTINCT fa.code, fa.raisonsociale AS nom - FROM fouadr1 fa - INNER JOIN artfou1 af ON af.code = fa.code - WHERE fa.sit_code = '000' - AND fa.raisonsociale IS NOT NULL - AND fa.raisonsociale !~ '^\s*\d' - ${search ? sql`AND (fa.raisonsociale ILIKE ${'%' + search + '%'} OR fa.code ILIKE ${'%' + search + '%'})` : sql``} - ORDER BY fa.raisonsociale + SELECT DISTINCT fi.code, fi.nom + FROM fouident fi + INNER JOIN artfou1 af ON af.code = fi.code + WHERE fi.nom IS NOT NULL + AND fi.nom != '' + ${search ? sql`AND (fi.nom ILIKE ${'%' + search + '%'} OR fi.code ILIKE ${'%' + search + '%'})` : sql``} + ORDER BY fi.nom `); console.log(`[pg-ff] pgGetFournisseurs: ${result.rows.length} fournisseurs`); return (result.rows as unknown as { code: string; nom: string }[]).filter(r => r.code && r.nom); @@ -123,7 +122,7 @@ export async function pgGetArticlesByFournisseur(codefou: string): Promise