diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php index 0a888378..c6ade65c 100755 --- a/app/Http/Controllers/ArticleController.php +++ b/app/Http/Controllers/ArticleController.php @@ -269,29 +269,29 @@ class ArticleController extends Controller ->leftJoin(DB::raw('(SELECT l.IdTipoFormato, l.Descrizione as DescrizioneFormato FROM T_WEB_TipiFormato l JOIN (SELECT IdTipoFormato, MAX(DataOra) as data1 from T_WEB_TipiFormato GROUP BY IdTipoFormato) m ON l.IdTipoFormato = m.IdTipoFormato AND l.DataOra = m.data1 ) n'), function ($join) { $join->on('T_WEB_Articoli.IdTipoFormato', '=', 'n.IdTipoFormato'); }) - ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(CAST(Qta AS INT)) AS totVen FROM T_WEB_ArticoliFatturati GROUP BY CodArticolo) o'), function ($join) { + ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(CAST(Qta AS INT)) AS totVen FROM T_WEB_ArticoliFatturati WHERE ISNUMERIC(Qta) = 1 GROUP BY CodArticolo) o'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'o.CodArticolo'); }) ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(Qta) as venduti3mesi, RANK() OVER (ORDER BY SUM(Qta) DESC) as rank3M FROM T_WEB_ArticoliFatturati - WHERE DataOra >= DATEADD(MONTH, -3, GETDATE()) + WHERE DataOra >= DATEADD(MONTH, -3, GETDATE()) AND ISNUMERIC(Qta) = 1 GROUP BY CodArticolo) p'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'p.CodArticolo'); }) ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(Qta) as venduti6mesi, RANK() OVER (ORDER BY SUM(Qta) DESC) as rank6M FROM T_WEB_ArticoliFatturati - WHERE DataOra >= DATEADD(MONTH, -6, GETDATE()) + WHERE DataOra >= DATEADD(MONTH, -6, GETDATE()) AND ISNUMERIC(Qta) = 1 GROUP BY CodArticolo) q'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'q.CodArticolo'); }) ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(Qta) as venduti1anno, RANK() OVER (ORDER BY SUM(Qta) DESC) as rank1Y FROM T_WEB_ArticoliFatturati - WHERE DataOra >= DATEADD(MONTH, -12, GETDATE()) + WHERE DataOra >= DATEADD(MONTH, -12, GETDATE()) AND ISNUMERIC(Qta) = 1 GROUP BY CodArticolo) r'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'r.CodArticolo'); }) ->leftJoin(DB::raw('(SELECT CodArticolo, MAX(DataOra) as ultimoOrdine - FROM T_WEB_ArticoliFatturati + FROM T_WEB_ArticoliFatturati AND ISNUMERIC(Qta) = 1 GROUP BY CodArticolo) s'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 's.CodArticolo'); })