浏览代码

iqd_convert.py angepasst und SQL-Dateien neu erstellt

Vogl 2 年之前
父节点
当前提交
3689138a3f
共有 40 个文件被更改,包括 103 次插入98 次删除
  1. 1 1
      System/ARI/IQD/Belege/Belege.iqd
  2. 1 1
      System/ARI/IQD/Belege/Belege.sql
  3. 1 1
      System/ARI/IQD/Belege/Belege_Umsatz_FIBU.sql
  4. 1 1
      System/ARI/IQD/Belege/NW_GW_GK_Stk_fuer_FIBU_Betrag.sql
  5. 1 1
      System/ARI/IQD/Belege/NW_GW_GK_Stk_fuer_FIBU_Menge.sql
  6. 2 2
      System/ARI/IQD/Belege/current_date_Prognose.sql
  7. 1 1
      System/ARI/IQD/NW_GW/NW_GW_BE_neu.sql
  8. 1 2
      System/ARI/IQD/NW_GW/NW_GW_VK_TIM.sql
  9. 1 1
      System/ARI/IQD/NW_GW/NW_GW_VK_TIM_Grosskd.sql
  10. 1 1
      System/ARI/IQD/Service/Add_Service_ledger_mit_Time_Clock_Entry_fuer_Service_Rg_Ausg_ims.sql
  11. 1 1
      System/ARI/IQD/Service/SRD_Teile_neu_3.sql
  12. 5 5
      System/ARI/IQD/Service/Service_Ausgangsrechnung_ab_2011.sql
  13. 1 1
      System/ARI/IQD/Service/Service_Ausgangsrechnung_ab_2011_ben_AW.sql
  14. 4 4
      System/ARI/IQD/Service/Service_Gutschriften_ab_2011.sql
  15. 2 2
      System/ARI/IQD/Service/Service_offene_Auftraege_neu_mitMont_Anzeige.sql
  16. 3 3
      System/ARI/IQD/Zeit/Add_Serv_Ledger_Entry_fakt_AW_Monteur.sql
  17. 1 1
      System/ARI/IQD/Zeit/Add_Serv_Ledger_Entry_fakt_AW_Monteur_Export_Datum_fuer_Time_clock_Entry.sql
  18. 6 6
      System/ARI/IQD/Zeit/Time_Clock_Entry.sql
  19. 6 6
      System/ARI/IQD/Zeit/Time_Clock_Entry_Monteurlisten.sql
  20. 8 8
      System/ARI/IQD/Zeit/Zeit_2_Ryma.sql
  21. 1 1
      System/ARI/SQL/schema/ARI/views/ims.Add_Serv_Ledger_Entry_fakt_AW_Monteur_Export_Datum_fuer_Time_clock_Entry.sql
  22. 1 1
      System/ARI/SQL/schema/ARI/views/ims.Add_Service_ledger_mit_Time_Clock_Entry_fuer_Service_Rg_Ausg_ims.sql
  23. 6 6
      System/ARI/SQL/schema/ARI/views/ims.Time_Clock_Entry_Monteurlisten.sql
  24. 3 3
      System/ARI/SQL/schema/ARI/views/staging.Add_Serv_Ledger_Entry_fakt_AW_Monteur.sql
  25. 1 1
      System/ARI/SQL/schema/ARI/views/staging.Belege.sql
  26. 1 1
      System/ARI/SQL/schema/ARI/views/staging.Belege_Umsatz_FIBU.sql
  27. 1 1
      System/ARI/SQL/schema/ARI/views/staging.NW_GW_BE_neu.sql
  28. 1 1
      System/ARI/SQL/schema/ARI/views/staging.NW_GW_GK_Stk_fuer_FIBU_Betrag.sql
  29. 1 1
      System/ARI/SQL/schema/ARI/views/staging.NW_GW_GK_Stk_fuer_FIBU_Menge.sql
  30. 1 2
      System/ARI/SQL/schema/ARI/views/staging.NW_GW_VK_TIM.sql
  31. 1 1
      System/ARI/SQL/schema/ARI/views/staging.NW_GW_VK_TIM_Grosskd.sql
  32. 1 1
      System/ARI/SQL/schema/ARI/views/staging.SRD_Teile_neu_3.sql
  33. 5 5
      System/ARI/SQL/schema/ARI/views/staging.Service_Ausgangsrechnung_ab_2011.sql
  34. 1 1
      System/ARI/SQL/schema/ARI/views/staging.Service_Ausgangsrechnung_ab_2011_ben_AW.sql
  35. 4 4
      System/ARI/SQL/schema/ARI/views/staging.Service_Gutschriften_ab_2011.sql
  36. 2 2
      System/ARI/SQL/schema/ARI/views/staging.Service_offene_Auftraege_neu_mitMont_Anzeige.sql
  37. 6 6
      System/ARI/SQL/schema/ARI/views/staging.Time_Clock_Entry.sql
  38. 8 8
      System/ARI/SQL/schema/ARI/views/staging.Zeit_2_Ryma.sql
  39. 2 2
      System/ARI/SQL/schema/ARI/views/staging.current_date_Prognose.sql
  40. 8 1
      Tasks/scripts/iqd_convert.py

+ 1 - 1
System/ARI/IQD/Belege/Belege.iqd

@@ -2,7 +2,7 @@ COGNOS QUERY
 STRUCTURE,1,1
 DATABASE,ARIntelligence
 DATASOURCENAME,C:\GlobalCube\System\ARI\IQD\Belege\Belege.imr
-TITLE,Belege.imr
+TITLE,Belege.imr - Kopieren
 BEGIN SQL
 select T1."No_" as c1,
 	   T1."Name" as c2,

+ 1 - 1
System/ARI/IQD/Belege/Belege.sql

@@ -38,7 +38,7 @@ select T1."No_" as "No",
 	   T3."Code" as "Code",
 	   T3."Name" as "Name",
 	   T2."Posting Date" as "Bookkeep Date",
-	   CASE WHEN (T2."Branch Code" = 'BUR') THEN ('10') WHEN (T2."Branch Code" = 'MUE') THEN ('20') ELSE ((od_left(T2."Global Dimension 1 Code",2))) END as "Betrieb",
+	   CASE WHEN (T2."Branch Code" = 'BUR') THEN ('10') WHEN (T2."Branch Code" = 'MUE') THEN ('20') ELSE ((left(T2."Global Dimension 1 Code",2))) END as "Betrieb",
 	   T2."G_L Account No_" as "Acct Nr",
 	   ((convert(float, T2."Amount"))) as "Betrag",
 	   (convert(float, T2."Amount")) as "Amount_1",

+ 1 - 1
System/ARI/IQD/Belege/Belege_Umsatz_FIBU.sql

@@ -38,7 +38,7 @@ select T1."No_" as "No",
 	   T3."Code" as "Code",
 	   T3."Name" as "Name",
 	   T2."Posting Date" as "Bookkeep Date",
-	   CASE WHEN (T2."Branch Code" = 'BUR') THEN ('10') WHEN (T2."Branch Code" = 'MUE') THEN ('20') ELSE ((od_left(T2."Global Dimension 1 Code",2))) END as "Betrieb",
+	   CASE WHEN (T2."Branch Code" = 'BUR') THEN ('10') WHEN (T2."Branch Code" = 'MUE') THEN ('20') ELSE ((left(T2."Global Dimension 1 Code",2))) END as "Betrieb",
 	   T2."G_L Account No_" as "Acct Nr",
 	   ((convert(float, T2."Amount"))) as "Betrag",
 	   (convert(float, T2."Amount")) as "Amount_1",

+ 1 - 1
System/ARI/IQD/Belege/NW_GW_GK_Stk_fuer_FIBU_Betrag.sql

@@ -170,7 +170,7 @@ from
 	   (convert(float, T2."Invoiced Quantity")) * -1 as c89,
 	   CASE WHEN ((day((now()) - T1."Posting Date")) <= 90) THEN (T3."Document No_" + ' - ' + T3."Description" + ' - ' + T3."User ID") ELSE null END as c90,
 	   T3."Description" as c91,
-	   CASE WHEN (T3."Branch Code" = 'BUR') THEN ('10') WHEN (T3."Branch Code" = 'MUE') THEN ('20') ELSE ((od_left(T3."Global Dimension 1 Code",2))) END as c92,
+	   CASE WHEN (T3."Branch Code" = 'BUR') THEN ('10') WHEN (T3."Branch Code" = 'MUE') THEN ('20') ELSE ((left(T3."Global Dimension 1 Code",2))) END as c92,
 	   T1."Posting Date" as c93,
 	   CASE WHEN (((T3."Veh_ Source Code" IN (1,2)) and ((CASE WHEN (T1."Gen_ Bus_ Posting Group" = 'GROSSKD') THEN ('Grosskunde') ELSE ('Kauf') END) = 'Kauf')) or (((CASE WHEN (T1."Gen_ Bus_ Posting Group" = 'GROSSKD') THEN ('Grosskunde') ELSE ('Kauf') END) = 'Grosskunde') and (T3."G_L Account No_" = '88200'))) THEN ('ja') ELSE ('nein') END as c94,
 	   CASE WHEN (((CASE WHEN (T1."Gen_ Bus_ Posting Group" = 'GROSSKD') THEN ('Grosskunde') ELSE ('Kauf') END) = 'Kauf') and (T1."Document No_" = T3."Document No_")) THEN ('ja') WHEN ((CASE WHEN (T1."Gen_ Bus_ Posting Group" = 'GROSSKD') THEN ('Grosskunde') ELSE ('Kauf') END) = 'Grosskunde') THEN ('ja') ELSE ('nein') END as c95,

+ 1 - 1
System/ARI/IQD/Belege/NW_GW_GK_Stk_fuer_FIBU_Menge.sql

@@ -171,7 +171,7 @@ from
 	   CASE WHEN ((day((now()) - T1."Posting Date")) <= 90) THEN (T3."Document No_" + ' - ' + T3."Description" + ' - ' + T3."User ID") ELSE null END as c90,
 	   T3."Description" as c91,
 	   T3."G_L Account No_" + '_STK' as c92,
-	   CASE WHEN ((T3."Branch Code" = 'BUR') or (T3."Branch Code" = '')) THEN ('10') WHEN (T3."Branch Code" = 'MUE') THEN ('20') ELSE ((od_left(T3."Global Dimension 1 Code",2))) END as c93,
+	   CASE WHEN ((T3."Branch Code" = 'BUR') or (T3."Branch Code" = '')) THEN ('10') WHEN (T3."Branch Code" = 'MUE') THEN ('20') ELSE ((left(T3."Global Dimension 1 Code",2))) END as c93,
 	   T1."Posting Date" as c94,
 	   CASE WHEN (((T3."Veh_ Source Code" IN (1,2)) and ((CASE WHEN (T1."Gen_ Bus_ Posting Group" = 'GROSSKD') THEN ('Grosskunde') ELSE ('Kauf') END) = 'Kauf')) or (((CASE WHEN (T1."Gen_ Bus_ Posting Group" = 'GROSSKD') THEN ('Grosskunde') ELSE ('Kauf') END) = 'Grosskunde') and (T3."G_L Account No_" = '88200'))) THEN ('ja') ELSE ('nein') END as c95,
 	   CASE WHEN (((CASE WHEN (T1."Gen_ Bus_ Posting Group" = 'GROSSKD') THEN ('Grosskunde') ELSE ('Kauf') END) = 'Kauf') and (T1."Document No_" = T3."Document No_")) THEN ('ja') WHEN ((CASE WHEN (T1."Gen_ Bus_ Posting Group" = 'GROSSKD') THEN ('Grosskunde') ELSE ('Kauf') END) = 'Grosskunde') THEN ('ja') ELSE ('nein') END as c96,

+ 2 - 2
System/ARI/IQD/Belege/current_date_Prognose.sql

@@ -22,9 +22,9 @@ from
 	   T1."zaehler_mosa" as "Zaehler Mosa",
 	   T1."summe_mosa" as "Summe Mosa",
 	   T1."feiertage_id" as "Feiertage Id",
-	   (@CURRENT_DATE) - INTERVAL '001 00:00:00.000' as "Jahr",
+	   (getdate()) - INTERVAL '001 00:00:00.000' as "Jahr",
 	   CASE WHEN (T1."datum" BETWEEN convert(datetime, '2008-01-01 00:00:00.000') AND convert(datetime, '2008-12-31 00:00:00.000')) THEN (252) WHEN (T1."datum" BETWEEN convert(datetime, '2009-01-01 00:00:00.000') AND convert(datetime, '2009-12-31 00:00:00.000')) THEN (252) WHEN (T1."datum" BETWEEN convert(datetime, '2010-01-01 00:00:00.000') AND convert(datetime, '2010-12-31 00:00:00.000')) THEN (253) WHEN (T1."datum" BETWEEN convert(datetime, '2011-01-01 00:00:00.000') AND convert(datetime, '2011-12-31 00:00:00.000')) THEN (250) WHEN (T1."datum" BETWEEN convert(datetime, '2012-01-01 00:00:00.000') AND convert(datetime, '2012-12-31 00:00:00.000')) THEN (249) ELSE (250) END as "Gesamt Arbeitstage"
 from "Arbeitstage" T1
-where (((((T1."bundeslaender_id" = '2') and (T1."arbeitstag_mosa" = 1)) and ((od_year(T1."datum")) = (year(((@CURRENT_DATE) - INTERVAL '001 00:00:00.000'))))) and (T1."datum" <= ((@CURRENT_DATE) - INTERVAL '001 00:00:00.000'))) or (((T1."bundeslaender_id" = '2') and ((od_year(T1."datum")) = (year(((@CURRENT_DATE) - INTERVAL '001 00:00:00.000'))))) and (T1."datum" IN (convert(datetime, '2022-01-01 00:00:00.000'),convert(datetime, '2021-01-01 00:00:00.000'),convert(datetime, '2023-01-01 00:00:00.000'),convert(datetime, '2024-01-01 00:00:00.000'),convert(datetime, '2025-01-01 00:00:00.000')))))
+where (((((T1."bundeslaender_id" = '2') and (T1."arbeitstag_mosa" = 1)) and ((od_year(T1."datum")) = (year(((getdate()) - INTERVAL '001 00:00:00.000'))))) and (T1."datum" <= ((getdate()) - INTERVAL '001 00:00:00.000'))) or (((T1."bundeslaender_id" = '2') and ((od_year(T1."datum")) = (year(((getdate()) - INTERVAL '001 00:00:00.000'))))) and (T1."datum" IN (convert(datetime, '2022-01-01 00:00:00.000'),convert(datetime, '2021-01-01 00:00:00.000'),convert(datetime, '2023-01-01 00:00:00.000'),convert(datetime, '2024-01-01 00:00:00.000'),convert(datetime, '2025-01-01 00:00:00.000')))))
 -- order by "Bundeslaender Id" asc,"Datum" asc,"Wochentage Id" asc,"Arbeitstag Mofr" asc,"Zaehler Mofr" asc,"Summe Mofr" asc,"Arbeitstag Mosa" asc,"Zaehler Mosa" asc,"Summe Mosa" asc,"Feiertage Id" asc,"Gesamt Arbeitstage" asc
 ) D1

文件差异内容过多而无法显示
+ 1 - 1
System/ARI/IQD/NW_GW/NW_GW_BE_neu.sql


文件差异内容过多而无法显示
+ 1 - 2
System/ARI/IQD/NW_GW/NW_GW_VK_TIM.sql


文件差异内容过多而无法显示
+ 1 - 1
System/ARI/IQD/NW_GW/NW_GW_VK_TIM_Grosskd.sql


+ 1 - 1
System/ARI/IQD/Service/Add_Service_ledger_mit_Time_Clock_Entry_fuer_Service_Rg_Ausg_ims.sql

@@ -19,6 +19,6 @@ from
 	   CASE WHEN (T1."Document No_" LIKE 'WGG%') THEN ((convert(float, T2."Duration")) * -1) ELSE ((convert(float, T2."Duration"))) END as c20,
 	   T1."Order No_" as c21
 from ("Vogl7x"."dbo"."BMW AH Vogl$Add_ Service Ledger Entry" T1 left outer join "Vogl7x"."dbo"."BMW AH Vogl$Time Clock Entry" T2 on ((T1."Order No_" = T2."Service Order No_") and (T1."Service Job No_" = T2."Service Job No_")) and (T1."No_" = T2."Resource No_"))
-where ((((T1."Posting Date" >= convert(datetime, '2020-01-01 00:00:00.000')) and ((od_left(T1."Document No_",3)) IN ('WRG','WGG','INT'))) and (T2."Sorting" = 0)) and (T2."Canceled" = 0))
+where ((((T1."Posting Date" >= convert(datetime, '2020-01-01 00:00:00.000')) and ((left(T1."Document No_",3)) IN ('WRG','WGG','INT'))) and (T2."Sorting" = 0)) and (T2."Canceled" = 0))
 ) D1
 -- order by "Document No_Add_Serv" asc

+ 1 - 1
System/ARI/IQD/Service/SRD_Teile_neu_3.sql

@@ -83,7 +83,7 @@ select c157 as "Register No",
 from 
 (select ((cast_numberToString(cast_integer(T1."Entry No_"))) + T1."Document No_") as c85,
 	   CASE WHEN ((day((now()) - T1."Posting Date")) <= 3) THEN ((CASE WHEN (T3."No_" IS NOT NULL) THEN (T1."Document No_" + ' / ' + (CASE WHEN (T3."No_" IS NOT NULL) THEN (T3."No_" + ' - ' + T3."Name") ELSE null END)) ELSE (T1."Document No_") END)) ELSE null END as c86,
-	   (od_left(T1."Document No_",4)) as c87,
+	   (left(T1."Document No_",4)) as c87,
 	   CASE WHEN (T4."Item Group Code" BETWEEN '00' AND '22') THEN ('Artikelgruppe 0 - 22') WHEN (T4."Item Group Code" BETWEEN '23' AND '33') THEN ('Artikelgruppe 23 - 33') WHEN (T4."Item Group Code" BETWEEN '34' AND '99') THEN ('Artikelgruppe 34 - 99') ELSE ('Teileart fehlt/Rest') END as c88,
 	   CASE WHEN (T3."Extra Code 3" = 'EXPORT') THEN ('Anteil Export') ELSE ('Anteil Inland') END as c89,
 	   T3."Extra Code 3" as c90,

+ 5 - 5
System/ARI/IQD/Service/Service_Ausgangsrechnung_ab_2011.sql

@@ -338,10 +338,10 @@ from
 	   T3."Gen_ Prod_ Posting Group" as c176,
 	   T9."Name" as c177,
 	   T9."Post Code" as c178,
-	   (od_left(T9."Post Code",4)) as c179,
-	   (od_left(T9."Post Code",3)) as c180,
-	   (od_left(T9."Post Code",2)) as c181,
-	   (od_left(T9."Post Code",1)) as c182,
+	   (left(T9."Post Code",4)) as c179,
+	   (left(T9."Post Code",3)) as c180,
+	   (left(T9."Post Code",2)) as c181,
+	   (left(T9."Post Code",1)) as c182,
 	   CASE WHEN (T3."Gen_ Prod_ Posting Group" LIKE '%ART%') THEN (((convert(float, T3."Amount")))) ELSE (0) END as c183,
 	   (convert(float, T10."Total Cost")) as c184,
 	   CASE WHEN (T3."Gen_ Prod_ Posting Group" LIKE '%LOHN%') THEN (T3."Gen_ Prod_ Posting Group") ELSE null END as c185,
@@ -467,7 +467,7 @@ from
 from ((((("Vogl7x"."dbo"."BMW AH Vogl$Sales Invoice Header" T1 left outer join "Vogl7x"."dbo"."BMW AH Vogl$Vehicle" T2 on T1."Supply VIN" = T2."VIN") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Customer" T9 on T9."No_" = T1."Bill-to Customer No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Customer Group" T8 on T9."Customer Group Code" = T8."Code") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Customer" T12 on T12."No_" = T1."Sell-to Customer No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Customer Group" T13 on T12."Customer Group Code" = T13."Code"),
 	(((((("Vogl7x"."dbo"."BMW AH Vogl$Sales Invoice Line" T3 left outer join "Vogl7x"."dbo"."BMW AH Vogl$Archived Service Header" T4 on T3."Service Order No_" = T4."No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Service Header" T5 on T3."Service Order No_" = T5."No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Employee" T6 on T4."Service Advisor No_" = T6."No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Employee" T7 on T5."Service Advisor No_" = T7."No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Service Ledger Entry" T10 on ((T3."Document No_" = T10."Document No_") and (T3."Type" = 2)) and (T3."No_" = T10."No_")) left outer join "Vogl7x"."dbo"."BMW AH Vogl$Labor Ledger Entry" T11 on (((T3."Document No_" = T11."Document No_") and (T3."Labor No_" = T11."Labor No_")) and (T3."Service Order No_" = T11."Service Order No_")) and (T3."Service Order Line No_" = T11."Service Order Line No_"))
 where (T1."No_" = T3."Document No_")
-and (((((od_left(T1."No_",1)) IN ('I','W')) and (not T3."Type" IN (0,11,12))) and (T1."Posting Date" >= convert(datetime, '2020-01-01 00:00:00.000'))) and (not (CASE WHEN ((day((now()) - T1."Posting Date")) <= 60) THEN (T1."Service Order No_") ELSE ('Aufträge älter 60 Tage') END) IN ('NASISPA')))
+and (((((left(T1."No_",1)) IN ('I','W')) and (not T3."Type" IN (0,11,12))) and (T1."Posting Date" >= convert(datetime, '2020-01-01 00:00:00.000'))) and (not (CASE WHEN ((day((now()) - T1."Posting Date")) <= 60) THEN (T1."Service Order No_") ELSE ('Aufträge älter 60 Tage') END) IN ('NASISPA')))
 ) D1
 ) D4
 -- order by "No" asc,"Line No" asc

+ 1 - 1
System/ARI/IQD/Service/Service_Ausgangsrechnung_ab_2011_ben_AW.sql

@@ -114,5 +114,5 @@ from "ims"."Add_Service_ledger_mit_Time_Clock_Entry_fuer_Service_Rg_Ausg_ims" T1
 	((((("Vogl7x"."dbo"."BMW AH Vogl$Sales Invoice Header" T1 left outer join "Vogl7x"."dbo"."BMW AH Vogl$Vehicle" T2 on T1."Supply VIN" = T2."VIN") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Customer" T9 on T9."No_" = T1."Bill-to Customer No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Customer Group" T8 on T9."Customer Group Code" = T8."Code") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Customer" T10 on T10."No_" = T1."Sell-to Customer No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Customer Group" T11 on T10."Customer Group Code" = T11."Code"),
 	(((("Vogl7x"."dbo"."BMW AH Vogl$Sales Invoice Line" T3 left outer join "Vogl7x"."dbo"."BMW AH Vogl$Archived Service Header" T4 on T3."Service Order No_" = T4."No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Service Header" T5 on T3."Service Order No_" = T5."No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Employee" T6 on T4."Service Advisor No_" = T6."No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Employee" T7 on T5."Service Advisor No_" = T7."No_")
 where (T1."No_" = T3."Document No_") and ((T1."No_" = T12."Document No_") and (T1."Service Order No_" = T12."Order No_"))
-and (((((od_left(T1."No_",1)) IN ('I','W')) and (not T3."Type" IN (0,11,12))) and (T1."Posting Date" >= convert(datetime, '2020-01-01 00:00:00.000'))) and (not (CASE WHEN ((day((now()) - T1."Posting Date")) <= 60) THEN (T1."Service Order No_") ELSE ('Aufträge älter 60 Tage') END) IN ('NASISPA')))
+and (((((left(T1."No_",1)) IN ('I','W')) and (not T3."Type" IN (0,11,12))) and (T1."Posting Date" >= convert(datetime, '2020-01-01 00:00:00.000'))) and (not (CASE WHEN ((day((now()) - T1."Posting Date")) <= 60) THEN (T1."Service Order No_") ELSE ('Aufträge älter 60 Tage') END) IN ('NASISPA')))
 -- order by "No" asc

+ 4 - 4
System/ARI/IQD/Service/Service_Gutschriften_ab_2011.sql

@@ -324,10 +324,10 @@ from
 	   CASE WHEN ((day((now()) - T1."Posting Date")) <= 100) THEN (T1."No_" + ' - ' + T9."Name") ELSE ('Rechnungen älter 100 Tage') END as c170,
 	   CASE WHEN ((day((now()) - T1."Posting Date")) <= 100) THEN ((CASE WHEN (T1."Service Order No_" = ' ') THEN ('Gutschrift ohne Auftrag') ELSE (T1."Service Order No_") END) + ' - ' + T9."Name") ELSE ('Aufträge älter 100 Tage') END as c171,
 	   T9."Post Code" as c172,
-	   (od_left(T9."Post Code",4)) as c173,
-	   (od_left(T9."Post Code",3)) as c174,
-	   (od_left(T9."Post Code",2)) as c175,
-	   (od_left(T9."Post Code",1)) as c176,
+	   (left(T9."Post Code",4)) as c173,
+	   (left(T9."Post Code",3)) as c174,
+	   (left(T9."Post Code",2)) as c175,
+	   (left(T9."Post Code",1)) as c176,
 	   CASE WHEN (T3."Gen_ Prod_ Posting Group" LIKE '%ART%') THEN (((convert(float, T3."Amount"))) * -1) ELSE (0) END as c177,
 	   (convert(float, T10."Total Cost")) as c178,
 	   CASE WHEN (T3."Gen_ Prod_ Posting Group" LIKE '%LOHN%') THEN (T3."Gen_ Prod_ Posting Group") ELSE null END as c179,

+ 2 - 2
System/ARI/IQD/Service/Service_offene_Auftraege_neu_mitMont_Anzeige.sql

@@ -244,8 +244,8 @@ from
 	   T2."Last Name" as c246,
 	   T2."First Name" as c247,
 	   T2."No_" as c248,
-	   CASE WHEN ((T1."Location Code" = 'BUR') or (T1."Location Code" = '')) THEN ('10') WHEN (T1."Location Code" = 'MUE') THEN ('20') ELSE ((od_left(T1."Department Code",2))) END as c249,
-	   (od_left(T1."Department Code",2)) as c250,
+	   CASE WHEN ((T1."Location Code" = 'BUR') or (T1."Location Code" = '')) THEN ('10') WHEN (T1."Location Code" = 'MUE') THEN ('20') ELSE ((left(T1."Department Code",2))) END as c249,
+	   (left(T1."Department Code",2)) as c250,
 	   T1."Service Advisor No_" as c251,
 	   T1."Status Code" as c252,
 	   T1."Work Completed" as c253,

+ 3 - 3
System/ARI/IQD/Zeit/Add_Serv_Ledger_Entry_fakt_AW_Monteur.sql

@@ -59,16 +59,16 @@ from
 	   (convert(float, T5."Quantity")) as c60,
 	   T4."Function Code" as c61,
 	   T4."Default Task Type" as c62,
-	   CASE WHEN ((od_left(T3."Department No_",2)) = '10') THEN ('10') WHEN ((od_left(T3."Department No_",2)) = '20') THEN ('20') ELSE null END as c63,
+	   CASE WHEN ((left(T3."Department No_",2)) = '10') THEN ('10') WHEN ((left(T3."Department No_",2)) = '20') THEN ('20') ELSE null END as c63,
 	   T3."Department No_" as c64,
-	   CASE WHEN ((od_left(T3."Department No_",2)) = '10') THEN ('LBS') WHEN ((od_left(T3."Department No_",2)) = '20') THEN ('WLS') ELSE null END as c65,
+	   CASE WHEN ((left(T3."Department No_",2)) = '10') THEN ('LBS') WHEN ((left(T3."Department No_",2)) = '20') THEN ('WLS') ELSE null END as c65,
 	   T1."Location Code" as c66,
 	   CASE WHEN ((T3."Leaving Date" < (now())) and (T3."Leaving Date" <> convert(datetime, '1753-01-01 00:00:00.000'))) THEN ('ausgetretene Mitarbeiter') ELSE ('prod. Personal') END as c67,
 	   T3."Leaving Date" as c68,
 	   T3."Group No_ 2" as c69,
 	   T3."Group No_ 3" as c70,
 	   T3."Group No_ 1" as c71,
-	   (cdate(T1."Posting Date")) as c72,
+	   ((T1."Posting Date")) as c72,
 	   CASE WHEN (((day((now()) - T1."Posting Date")) <= 93) and (T2."Bill-to Name" IS NOT NULL)) THEN (T1."Order No_" + ' - ' + T2."Bill-to Name") ELSE null END as c73,
 	   T1."Posting Date" as c74,
 	   T2."Bill-to Name" as c75,

+ 1 - 1
System/ARI/IQD/Zeit/Add_Serv_Ledger_Entry_fakt_AW_Monteur_Export_Datum_fuer_Time_clock_Entry.sql

@@ -1,7 +1,7 @@
 select distinct T1."Order No_" as "Order No",
 	   '' as "Auftrag_Kunde",
 	   MIN(T1."Posting Date") as "Minimum_Datum_Auftrag",
-	   (cdate((MIN(T1."Posting Date")))) as "Datum_Monteurlisten"
+	   (((MIN(T1."Posting Date")))) as "Datum_Monteurlisten"
 from "Vogl7x"."dbo"."BMW AH Vogl$Add_ Service Ledger Entry" T1
 where (T1."Source Code" = 'VERKAUF')
 group by T1."Order No_"

+ 6 - 6
System/ARI/IQD/Zeit/Time_Clock_Entry.sql

@@ -50,13 +50,13 @@ select T1."Entry No_" as "Entry No",
 	   T5."Function Code" as "Monteur_Gruppe_ori",
 	   (day((now()) - T4."Leaving Date")) as "Tage Heute Leaving Date",
 	   CASE WHEN ((T4."Leaving Date" < (now())) and (T4."Leaving Date" <> convert(datetime, '1753-01-01 00:00:00.000'))) THEN ('ausgetretene Mitarbeiter') ELSE (T5."Function Code") END as "Monteur_Gruppe_2",
-	   (cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)) as "Datum",
-	   (convert(datetime, ((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) - cinterval(day(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) - 1))) as "Monatserster",
-	   (convert(datetime, lastday(cdate(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))))))) as "Monatsletzter",
+	   ((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)) as "Datum",
+	   (convert(datetime, (((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) - cinterval(day((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) - 1))) as "Monatserster",
+	   (convert(datetime, lastday(((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))))))) as "Monatsletzter",
 	   (now()) - INTERVAL '001 10:00:00.000' as "Heute",
-	   CASE WHEN (((now()) - INTERVAL '001 10:00:00.000') BETWEEN ((convert(datetime, ((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) - cinterval(day(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) - 1)))) AND ((convert(datetime, lastday(cdate(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))))))))) THEN (((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) ELSE null END as "Datum Tagesbericht",
+	   CASE WHEN (((now()) - INTERVAL '001 10:00:00.000') BETWEEN ((convert(datetime, (((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) - cinterval(day((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) - 1)))) AND ((convert(datetime, lastday(((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))))))))) THEN ((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) ELSE null END as "Datum Tagesbericht",
 	   '1' as "Hauptbetrieb_ID",
-	   CASE WHEN ((od_left(T4."Department No_",2)) = '10') THEN ('LBS') WHEN ((od_left(T4."Department No_",2)) = '20') THEN ('WLS') ELSE null END as "Standort",
+	   CASE WHEN ((left(T4."Department No_",2)) = '10') THEN ('LBS') WHEN ((left(T4."Department No_",2)) = '20') THEN ('WLS') ELSE null END as "Standort",
 	   CASE WHEN (T3."ACTIVITY_CODES_GROUP1" = 'prod.') THEN (((convert(float, T1."Duration")))) ELSE (0) END as "prod.",
 	   CASE WHEN (T3."ACTIVITY_CODES_GROUP1" = 'W-var. Std.') THEN (((convert(float, T1."Duration")))) ELSE (0) END as "unprod.",
 	   CASE WHEN (T3."ACTIVITY_CODES_GROUP1" = 'W-fix Std.') THEN (((convert(float, T1."Duration")))) ELSE (0) END as "Abw.",
@@ -65,7 +65,7 @@ select T1."Entry No_" as "Entry No",
 	   CASE WHEN (T3."ACTIVITY_DESC" = '319 - Krankheit') THEN (((convert(float, T1."Duration")))) ELSE (0) END as "krank",
 	   CASE WHEN (T3."ACTIVITY_DESC" IN ('242 - Meistervertretung Werkstatt','244 - Meistervertretung Serviceberater')) THEN (((convert(float, T1."Duration")))) ELSE (0) END as "Meistervertr.",
 	   T3."ACTIVITY_DESC" as "Activity_Desc",
-	   CASE WHEN ((od_left(T4."Department No_",2)) = '10') THEN ('10') WHEN ((od_left(T4."Department No_",2)) = '20') THEN ('20') ELSE null END as "Standort_ID",
+	   CASE WHEN ((left(T4."Department No_",2)) = '10') THEN ('10') WHEN ((left(T4."Department No_",2)) = '20') THEN ('20') ELSE null END as "Standort_ID",
 	   (CASE WHEN (T5."Task Type Group" IN ('LEHRLINGE','MEISTER','MONTEURE')) THEN ('prod. Personal') ELSE ('unprod. Personal') END) as "Monteur_Gruppe",
 	   T4."Department No_" as "Department No",
 	   T1."Service Order No_" as "Order Number",

+ 6 - 6
System/ARI/IQD/Zeit/Time_Clock_Entry_Monteurlisten.sql

@@ -50,17 +50,17 @@ select T1."Entry No_" as "Entry No",
 	   T4."Function Code" as "Monteur_Gruppe_ori",
 	   (day((now()) - T3."Leaving Date")) as "Tage Heute Leaving Date",
 	   CASE WHEN ((T3."Leaving Date" < (now())) and (T3."Leaving Date" <> convert(datetime, '1753-01-01 00:00:00.000'))) THEN ('ausgetretene Mitarbeiter') ELSE (T4."Function Code") END as "Monteur_Gruppe",
-	   (cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)) as "Datum",
-	   (convert(datetime, ((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) - cinterval(day(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) - 1))) as "Monatserster",
-	   (convert(datetime, lastday(cdate(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))))))) as "Monatsletzter",
+	   ((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)) as "Datum",
+	   (convert(datetime, (((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) - cinterval(day((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) - 1))) as "Monatserster",
+	   (convert(datetime, lastday(((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))))))) as "Monatsletzter",
 	   (now()) - INTERVAL '001 10:00:00.000' as "Heute",
-	   CASE WHEN (((now()) - INTERVAL '001 10:00:00.000') BETWEEN ((convert(datetime, ((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) - cinterval(day(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) - 1)))) AND ((convert(datetime, lastday(cdate(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))))))))) THEN (((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) ELSE null END as "Datum Tagesbericht",
+	   CASE WHEN (((now()) - INTERVAL '001 10:00:00.000') BETWEEN ((convert(datetime, (((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) - cinterval(day((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) - 1)))) AND ((convert(datetime, lastday(((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))))))))) THEN ((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) ELSE null END as "Datum Tagesbericht",
 	   '1' as "Hauptbetrieb",
-	   CASE WHEN ((od_left(T3."Department No_",2)) = '10') THEN ('10') WHEN ((od_left(T3."Department No_",2)) = '20') THEN ('20') ELSE null END as "Standort",
+	   CASE WHEN ((left(T3."Department No_",2)) = '10') THEN ('10') WHEN ((left(T3."Department No_",2)) = '20') THEN ('20') ELSE null END as "Standort",
 	   CASE WHEN (T1."Task Type Code" IN ('111','112','121')) THEN (((convert(float, T1."Duration")))) ELSE (0) END as "prod.",
 	   (CASE WHEN (T1."Task Type Code" IN ('111','112','121')) THEN (((convert(float, T1."Duration")))) ELSE (0) END) * (((convert(float, T1."Efficiency _"))) / 100) as "produktiv_für_Berechnung_LG",
 	   T3."Department No_" as "Department No",
 	   T4."Task Type Group" as "Task Type Group"
 from ((("Vogl7x"."dbo"."BMW AH Vogl$Time Clock Entry" T1 left outer join "Vogl7x"."dbo"."BMW AH Vogl$Task Type" T2 on T1."Task Type Code" = T2."Code") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Employee_T" T3 on T1."Employee No_" = T3."No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Employee" T4 on T1."Resource No_" = T4."No_")
-where ((((((T1."Service Order No_" <> ' ') and (((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) >= convert(date, '2020-01-01'))) and (T1."Sorting" = 0)) and (T1."Canceled" = 0)) and ((CASE WHEN (T4."Task Type Group" IN ('LEHRLINGE','MEISTER','MONTEURE')) THEN ('prod. Personal') ELSE ('unprod. Personal') END) = 'prod. Personal')) and ((CASE WHEN (T1."Task Type Code" IN ('111','112','121')) THEN (((convert(float, T1."Duration")))) ELSE (0) END) <> 0))
+where ((((((T1."Service Order No_" <> ' ') and ((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) >= convert(date, '2020-01-01'))) and (T1."Sorting" = 0)) and (T1."Canceled" = 0)) and ((CASE WHEN (T4."Task Type Group" IN ('LEHRLINGE','MEISTER','MONTEURE')) THEN ('prod. Personal') ELSE ('unprod. Personal') END) = 'prod. Personal')) and ((CASE WHEN (T1."Task Type Code" IN ('111','112','121')) THEN (((convert(float, T1."Duration")))) ELSE (0) END) <> 0))
 -- order by "Resource No" asc,"Date" asc

+ 8 - 8
System/ARI/IQD/Zeit/Zeit_2_Ryma.sql

@@ -1,5 +1,5 @@
 select T1."Employee No_" as "Employee No",
-	   (cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)) as "Datum",
+	   ((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)) as "Datum",
 	   T1."Department No_" as "Department No_ori",
 	   T1."Time Account No_" as "Time Account No",
 	   T1."Time Account Value" as "Time Account Value",
@@ -28,7 +28,7 @@ select T1."Employee No_" as "Employee No",
 	   CASE WHEN (T2."No_" IN (350,351)) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END as "Urlaub",
 	   (CASE WHEN (T2."No_" IN (370,371,372)) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END) + (CASE WHEN (T2."No_" = 379) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END) + (CASE WHEN (T2."No_" = 352) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END) + (CASE WHEN (T2."No_" = 354) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END) + 0 + (CASE WHEN (T2."No_" = 450) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END) + (CASE WHEN (T2."No_" = 355) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END) + (CASE WHEN (T2."No_" IN (350,351)) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END) + (CASE WHEN (T2."No_" IN (300,301)) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END) as "W-fix Stunden",
 	   '1' as "Hauptbetrieb_ID",
-	   CASE WHEN ((od_left(T3."Department No_",2)) = '10') THEN ('LBS') WHEN ((od_left(T3."Department No_",2)) = '20') THEN ('WLS') ELSE null END as "Standort",
+	   CASE WHEN ((left(T3."Department No_",2)) = '10') THEN ('LBS') WHEN ((left(T3."Department No_",2)) = '20') THEN ('WLS') ELSE null END as "Standort",
 	   T4."First Name" as "First Name",
 	   T4."Last Name" as "Last Name",
 	   T3."Group No_ 2" as "Monteur_Gruppe_ori",
@@ -44,17 +44,17 @@ select T1."Employee No_" as "Employee No",
 	   (day((now()) - T3."Leaving Date")) as "Tage Heute Leaving Date",
 	   CASE WHEN ((T3."Leaving Date" < (now())) and (T3."Leaving Date" <> convert(datetime, '1753-01-01 00:00:00.000'))) THEN ('ausgetretene Mitarbeiter') ELSE ((CASE WHEN (T4."Task Type Group" IN ('LEHRLINGE','MEISTER','MONTEURE')) THEN ('prod. Personal') ELSE ('unprod. Personal') END)) END as "Monteur_Gruppe",
 	   CASE WHEN (T4."Task Type Group" IN ('LEHRLINGE','MEISTER','MONTEURE')) THEN ('prod. Personal') ELSE ('unprod. Personal') END as "produktiv/unproduktiv",
-	   (convert(datetime, ((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) - cinterval(day(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)))) - 1))) as "Monatserster",
-	   (convert(datetime, lastday(cdate(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))))))) as "Monatsletzter",
+	   (convert(datetime, (((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) - cinterval(day((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)))) - 1))) as "Monatserster",
+	   (convert(datetime, lastday(((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))))))) as "Monatsletzter",
 	   (now()) - INTERVAL '001 10:00:00.000' as "Heute",
-	   CASE WHEN (((now()) - INTERVAL '001 10:00:00.000') BETWEEN ((convert(datetime, ((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) - cinterval(day(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)))) - 1)))) AND ((convert(datetime, lastday(cdate(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))))))))) THEN (((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)))) ELSE null END as "Datum Tagesbericht",
+	   CASE WHEN (((now()) - INTERVAL '001 10:00:00.000') BETWEEN ((convert(datetime, (((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) - cinterval(day((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)))) - 1)))) AND ((convert(datetime, lastday(((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))))))))) THEN ((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)))) ELSE null END as "Datum Tagesbericht",
 	   T4."Employment Date" as "Employment Date",
 	   T3."Department No_" as "Department No",
-	   CASE WHEN ((day((now()) - ((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))))) <= 93) THEN (((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)))) ELSE null END as "Datum_Monteurlisten",
+	   CASE WHEN ((day((now()) - (((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))))) <= 93) THEN ((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)))) ELSE null END as "Datum_Monteurlisten",
 	   CASE WHEN (T2."No_" IN (300,301)) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END as "Fehlzeiten genehm./ungenem.",
 	   (rtrim((cast_numberToString(cast_integer(T2."No_"))))) + ' - ' + T2."Description" as "Activity Desc",
 	   T4."Function Code" as "Monteur_Gruppe_2",
-	   CASE WHEN ((od_left(T3."Department No_",2)) = '10') THEN ('10') WHEN ((od_left(T3."Department No_",2)) = '20') THEN ('20') ELSE null END as "Standort_ID",
+	   CASE WHEN ((left(T3."Department No_",2)) = '10') THEN ('10') WHEN ((left(T3."Department No_",2)) = '20') THEN ('20') ELSE null END as "Standort_ID",
 	   T3."Department No_" as "Department No",
 	   T4."Task Type Group" as "Task Type Group",
 	   CASE WHEN (T1."Time Account No_" = '1200') THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END as "Sollzeit",
@@ -62,5 +62,5 @@ select T1."Employee No_" as "Employee No",
 from "Vogl7x"."dbo"."BMW AH Vogl$Employee_T" T3,
 	(("Vogl7x"."dbo"."BMW AH Vogl$Time Entry_T" T1 left outer join "Vogl7x"."dbo"."BMW AH Vogl$Time Account_T" T2 on T1."Time Account No_" = (cast_numberToString(cast_integer(T2."No_")))) left outer join "Vogl7x"."dbo"."BMW AH Vogl$Employee" T4 on T1."Employee No_" = T4."No_")
 where (T4."No_" = T3."No_")
-and (((((((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) >= T4."Employment Date") and (((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) >= convert(date, '2020-01-01'))) and (((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) <= (@CURRENT_DATE))) and ((CASE WHEN (T4."Task Type Group" IN ('LEHRLINGE','MEISTER','MONTEURE')) THEN ('prod. Personal') ELSE ('unprod. Personal') END) = 'prod. Personal')) and ((T1."Time Account No_" BETWEEN '299' AND '450') or (T1."Time Account No_" = '1200')))
+and ((((((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) >= T4."Employment Date") and ((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) >= convert(date, '2020-01-01'))) and ((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) <= (getdate()))) and ((CASE WHEN (T4."Task Type Group" IN ('LEHRLINGE','MEISTER','MONTEURE')) THEN ('prod. Personal') ELSE ('unprod. Personal') END) = 'prod. Personal')) and ((T1."Time Account No_" BETWEEN '299' AND '450') or (T1."Time Account No_" = '1200')))
 -- order by "Datum" asc,"Employee No" asc

+ 1 - 1
System/ARI/SQL/schema/ARI/views/ims.Add_Serv_Ledger_Entry_fakt_AW_Monteur_Export_Datum_fuer_Time_clock_Entry.sql

@@ -7,7 +7,7 @@ CREATE VIEW ims.Add_Serv_Ledger_Entry_fakt_AW_Monteur_Export_Datum_fuer_Time_clo
 select distinct T1."Order No_" as "Order No",
 	   '' as "Auftrag_Kunde",
 	   MIN(T1."Posting Date") as "Minimum_Datum_Auftrag",
-	   (cdate((MIN(T1."Posting Date")))) as "Datum_Monteurlisten"
+	   (((MIN(T1."Posting Date")))) as "Datum_Monteurlisten"
 from "Vogl7x"."dbo"."BMW AH Vogl$Add_ Service Ledger Entry" T1
 where (T1."Source Code" = 'VERKAUF')
 group by T1."Order No_"

+ 1 - 1
System/ARI/SQL/schema/ARI/views/ims.Add_Service_ledger_mit_Time_Clock_Entry_fuer_Service_Rg_Ausg_ims.sql

@@ -25,7 +25,7 @@ from
 	   CASE WHEN (T1."Document No_" LIKE 'WGG%') THEN ((convert(float, T2."Duration")) * -1) ELSE ((convert(float, T2."Duration"))) END as c20,
 	   T1."Order No_" as c21
 from ("Vogl7x"."dbo"."BMW AH Vogl$Add_ Service Ledger Entry" T1 left outer join "Vogl7x"."dbo"."BMW AH Vogl$Time Clock Entry" T2 on ((T1."Order No_" = T2."Service Order No_") and (T1."Service Job No_" = T2."Service Job No_")) and (T1."No_" = T2."Resource No_"))
-where ((((T1."Posting Date" >= convert(datetime, '2020-01-01 00:00:00.000')) and ((od_left(T1."Document No_",3)) IN ('WRG','WGG','INT'))) and (T2."Sorting" = 0)) and (T2."Canceled" = 0))
+where ((((T1."Posting Date" >= convert(datetime, '2020-01-01 00:00:00.000')) and ((left(T1."Document No_",3)) IN ('WRG','WGG','INT'))) and (T2."Sorting" = 0)) and (T2."Canceled" = 0))
 ) D1
 -- order by "Document No_Add_Serv" asc
 GO

+ 6 - 6
System/ARI/SQL/schema/ARI/views/ims.Time_Clock_Entry_Monteurlisten.sql

@@ -56,19 +56,19 @@ select T1."Entry No_" as "Entry No",
 	   T4."Function Code" as "Monteur_Gruppe_ori",
 	   (day((now()) - T3."Leaving Date")) as "Tage Heute Leaving Date",
 	   CASE WHEN ((T3."Leaving Date" < (now())) and (T3."Leaving Date" <> convert(datetime, '1753-01-01 00:00:00.000'))) THEN ('ausgetretene Mitarbeiter') ELSE (T4."Function Code") END as "Monteur_Gruppe",
-	   (cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)) as "Datum",
-	   (convert(datetime, ((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) - cinterval(day(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) - 1))) as "Monatserster",
-	   (convert(datetime, lastday(cdate(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))))))) as "Monatsletzter",
+	   ((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)) as "Datum",
+	   (convert(datetime, (((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) - cinterval(day((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) - 1))) as "Monatserster",
+	   (convert(datetime, lastday(((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))))))) as "Monatsletzter",
 	   (now()) - INTERVAL '001 10:00:00.000' as "Heute",
-	   CASE WHEN (((now()) - INTERVAL '001 10:00:00.000') BETWEEN ((convert(datetime, ((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) - cinterval(day(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) - 1)))) AND ((convert(datetime, lastday(cdate(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))))))))) THEN (((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) ELSE null END as "Datum Tagesbericht",
+	   CASE WHEN (((now()) - INTERVAL '001 10:00:00.000') BETWEEN ((convert(datetime, (((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) - cinterval(day((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) - 1)))) AND ((convert(datetime, lastday(((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))))))))) THEN ((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) ELSE null END as "Datum Tagesbericht",
 	   '1' as "Hauptbetrieb",
-	   CASE WHEN ((od_left(T3."Department No_",2)) = '10') THEN ('10') WHEN ((od_left(T3."Department No_",2)) = '20') THEN ('20') ELSE null END as "Standort",
+	   CASE WHEN ((left(T3."Department No_",2)) = '10') THEN ('10') WHEN ((left(T3."Department No_",2)) = '20') THEN ('20') ELSE null END as "Standort",
 	   CASE WHEN (T1."Task Type Code" IN ('111','112','121')) THEN (((convert(float, T1."Duration")))) ELSE (0) END as "prod.",
 	   (CASE WHEN (T1."Task Type Code" IN ('111','112','121')) THEN (((convert(float, T1."Duration")))) ELSE (0) END) * (((convert(float, T1."Efficiency _"))) / 100) as "produktiv_für_Berechnung_LG",
 	   T3."Department No_" as "Department No",
 	   T4."Task Type Group" as "Task Type Group"
 from ((("Vogl7x"."dbo"."BMW AH Vogl$Time Clock Entry" T1 left outer join "Vogl7x"."dbo"."BMW AH Vogl$Task Type" T2 on T1."Task Type Code" = T2."Code") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Employee_T" T3 on T1."Employee No_" = T3."No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Employee" T4 on T1."Resource No_" = T4."No_")
-where ((((((T1."Service Order No_" <> ' ') and (((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) >= convert(date, '2020-01-01'))) and (T1."Sorting" = 0)) and (T1."Canceled" = 0)) and ((CASE WHEN (T4."Task Type Group" IN ('LEHRLINGE','MEISTER','MONTEURE')) THEN ('prod. Personal') ELSE ('unprod. Personal') END) = 'prod. Personal')) and ((CASE WHEN (T1."Task Type Code" IN ('111','112','121')) THEN (((convert(float, T1."Duration")))) ELSE (0) END) <> 0))
+where ((((((T1."Service Order No_" <> ' ') and ((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) >= convert(date, '2020-01-01'))) and (T1."Sorting" = 0)) and (T1."Canceled" = 0)) and ((CASE WHEN (T4."Task Type Group" IN ('LEHRLINGE','MEISTER','MONTEURE')) THEN ('prod. Personal') ELSE ('unprod. Personal') END) = 'prod. Personal')) and ((CASE WHEN (T1."Task Type Code" IN ('111','112','121')) THEN (((convert(float, T1."Duration")))) ELSE (0) END) <> 0))
 -- order by "Resource No" asc,"Date" asc
 GO
 SET QUOTED_IDENTIFIER OFF 

+ 3 - 3
System/ARI/SQL/schema/ARI/views/staging.Add_Serv_Ledger_Entry_fakt_AW_Monteur.sql

@@ -65,16 +65,16 @@ from
 	   (convert(float, T5."Quantity")) as c60,
 	   T4."Function Code" as c61,
 	   T4."Default Task Type" as c62,
-	   CASE WHEN ((od_left(T3."Department No_",2)) = '10') THEN ('10') WHEN ((od_left(T3."Department No_",2)) = '20') THEN ('20') ELSE null END as c63,
+	   CASE WHEN ((left(T3."Department No_",2)) = '10') THEN ('10') WHEN ((left(T3."Department No_",2)) = '20') THEN ('20') ELSE null END as c63,
 	   T3."Department No_" as c64,
-	   CASE WHEN ((od_left(T3."Department No_",2)) = '10') THEN ('LBS') WHEN ((od_left(T3."Department No_",2)) = '20') THEN ('WLS') ELSE null END as c65,
+	   CASE WHEN ((left(T3."Department No_",2)) = '10') THEN ('LBS') WHEN ((left(T3."Department No_",2)) = '20') THEN ('WLS') ELSE null END as c65,
 	   T1."Location Code" as c66,
 	   CASE WHEN ((T3."Leaving Date" < (now())) and (T3."Leaving Date" <> convert(datetime, '1753-01-01 00:00:00.000'))) THEN ('ausgetretene Mitarbeiter') ELSE ('prod. Personal') END as c67,
 	   T3."Leaving Date" as c68,
 	   T3."Group No_ 2" as c69,
 	   T3."Group No_ 3" as c70,
 	   T3."Group No_ 1" as c71,
-	   (cdate(T1."Posting Date")) as c72,
+	   ((T1."Posting Date")) as c72,
 	   CASE WHEN (((day((now()) - T1."Posting Date")) <= 93) and (T2."Bill-to Name" IS NOT NULL)) THEN (T1."Order No_" + ' - ' + T2."Bill-to Name") ELSE null END as c73,
 	   T1."Posting Date" as c74,
 	   T2."Bill-to Name" as c75,

+ 1 - 1
System/ARI/SQL/schema/ARI/views/staging.Belege.sql

@@ -44,7 +44,7 @@ select T1."No_" as "No",
 	   T3."Code" as "Code",
 	   T3."Name" as "Name",
 	   T2."Posting Date" as "Bookkeep Date",
-	   CASE WHEN (T2."Branch Code" = 'BUR') THEN ('10') WHEN (T2."Branch Code" = 'MUE') THEN ('20') ELSE ((od_left(T2."Global Dimension 1 Code",2))) END as "Betrieb",
+	   CASE WHEN (T2."Branch Code" = 'BUR') THEN ('10') WHEN (T2."Branch Code" = 'MUE') THEN ('20') ELSE ((left(T2."Global Dimension 1 Code",2))) END as "Betrieb",
 	   T2."G_L Account No_" as "Acct Nr",
 	   ((convert(float, T2."Amount"))) as "Betrag",
 	   (convert(float, T2."Amount")) as "Amount_1",

+ 1 - 1
System/ARI/SQL/schema/ARI/views/staging.Belege_Umsatz_FIBU.sql

@@ -44,7 +44,7 @@ select T1."No_" as "No",
 	   T3."Code" as "Code",
 	   T3."Name" as "Name",
 	   T2."Posting Date" as "Bookkeep Date",
-	   CASE WHEN (T2."Branch Code" = 'BUR') THEN ('10') WHEN (T2."Branch Code" = 'MUE') THEN ('20') ELSE ((od_left(T2."Global Dimension 1 Code",2))) END as "Betrieb",
+	   CASE WHEN (T2."Branch Code" = 'BUR') THEN ('10') WHEN (T2."Branch Code" = 'MUE') THEN ('20') ELSE ((left(T2."Global Dimension 1 Code",2))) END as "Betrieb",
 	   T2."G_L Account No_" as "Acct Nr",
 	   ((convert(float, T2."Amount"))) as "Betrag",
 	   (convert(float, T2."Amount")) as "Amount_1",

文件差异内容过多而无法显示
+ 1 - 1
System/ARI/SQL/schema/ARI/views/staging.NW_GW_BE_neu.sql


+ 1 - 1
System/ARI/SQL/schema/ARI/views/staging.NW_GW_GK_Stk_fuer_FIBU_Betrag.sql

@@ -176,7 +176,7 @@ from
 	   (convert(float, T2."Invoiced Quantity")) * -1 as c89,
 	   CASE WHEN ((day((now()) - T1."Posting Date")) <= 90) THEN (T3."Document No_" + ' - ' + T3."Description" + ' - ' + T3."User ID") ELSE null END as c90,
 	   T3."Description" as c91,
-	   CASE WHEN (T3."Branch Code" = 'BUR') THEN ('10') WHEN (T3."Branch Code" = 'MUE') THEN ('20') ELSE ((od_left(T3."Global Dimension 1 Code",2))) END as c92,
+	   CASE WHEN (T3."Branch Code" = 'BUR') THEN ('10') WHEN (T3."Branch Code" = 'MUE') THEN ('20') ELSE ((left(T3."Global Dimension 1 Code",2))) END as c92,
 	   T1."Posting Date" as c93,
 	   CASE WHEN (((T3."Veh_ Source Code" IN (1,2)) and ((CASE WHEN (T1."Gen_ Bus_ Posting Group" = 'GROSSKD') THEN ('Grosskunde') ELSE ('Kauf') END) = 'Kauf')) or (((CASE WHEN (T1."Gen_ Bus_ Posting Group" = 'GROSSKD') THEN ('Grosskunde') ELSE ('Kauf') END) = 'Grosskunde') and (T3."G_L Account No_" = '88200'))) THEN ('ja') ELSE ('nein') END as c94,
 	   CASE WHEN (((CASE WHEN (T1."Gen_ Bus_ Posting Group" = 'GROSSKD') THEN ('Grosskunde') ELSE ('Kauf') END) = 'Kauf') and (T1."Document No_" = T3."Document No_")) THEN ('ja') WHEN ((CASE WHEN (T1."Gen_ Bus_ Posting Group" = 'GROSSKD') THEN ('Grosskunde') ELSE ('Kauf') END) = 'Grosskunde') THEN ('ja') ELSE ('nein') END as c95,

+ 1 - 1
System/ARI/SQL/schema/ARI/views/staging.NW_GW_GK_Stk_fuer_FIBU_Menge.sql

@@ -177,7 +177,7 @@ from
 	   CASE WHEN ((day((now()) - T1."Posting Date")) <= 90) THEN (T3."Document No_" + ' - ' + T3."Description" + ' - ' + T3."User ID") ELSE null END as c90,
 	   T3."Description" as c91,
 	   T3."G_L Account No_" + '_STK' as c92,
-	   CASE WHEN ((T3."Branch Code" = 'BUR') or (T3."Branch Code" = '')) THEN ('10') WHEN (T3."Branch Code" = 'MUE') THEN ('20') ELSE ((od_left(T3."Global Dimension 1 Code",2))) END as c93,
+	   CASE WHEN ((T3."Branch Code" = 'BUR') or (T3."Branch Code" = '')) THEN ('10') WHEN (T3."Branch Code" = 'MUE') THEN ('20') ELSE ((left(T3."Global Dimension 1 Code",2))) END as c93,
 	   T1."Posting Date" as c94,
 	   CASE WHEN (((T3."Veh_ Source Code" IN (1,2)) and ((CASE WHEN (T1."Gen_ Bus_ Posting Group" = 'GROSSKD') THEN ('Grosskunde') ELSE ('Kauf') END) = 'Kauf')) or (((CASE WHEN (T1."Gen_ Bus_ Posting Group" = 'GROSSKD') THEN ('Grosskunde') ELSE ('Kauf') END) = 'Grosskunde') and (T3."G_L Account No_" = '88200'))) THEN ('ja') ELSE ('nein') END as c95,
 	   CASE WHEN (((CASE WHEN (T1."Gen_ Bus_ Posting Group" = 'GROSSKD') THEN ('Grosskunde') ELSE ('Kauf') END) = 'Kauf') and (T1."Document No_" = T3."Document No_")) THEN ('ja') WHEN ((CASE WHEN (T1."Gen_ Bus_ Posting Group" = 'GROSSKD') THEN ('Grosskunde') ELSE ('Kauf') END) = 'Grosskunde') THEN ('ja') ELSE ('nein') END as c96,

文件差异内容过多而无法显示
+ 1 - 2
System/ARI/SQL/schema/ARI/views/staging.NW_GW_VK_TIM.sql


文件差异内容过多而无法显示
+ 1 - 1
System/ARI/SQL/schema/ARI/views/staging.NW_GW_VK_TIM_Grosskd.sql


+ 1 - 1
System/ARI/SQL/schema/ARI/views/staging.SRD_Teile_neu_3.sql

@@ -89,7 +89,7 @@ select c157 as "Register No",
 from 
 (select ((cast_numberToString(cast_integer(T1."Entry No_"))) + T1."Document No_") as c85,
 	   CASE WHEN ((day((now()) - T1."Posting Date")) <= 3) THEN ((CASE WHEN (T3."No_" IS NOT NULL) THEN (T1."Document No_" + ' / ' + (CASE WHEN (T3."No_" IS NOT NULL) THEN (T3."No_" + ' - ' + T3."Name") ELSE null END)) ELSE (T1."Document No_") END)) ELSE null END as c86,
-	   (od_left(T1."Document No_",4)) as c87,
+	   (left(T1."Document No_",4)) as c87,
 	   CASE WHEN (T4."Item Group Code" BETWEEN '00' AND '22') THEN ('Artikelgruppe 0 - 22') WHEN (T4."Item Group Code" BETWEEN '23' AND '33') THEN ('Artikelgruppe 23 - 33') WHEN (T4."Item Group Code" BETWEEN '34' AND '99') THEN ('Artikelgruppe 34 - 99') ELSE ('Teileart fehlt/Rest') END as c88,
 	   CASE WHEN (T3."Extra Code 3" = 'EXPORT') THEN ('Anteil Export') ELSE ('Anteil Inland') END as c89,
 	   T3."Extra Code 3" as c90,

+ 5 - 5
System/ARI/SQL/schema/ARI/views/staging.Service_Ausgangsrechnung_ab_2011.sql

@@ -344,10 +344,10 @@ from
 	   T3."Gen_ Prod_ Posting Group" as c176,
 	   T9."Name" as c177,
 	   T9."Post Code" as c178,
-	   (od_left(T9."Post Code",4)) as c179,
-	   (od_left(T9."Post Code",3)) as c180,
-	   (od_left(T9."Post Code",2)) as c181,
-	   (od_left(T9."Post Code",1)) as c182,
+	   (left(T9."Post Code",4)) as c179,
+	   (left(T9."Post Code",3)) as c180,
+	   (left(T9."Post Code",2)) as c181,
+	   (left(T9."Post Code",1)) as c182,
 	   CASE WHEN (T3."Gen_ Prod_ Posting Group" LIKE '%ART%') THEN (((convert(float, T3."Amount")))) ELSE (0) END as c183,
 	   (convert(float, T10."Total Cost")) as c184,
 	   CASE WHEN (T3."Gen_ Prod_ Posting Group" LIKE '%LOHN%') THEN (T3."Gen_ Prod_ Posting Group") ELSE null END as c185,
@@ -473,7 +473,7 @@ from
 from ((((("Vogl7x"."dbo"."BMW AH Vogl$Sales Invoice Header" T1 left outer join "Vogl7x"."dbo"."BMW AH Vogl$Vehicle" T2 on T1."Supply VIN" = T2."VIN") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Customer" T9 on T9."No_" = T1."Bill-to Customer No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Customer Group" T8 on T9."Customer Group Code" = T8."Code") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Customer" T12 on T12."No_" = T1."Sell-to Customer No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Customer Group" T13 on T12."Customer Group Code" = T13."Code"),
 	(((((("Vogl7x"."dbo"."BMW AH Vogl$Sales Invoice Line" T3 left outer join "Vogl7x"."dbo"."BMW AH Vogl$Archived Service Header" T4 on T3."Service Order No_" = T4."No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Service Header" T5 on T3."Service Order No_" = T5."No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Employee" T6 on T4."Service Advisor No_" = T6."No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Employee" T7 on T5."Service Advisor No_" = T7."No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Service Ledger Entry" T10 on ((T3."Document No_" = T10."Document No_") and (T3."Type" = 2)) and (T3."No_" = T10."No_")) left outer join "Vogl7x"."dbo"."BMW AH Vogl$Labor Ledger Entry" T11 on (((T3."Document No_" = T11."Document No_") and (T3."Labor No_" = T11."Labor No_")) and (T3."Service Order No_" = T11."Service Order No_")) and (T3."Service Order Line No_" = T11."Service Order Line No_"))
 where (T1."No_" = T3."Document No_")
-and (((((od_left(T1."No_",1)) IN ('I','W')) and (not T3."Type" IN (0,11,12))) and (T1."Posting Date" >= convert(datetime, '2020-01-01 00:00:00.000'))) and (not (CASE WHEN ((day((now()) - T1."Posting Date")) <= 60) THEN (T1."Service Order No_") ELSE ('Aufträge älter 60 Tage') END) IN ('NASISPA')))
+and (((((left(T1."No_",1)) IN ('I','W')) and (not T3."Type" IN (0,11,12))) and (T1."Posting Date" >= convert(datetime, '2020-01-01 00:00:00.000'))) and (not (CASE WHEN ((day((now()) - T1."Posting Date")) <= 60) THEN (T1."Service Order No_") ELSE ('Aufträge älter 60 Tage') END) IN ('NASISPA')))
 ) D1
 ) D4
 -- order by "No" asc,"Line No" asc

+ 1 - 1
System/ARI/SQL/schema/ARI/views/staging.Service_Ausgangsrechnung_ab_2011_ben_AW.sql

@@ -120,7 +120,7 @@ from "ims"."Add_Service_ledger_mit_Time_Clock_Entry_fuer_Service_Rg_Ausg_ims" T1
 	((((("Vogl7x"."dbo"."BMW AH Vogl$Sales Invoice Header" T1 left outer join "Vogl7x"."dbo"."BMW AH Vogl$Vehicle" T2 on T1."Supply VIN" = T2."VIN") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Customer" T9 on T9."No_" = T1."Bill-to Customer No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Customer Group" T8 on T9."Customer Group Code" = T8."Code") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Customer" T10 on T10."No_" = T1."Sell-to Customer No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Customer Group" T11 on T10."Customer Group Code" = T11."Code"),
 	(((("Vogl7x"."dbo"."BMW AH Vogl$Sales Invoice Line" T3 left outer join "Vogl7x"."dbo"."BMW AH Vogl$Archived Service Header" T4 on T3."Service Order No_" = T4."No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Service Header" T5 on T3."Service Order No_" = T5."No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Employee" T6 on T4."Service Advisor No_" = T6."No_") left outer join "Vogl7x"."dbo"."BMW AH Vogl$Employee" T7 on T5."Service Advisor No_" = T7."No_")
 where (T1."No_" = T3."Document No_") and ((T1."No_" = T12."Document No_") and (T1."Service Order No_" = T12."Order No_"))
-and (((((od_left(T1."No_",1)) IN ('I','W')) and (not T3."Type" IN (0,11,12))) and (T1."Posting Date" >= convert(datetime, '2020-01-01 00:00:00.000'))) and (not (CASE WHEN ((day((now()) - T1."Posting Date")) <= 60) THEN (T1."Service Order No_") ELSE ('Aufträge älter 60 Tage') END) IN ('NASISPA')))
+and (((((left(T1."No_",1)) IN ('I','W')) and (not T3."Type" IN (0,11,12))) and (T1."Posting Date" >= convert(datetime, '2020-01-01 00:00:00.000'))) and (not (CASE WHEN ((day((now()) - T1."Posting Date")) <= 60) THEN (T1."Service Order No_") ELSE ('Aufträge älter 60 Tage') END) IN ('NASISPA')))
 -- order by "No" asc
 GO
 SET QUOTED_IDENTIFIER OFF 

+ 4 - 4
System/ARI/SQL/schema/ARI/views/staging.Service_Gutschriften_ab_2011.sql

@@ -330,10 +330,10 @@ from
 	   CASE WHEN ((day((now()) - T1."Posting Date")) <= 100) THEN (T1."No_" + ' - ' + T9."Name") ELSE ('Rechnungen älter 100 Tage') END as c170,
 	   CASE WHEN ((day((now()) - T1."Posting Date")) <= 100) THEN ((CASE WHEN (T1."Service Order No_" = ' ') THEN ('Gutschrift ohne Auftrag') ELSE (T1."Service Order No_") END) + ' - ' + T9."Name") ELSE ('Aufträge älter 100 Tage') END as c171,
 	   T9."Post Code" as c172,
-	   (od_left(T9."Post Code",4)) as c173,
-	   (od_left(T9."Post Code",3)) as c174,
-	   (od_left(T9."Post Code",2)) as c175,
-	   (od_left(T9."Post Code",1)) as c176,
+	   (left(T9."Post Code",4)) as c173,
+	   (left(T9."Post Code",3)) as c174,
+	   (left(T9."Post Code",2)) as c175,
+	   (left(T9."Post Code",1)) as c176,
 	   CASE WHEN (T3."Gen_ Prod_ Posting Group" LIKE '%ART%') THEN (((convert(float, T3."Amount"))) * -1) ELSE (0) END as c177,
 	   (convert(float, T10."Total Cost")) as c178,
 	   CASE WHEN (T3."Gen_ Prod_ Posting Group" LIKE '%LOHN%') THEN (T3."Gen_ Prod_ Posting Group") ELSE null END as c179,

+ 2 - 2
System/ARI/SQL/schema/ARI/views/staging.Service_offene_Auftraege_neu_mitMont_Anzeige.sql

@@ -250,8 +250,8 @@ from
 	   T2."Last Name" as c246,
 	   T2."First Name" as c247,
 	   T2."No_" as c248,
-	   CASE WHEN ((T1."Location Code" = 'BUR') or (T1."Location Code" = '')) THEN ('10') WHEN (T1."Location Code" = 'MUE') THEN ('20') ELSE ((od_left(T1."Department Code",2))) END as c249,
-	   (od_left(T1."Department Code",2)) as c250,
+	   CASE WHEN ((T1."Location Code" = 'BUR') or (T1."Location Code" = '')) THEN ('10') WHEN (T1."Location Code" = 'MUE') THEN ('20') ELSE ((left(T1."Department Code",2))) END as c249,
+	   (left(T1."Department Code",2)) as c250,
 	   T1."Service Advisor No_" as c251,
 	   T1."Status Code" as c252,
 	   T1."Work Completed" as c253,

+ 6 - 6
System/ARI/SQL/schema/ARI/views/staging.Time_Clock_Entry.sql

@@ -56,13 +56,13 @@ select T1."Entry No_" as "Entry No",
 	   T5."Function Code" as "Monteur_Gruppe_ori",
 	   (day((now()) - T4."Leaving Date")) as "Tage Heute Leaving Date",
 	   CASE WHEN ((T4."Leaving Date" < (now())) and (T4."Leaving Date" <> convert(datetime, '1753-01-01 00:00:00.000'))) THEN ('ausgetretene Mitarbeiter') ELSE (T5."Function Code") END as "Monteur_Gruppe_2",
-	   (cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)) as "Datum",
-	   (convert(datetime, ((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) - cinterval(day(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) - 1))) as "Monatserster",
-	   (convert(datetime, lastday(cdate(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))))))) as "Monatsletzter",
+	   ((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)) as "Datum",
+	   (convert(datetime, (((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) - cinterval(day((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) - 1))) as "Monatserster",
+	   (convert(datetime, lastday(((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))))))) as "Monatsletzter",
 	   (now()) - INTERVAL '001 10:00:00.000' as "Heute",
-	   CASE WHEN (((now()) - INTERVAL '001 10:00:00.000') BETWEEN ((convert(datetime, ((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) - cinterval(day(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) - 1)))) AND ((convert(datetime, lastday(cdate(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))))))))) THEN (((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) ELSE null END as "Datum Tagesbericht",
+	   CASE WHEN (((now()) - INTERVAL '001 10:00:00.000') BETWEEN ((convert(datetime, (((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))) - cinterval(day((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) - 1)))) AND ((convert(datetime, lastday(((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END))))))))) THEN ((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Date") END)))) ELSE null END as "Datum Tagesbericht",
 	   '1' as "Hauptbetrieb_ID",
-	   CASE WHEN ((od_left(T4."Department No_",2)) = '10') THEN ('LBS') WHEN ((od_left(T4."Department No_",2)) = '20') THEN ('WLS') ELSE null END as "Standort",
+	   CASE WHEN ((left(T4."Department No_",2)) = '10') THEN ('LBS') WHEN ((left(T4."Department No_",2)) = '20') THEN ('WLS') ELSE null END as "Standort",
 	   CASE WHEN (T3."ACTIVITY_CODES_GROUP1" = 'prod.') THEN (((convert(float, T1."Duration")))) ELSE (0) END as "prod.",
 	   CASE WHEN (T3."ACTIVITY_CODES_GROUP1" = 'W-var. Std.') THEN (((convert(float, T1."Duration")))) ELSE (0) END as "unprod.",
 	   CASE WHEN (T3."ACTIVITY_CODES_GROUP1" = 'W-fix Std.') THEN (((convert(float, T1."Duration")))) ELSE (0) END as "Abw.",
@@ -71,7 +71,7 @@ select T1."Entry No_" as "Entry No",
 	   CASE WHEN (T3."ACTIVITY_DESC" = '319 - Krankheit') THEN (((convert(float, T1."Duration")))) ELSE (0) END as "krank",
 	   CASE WHEN (T3."ACTIVITY_DESC" IN ('242 - Meistervertretung Werkstatt','244 - Meistervertretung Serviceberater')) THEN (((convert(float, T1."Duration")))) ELSE (0) END as "Meistervertr.",
 	   T3."ACTIVITY_DESC" as "Activity_Desc",
-	   CASE WHEN ((od_left(T4."Department No_",2)) = '10') THEN ('10') WHEN ((od_left(T4."Department No_",2)) = '20') THEN ('20') ELSE null END as "Standort_ID",
+	   CASE WHEN ((left(T4."Department No_",2)) = '10') THEN ('10') WHEN ((left(T4."Department No_",2)) = '20') THEN ('20') ELSE null END as "Standort_ID",
 	   (CASE WHEN (T5."Task Type Group" IN ('LEHRLINGE','MEISTER','MONTEURE')) THEN ('prod. Personal') ELSE ('unprod. Personal') END) as "Monteur_Gruppe",
 	   T4."Department No_" as "Department No",
 	   T1."Service Order No_" as "Order Number",

+ 8 - 8
System/ARI/SQL/schema/ARI/views/staging.Zeit_2_Ryma.sql

@@ -5,7 +5,7 @@ GO
 CREATE VIEW staging.Zeit_2_Ryma AS
 
 select T1."Employee No_" as "Employee No",
-	   (cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)) as "Datum",
+	   ((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)) as "Datum",
 	   T1."Department No_" as "Department No_ori",
 	   T1."Time Account No_" as "Time Account No",
 	   T1."Time Account Value" as "Time Account Value",
@@ -34,7 +34,7 @@ select T1."Employee No_" as "Employee No",
 	   CASE WHEN (T2."No_" IN (350,351)) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END as "Urlaub",
 	   (CASE WHEN (T2."No_" IN (370,371,372)) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END) + (CASE WHEN (T2."No_" = 379) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END) + (CASE WHEN (T2."No_" = 352) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END) + (CASE WHEN (T2."No_" = 354) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END) + 0 + (CASE WHEN (T2."No_" = 450) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END) + (CASE WHEN (T2."No_" = 355) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END) + (CASE WHEN (T2."No_" IN (350,351)) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END) + (CASE WHEN (T2."No_" IN (300,301)) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END) as "W-fix Stunden",
 	   '1' as "Hauptbetrieb_ID",
-	   CASE WHEN ((od_left(T3."Department No_",2)) = '10') THEN ('LBS') WHEN ((od_left(T3."Department No_",2)) = '20') THEN ('WLS') ELSE null END as "Standort",
+	   CASE WHEN ((left(T3."Department No_",2)) = '10') THEN ('LBS') WHEN ((left(T3."Department No_",2)) = '20') THEN ('WLS') ELSE null END as "Standort",
 	   T4."First Name" as "First Name",
 	   T4."Last Name" as "Last Name",
 	   T3."Group No_ 2" as "Monteur_Gruppe_ori",
@@ -50,17 +50,17 @@ select T1."Employee No_" as "Employee No",
 	   (day((now()) - T3."Leaving Date")) as "Tage Heute Leaving Date",
 	   CASE WHEN ((T3."Leaving Date" < (now())) and (T3."Leaving Date" <> convert(datetime, '1753-01-01 00:00:00.000'))) THEN ('ausgetretene Mitarbeiter') ELSE ((CASE WHEN (T4."Task Type Group" IN ('LEHRLINGE','MEISTER','MONTEURE')) THEN ('prod. Personal') ELSE ('unprod. Personal') END)) END as "Monteur_Gruppe",
 	   CASE WHEN (T4."Task Type Group" IN ('LEHRLINGE','MEISTER','MONTEURE')) THEN ('prod. Personal') ELSE ('unprod. Personal') END as "produktiv/unproduktiv",
-	   (convert(datetime, ((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) - cinterval(day(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)))) - 1))) as "Monatserster",
-	   (convert(datetime, lastday(cdate(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))))))) as "Monatsletzter",
+	   (convert(datetime, (((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) - cinterval(day((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)))) - 1))) as "Monatserster",
+	   (convert(datetime, lastday(((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))))))) as "Monatsletzter",
 	   (now()) - INTERVAL '001 10:00:00.000' as "Heute",
-	   CASE WHEN (((now()) - INTERVAL '001 10:00:00.000') BETWEEN ((convert(datetime, ((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) - cinterval(day(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)))) - 1)))) AND ((convert(datetime, lastday(cdate(((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))))))))) THEN (((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)))) ELSE null END as "Datum Tagesbericht",
+	   CASE WHEN (((now()) - INTERVAL '001 10:00:00.000') BETWEEN ((convert(datetime, (((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) - cinterval(day((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)))) - 1)))) AND ((convert(datetime, lastday(((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))))))))) THEN ((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)))) ELSE null END as "Datum Tagesbericht",
 	   T4."Employment Date" as "Employment Date",
 	   T3."Department No_" as "Department No",
-	   CASE WHEN ((day((now()) - ((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))))) <= 93) THEN (((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)))) ELSE null END as "Datum_Monteurlisten",
+	   CASE WHEN ((day((now()) - (((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))))) <= 93) THEN ((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END)))) ELSE null END as "Datum_Monteurlisten",
 	   CASE WHEN (T2."No_" IN (300,301)) THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END as "Fehlzeiten genehm./ungenem.",
 	   (rtrim((cast_numberToString(cast_integer(T2."No_"))))) + ' - ' + T2."Description" as "Activity Desc",
 	   T4."Function Code" as "Monteur_Gruppe_2",
-	   CASE WHEN ((od_left(T3."Department No_",2)) = '10') THEN ('10') WHEN ((od_left(T3."Department No_",2)) = '20') THEN ('20') ELSE null END as "Standort_ID",
+	   CASE WHEN ((left(T3."Department No_",2)) = '10') THEN ('10') WHEN ((left(T3."Department No_",2)) = '20') THEN ('20') ELSE null END as "Standort_ID",
 	   T3."Department No_" as "Department No",
 	   T4."Task Type Group" as "Task Type Group",
 	   CASE WHEN (T1."Time Account No_" = '1200') THEN (((convert(float, T1."Time Account Value")))) ELSE (0) END as "Sollzeit",
@@ -68,7 +68,7 @@ select T1."Employee No_" as "Employee No",
 from "Vogl7x"."dbo"."BMW AH Vogl$Employee_T" T3,
 	(("Vogl7x"."dbo"."BMW AH Vogl$Time Entry_T" T1 left outer join "Vogl7x"."dbo"."BMW AH Vogl$Time Account_T" T2 on T1."Time Account No_" = (cast_numberToString(cast_integer(T2."No_")))) left outer join "Vogl7x"."dbo"."BMW AH Vogl$Employee" T4 on T1."Employee No_" = T4."No_")
 where (T4."No_" = T3."No_")
-and (((((((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) >= T4."Employment Date") and (((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) >= convert(date, '2020-01-01'))) and (((cdate(CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) <= (@CURRENT_DATE))) and ((CASE WHEN (T4."Task Type Group" IN ('LEHRLINGE','MEISTER','MONTEURE')) THEN ('prod. Personal') ELSE ('unprod. Personal') END) = 'prod. Personal')) and ((T1."Time Account No_" BETWEEN '299' AND '450') or (T1."Time Account No_" = '1200')))
+and ((((((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) >= T4."Employment Date") and ((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) >= convert(date, '2020-01-01'))) and ((((CASE WHEN ((T1."Employee No_" IN ('0382','0378')) and (T1."Current Date" <= convert(datetime, '2019-02-22 00:00:00.000'))) THEN (convert(date, '1900-01-01')) ELSE (T1."Current Date") END))) <= (getdate()))) and ((CASE WHEN (T4."Task Type Group" IN ('LEHRLINGE','MEISTER','MONTEURE')) THEN ('prod. Personal') ELSE ('unprod. Personal') END) = 'prod. Personal')) and ((T1."Time Account No_" BETWEEN '299' AND '450') or (T1."Time Account No_" = '1200')))
 -- order by "Datum" asc,"Employee No" asc
 GO
 SET QUOTED_IDENTIFIER OFF 

+ 2 - 2
System/ARI/SQL/schema/ARI/views/staging.current_date_Prognose.sql

@@ -28,10 +28,10 @@ from
 	   T1."zaehler_mosa" as "Zaehler Mosa",
 	   T1."summe_mosa" as "Summe Mosa",
 	   T1."feiertage_id" as "Feiertage Id",
-	   (@CURRENT_DATE) - INTERVAL '001 00:00:00.000' as "Jahr",
+	   (getdate()) - INTERVAL '001 00:00:00.000' as "Jahr",
 	   CASE WHEN (T1."datum" BETWEEN convert(datetime, '2008-01-01 00:00:00.000') AND convert(datetime, '2008-12-31 00:00:00.000')) THEN (252) WHEN (T1."datum" BETWEEN convert(datetime, '2009-01-01 00:00:00.000') AND convert(datetime, '2009-12-31 00:00:00.000')) THEN (252) WHEN (T1."datum" BETWEEN convert(datetime, '2010-01-01 00:00:00.000') AND convert(datetime, '2010-12-31 00:00:00.000')) THEN (253) WHEN (T1."datum" BETWEEN convert(datetime, '2011-01-01 00:00:00.000') AND convert(datetime, '2011-12-31 00:00:00.000')) THEN (250) WHEN (T1."datum" BETWEEN convert(datetime, '2012-01-01 00:00:00.000') AND convert(datetime, '2012-12-31 00:00:00.000')) THEN (249) ELSE (250) END as "Gesamt Arbeitstage"
 from "Arbeitstage" T1
-where (((((T1."bundeslaender_id" = '2') and (T1."arbeitstag_mosa" = 1)) and ((od_year(T1."datum")) = (year(((@CURRENT_DATE) - INTERVAL '001 00:00:00.000'))))) and (T1."datum" <= ((@CURRENT_DATE) - INTERVAL '001 00:00:00.000'))) or (((T1."bundeslaender_id" = '2') and ((od_year(T1."datum")) = (year(((@CURRENT_DATE) - INTERVAL '001 00:00:00.000'))))) and (T1."datum" IN (convert(datetime, '2022-01-01 00:00:00.000'),convert(datetime, '2021-01-01 00:00:00.000'),convert(datetime, '2023-01-01 00:00:00.000'),convert(datetime, '2024-01-01 00:00:00.000'),convert(datetime, '2025-01-01 00:00:00.000')))))
+where (((((T1."bundeslaender_id" = '2') and (T1."arbeitstag_mosa" = 1)) and ((od_year(T1."datum")) = (year(((getdate()) - INTERVAL '001 00:00:00.000'))))) and (T1."datum" <= ((getdate()) - INTERVAL '001 00:00:00.000'))) or (((T1."bundeslaender_id" = '2') and ((od_year(T1."datum")) = (year(((getdate()) - INTERVAL '001 00:00:00.000'))))) and (T1."datum" IN (convert(datetime, '2022-01-01 00:00:00.000'),convert(datetime, '2021-01-01 00:00:00.000'),convert(datetime, '2023-01-01 00:00:00.000'),convert(datetime, '2024-01-01 00:00:00.000'),convert(datetime, '2025-01-01 00:00:00.000')))))
 -- order by "Bundeslaender Id" asc,"Datum" asc,"Wochentage Id" asc,"Arbeitstag Mofr" asc,"Zaehler Mofr" asc,"Summe Mofr" asc,"Arbeitstag Mosa" asc,"Zaehler Mosa" asc,"Summe Mosa" asc,"Feiertage Id" asc,"Gesamt Arbeitstage" asc
 ) D1
 GO

+ 8 - 1
Tasks/scripts/iqd_convert.py

@@ -59,6 +59,13 @@ class IqdConverter:
         query = query.replace('cdatetime(', 'convert(datetime, ')
         query = query.replace('cast_float(', 'convert(float, ')
         query = query.replace('sy_right(', 'right(')
+        query = query.replace('od_left(', 'left(')
+        query = query.replace('length(', 'len(')
+        query = query.replace('{hour}', 'hour')
+        query = query.replace('{minute}', 'minute')
+        query = query.replace('{weekday}', 'weekday')
+        query = query.replace('@CURRENT_DATE', 'getdate()')
+        query = query.replace('cdate(', '(')
 
         query = re.sub(r'intdiv\(([^\)]+)\,1\)', r'\1', query)
         query = re.sub(r'XCOUNT\(([^\)]+) for ', r'COUNT(\1) OVER (partition by ', query)
@@ -84,5 +91,5 @@ class IqdConverter:
 
 
 if __name__ == '__main__':
-    # IqdConverter().convert('C:\\GlobalCube_LOCOSOFT\\System\\LOCOSOFT\\IQD\\NW\\LOC_Belege_NW_GW_VK_Stk_FIBU.iqd')
+    # IqdConverter().convert('C:\\GlobalCube\\System\\ARI\\IQD\\NW\\LOC_Belege_NW_GW_VK_Stk_FIBU.iqd')
     plac.Interpreter.call(IqdConverter)

部分文件因为文件数量过多而无法显示