diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php index 0c1faeb1..332e41cf 100755 --- a/app/Http/Controllers/ArticleController.php +++ b/app/Http/Controllers/ArticleController.php @@ -45,10 +45,11 @@ class ArticleController extends Controller ini_set("memory_limit", "512M"); try { $ordini = DB::table('T_WEB_Ordini as O') - ->leftjoin(DB::raw('(SELECT IdArticolo, MAX(DataOra) AS data FROM T_WEB_Articoli GROUP BY IdArticolo) b'), function ($join) { - $join->on('T_WEB_Articoli.IdArticolo', '=', 'b.CodArticoloGM') - ->on('T_WEB_Articoli.DataOra', '=', 'b.data'); + ->leftJoin(DB::raw('(SELECT CodArticoloGM, MAX(DataOra) AS data FROM T_WEB_Articoli GROUP BY CodArticoloGM) b'), function ($join) { + $join->on('O.CodArticoloGM', '=', 'b.CodArticoloGM') + ->on('b.data', '=', DB::raw('(SELECT MAX(DataOra) FROM T_WEB_Articoli WHERE CodArticoloGM = O.CodArticoloGM)')); }) + ->join('T_WEB_Articoli as A', 'O.CodArticoloGM', '=', 'A.IdArticolo') ->select( DB::raw('ROW_NUMBER() OVER (ORDER BY O.DataOra DESC) AS progressivo'), 'O.DataOra',