diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php index e6143d2c..d998fe07 100755 --- a/app/Http/Controllers/ArticleController.php +++ b/app/Http/Controllers/ArticleController.php @@ -199,21 +199,12 @@ class ArticleController extends Controller ->leftJoin(DB::raw('(SELECT CodArticoloGM, SUM(Qta) as totVen FROM T_WEB_Ordini GROUP BY CodArticoloGM) o'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'o.CodArticoloGM'); }) - ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(TRY_CAST(Qta AS INT)) as totFat FROM T_WEB_ArticoliFatturati GROUP BY CodArticolo) u'), function ($join) { - $join->on('T_WEB_Articoli.IdArticolo', '=', 'u.CodArticolo'); - }) ->leftJoin(DB::raw('(SELECT CodArticoloGM, SUM(Qta) as venduti3mesi, RANK() OVER (ORDER BY SUM(Qta) DESC) as rank3M FROM T_WEB_Ordini WHERE DataOra >= DATEADD(MONTH, -3, GETDATE()) GROUP BY CodArticoloGM) p'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'p.CodArticoloGM'); }) - ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(TRY_CAST(Qta AS INT)) as fat3mesi, RANK() OVER (ORDER BY SUM(TRY_CAST(Qta AS INT)) DESC) as fatrank3M - FROM T_WEB_ArticoliFatturati - WHERE DataOra >= DATEADD(MONTH, -3, GETDATE()) - GROUP BY CodArticolo) t'), function ($join) { - $join->on('T_WEB_Articoli.IdArticolo', '=', 't.CodArticolo'); - }) ->leftJoin(DB::raw('(SELECT CodArticoloGM, SUM(Qta) as venduti6mesi, RANK() OVER (ORDER BY SUM(Qta) DESC) as rank6M FROM T_WEB_Ordini WHERE DataOra >= DATEADD(MONTH, -6, GETDATE()) @@ -231,17 +222,26 @@ class ArticleController extends Controller GROUP BY CodArticoloGM) s'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 's.CodArticoloGM'); }) + ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(TRY_CAST(Qta AS INT)) as fat3mesi, RANK() OVER (ORDER BY SUM(TRY_CAST(Qta AS INT)) DESC) as fatrank3M + FROM T_WEB_ArticoliFatturati + WHERE DataOra >= DATEADD(MONTH, -3, GETDATE()) AND ISNUMERIC(Qta) = 1 + GROUP BY CodArticolo) t'), function ($join) { + $join->on('T_WEB_Articoli.IdArticolo', '=', 't.CodArticolo'); + }) + ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(TRY_CAST(Qta AS INT)) as totFat FROM T_WEB_ArticoliFatturati WHERE ISNUMERIC(Qta) = 1 GROUP BY CodArticolo) u'), function ($join) { + $join->on('T_WEB_Articoli.IdArticolo', '=', 'u.CodArticolo'); + }) ->select( 'T_WEB_Articoli.*', 'f.DescrizioneStatoProdotto', 'i.DescrizioneTipologia', 'n.DescrizioneFormato', DB::raw('COALESCE(o.totVen, 0) as totVen'), - DB::raw('COALESCE(o.totFat, 0) as totFat'), + DB::raw('COALESCE(u.totFat, 0) as totFat'), DB::raw('COALESCE(p.venduti3mesi, 0) as venduti3mesi'), DB::raw('COALESCE(t.fat3mesi, 0) as fat3mesi'), - DB::raw('COALESCE(t.fatrank3M, 0) as fatrank3M'), DB::raw('COALESCE(p.rank3M, 0) as rank3M'), + DB::raw('COALESCE(t.fatrank3M, 0) as fatrank3M'), DB::raw('COALESCE(q.venduti6mesi, 0) as venduti6mesi'), DB::raw('COALESCE(q.rank6M, 0) as rank6M'), DB::raw('COALESCE(r.venduti1anno, 0) as venduti1anno'), diff --git a/resources/views/export_articles_sales.blade.php b/resources/views/export_articles_sales.blade.php index 4f62fe5b..cc8877f0 100644 --- a/resources/views/export_articles_sales.blade.php +++ b/resources/views/export_articles_sales.blade.php @@ -27,6 +27,8 @@ Ult Ordi Tot Venduti Ult 3 Mese + Tot Fatt + Fatt 3 Mesi Ult 6 Mesi Ult Anno @@ -90,13 +92,12 @@ @endif @if (isset($articolo->totFat)) - {{ $articolo->totFat }} @endif - @if (isset($articolo->fat3mesi)) - {{ $articolo->fat3mesi }} + Fatt 3M: {{ $articolo->fat3mesi }} @endif @if (isset($articolo->venduti6mesi))