Staging neu generiert

System/OPTIMA/SQL/schema/OPTIMA/views/staging.auftraege_mont_spp_1340_benutzte_aw_imr.sql

@@ -27,7 +27,7 @@ from ((("OPTIMA"."import"."ORDER_HEADER" T1 left outer join "OPTIMA"."data"."GC_
 	(("OPTIMA"."import"."APPORTIONED_USED_TIME" T5 left outer join "OPTIMA"."import"."VPP43" T4 on (T4."SELLER_CODE" = T5."PROFILE_CODE") and (T4."CLIENT_DB" = T5."CLIENT_DB")) left outer join "OPTIMA"."import"."PROFILE" T3 on (T3."PROFILE_CODE" = T4."SELLER_CODE") and (T3."CLIENT_DB" = T4."CLIENT_DB")),
 	("OPTIMA"."import"."EMPLOYEE" T9 left outer join "OPTIMA"."import"."VPP91" T6 on (T9."WORK_LEADER_GROUP_ID" = T6."WORK_LEADER_GROUP") and (T9."CLIENT_DB" = T6."CLIENT_DB"))
 where (((T8."ORDER_NUMBER" = T5."ORDER_NUMBER") and (T8."UNIQUE_IDENT" = T5."ORDER_LINE_ID")) and (T8."CLIENT_DB" = T5."CLIENT_DB")) and ((T9."PERSON_ID" = T3."PERSON_ID") and (T9."CLIENT_DB" = T3."CLIENT_DB"))
-and ((T1."INVOICE_DATE" >= convert(datetime, '2020-01-01 00:00:00.000')) and (T1."STATUS" IN ('35','37','39','47','48','49','50','51','52','36','34')))
+and (((T1."INVOICE_DATE" >= convert(datetime, '2020-01-01 00:00:00.000')) and (T1."STATUS" IN ('35','37','39','47','48','49','50','51','52','36','34'))) and ((T6."WORK_LEADER_GROUP" + ' - ' + T6."WORKLEADER_TEXT") IN ('110  - WIZ Mechanik                  ','120  - WIZ Karosserie                ','140  - WIZ Lehrlinge                 ','310  - ESW Mechanik                  ','320  - ESW Karosserie                ','340  - ESW Lehrlinge                 ','510  - LPH Mechanik','520  - LPH Karosserie','540  - LPH Lehrlinge')))
 GO
 SET QUOTED_IDENTIFIER OFF 
 GO

System/OPTIMA/SQL/schema/OPTIMA/views/staging.auftraege_mont_spp_1340_verk_aw_mit_ep_imr.sql

@@ -0,0 +1,51 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+CREATE VIEW staging.auftraege_mont_spp_1340_verk_aw_mit_ep_imr AS
+
+select T1."ORDER_NUMBER" as "Order Number",
+	   T1."INVOICE_DATE" as "Datum",
+	   T1."CLIENT_DB" as "Hauptbetrieb",
+	   (substring(T1."DEPARTMENT", 2, 1)) as "Marke",
+	   (substring(T1."DEPARTMENT", 4, 1)) as "Kostenstelle",
+	   T2."Zuordnung" as "Umsatzart",
+	   (rtrim(T3."PROFILE_CODE")) + ' - ' + T4."SEL_NAME" as "Monteur",
+	   T5."EDITED_INV_TIME_INT" as "berechn. AW",
+	   T6."WORK_LEADER_GROUP" as "Work Leader Group",
+	   T6."WORKLEADER_TEXT" as "Workleader Text",
+	   T6."WORK_LEADER_GROUP" + ' - ' + T6."WORKLEADER_TEXT" as "Monteur_Gruppe",
+	   'ben. Zeit' as "Activity_Codes_Group1",
+	   '' as "Activity_Codes_Group2",
+	   '' as "Activity_Desc",
+	   T7."Hauptbetrieb_ID" as "Hauptbetrieb Id",
+	   T7."Hauptbetrieb_Name" as "Hauptbetrieb Name",
+	   T7."Standort_ID" as "Standort Id",
+	   T7."Standort_Name" as "Standort Name",
+	   CASE WHEN ((day((getdate()) - T1."INVOICE_DATE")) <= 4) THEN ((left((((T1."ORDER_NUMBER"))),7)) + ' - ' + T1."MODEL_TEXT" + ' - ' + T1."NAME") ELSE null END as "Order Number_Mont",
+	   CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END as "Umsatz Lohn Basis für Monteur",
+	   CASE WHEN (T8."KEY_PROD_CODE" = 'EP') THEN (T8."LINES_NET_VALUE") WHEN ((T5."EDITED_INV_TIME_INT" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT" * -1) ELSE (0) END as "EP",
+	   T8."INV_TIME" as "Inv Time",
+	   T5."EDITED_INV_TIME_INT" as "Edited Inv Time Int",
+	   T8."LINES_NET_VALUE" as "Lines Net Value",
+	   T8."REDUCTION_AMOUNT" as "Reduction Amount",
+	   T8."INV_TIME_INT" as "Inv Time Int",
+	   (CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."INV_TIME_INT" as "STD-Satz",
+	   T5."EDITED_INV_TIME_INT" as "verk. Stunden",
+	   T5."EDITED_INV_TIME_INT" * ((CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."INV_TIME_INT") as "Umsatz Lohn Monteur",
+	   RSUM((T5."EDITED_INV_TIME_INT" * ((CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."INV_TIME_INT"))) as "Summe  (Umsatz Lohn Monteur) Nr.1",
+	   T5."EDITED_INV_TIME_INT" * ((CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."EST_TIME_INT") as "Umsatz Lohn Monteur Est Time",
+	   (CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."EST_TIME_INT" as "STD-Satz Est Time",
+	   CASE WHEN (T5."EDITED_INV_TIME_INT" = T8."INV_TIME_INT") THEN ((T5."EDITED_INV_TIME_INT" * ((CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."INV_TIME_INT"))) WHEN (T5."EDITED_INV_TIME_INT" = T8."EST_TIME_INT") THEN ((T5."EDITED_INV_TIME_INT" * ((CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."EST_TIME_INT"))) ELSE ((T5."EDITED_INV_TIME_INT" * ((CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."INV_TIME_INT"))) END as "Umsatz Lohn Monteur final"
+from ((("OPTIMA"."import"."ORDER_HEADER" T1 left outer join "OPTIMA"."data"."GC_Umsatzart" T2 on (T2."Client_DB" = T1."CLIENT_DB") and (T2."Geschaeftsbuchungsgruppe" = T1."CUSTOMER_GROUP")) left outer join "OPTIMA"."import"."ORDER_LINE" T8 on (T1."ORDER_NUMBER" = T8."ORDER_NUMBER") and (T1."CLIENT_DB" = T8."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Department" T7 on (left(T1."DEPARTMENT",2)) = T7."Standort"),
+	(("OPTIMA"."import"."APPORTIONED_INV_TIME" T5 left outer join "OPTIMA"."import"."VPP43" T4 on (T4."SELLER_CODE" = T5."PROFILE_CODE") and (T4."CLIENT_DB" = T5."CLIENT_DB")) left outer join "OPTIMA"."import"."PROFILE" T3 on (T3."PROFILE_CODE" = T4."SELLER_CODE") and (T3."CLIENT_DB" = T4."CLIENT_DB")),
+	("OPTIMA"."import"."EMPLOYEE" T9 left outer join "OPTIMA"."import"."VPP91" T6 on (T9."WORK_LEADER_GROUP_ID" = T6."WORK_LEADER_GROUP") and (T9."CLIENT_DB" = T6."CLIENT_DB"))
+where (((T8."ORDER_NUMBER" = T5."ORDER_NUMBER") and (T8."UNIQUE_IDENT" = T5."ORDER_LINE_ID")) and (T8."CLIENT_DB" = T5."CLIENT_DB")) and ((T9."PERSON_ID" = T3."PERSON_ID") and (T9."CLIENT_DB" = T3."CLIENT_DB"))
+and (((T1."INVOICE_DATE" >= convert(datetime, '2020-01-01 00:00:00.000')) and (T1."STATUS" IN ('35','37','39','47','48','49','50','51','52','36','34'))) and ((T6."WORK_LEADER_GROUP" + ' - ' + T6."WORKLEADER_TEXT") IN ('110  - WIZ Mechanik                  ','120  - WIZ Karosserie                ','140  - WIZ Lehrlinge                 ','310  - ESW Mechanik                  ','320  - ESW Karosserie                ','340  - ESW Lehrlinge                 ','510  - LPH Mechanik','520  - LPH Karosserie','540  - LPH Lehrlinge')))
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

System/OPTIMA/SQL/schema/OPTIMA/views/staging.bilanzbelege_o21_csv_imr.sql

@@ -66,10 +66,10 @@ select T1."ACCT_NR" as "Acct Nr",
 	   T6."Standort_Name" as "Betrieb_Name_ori",
 	   T7."Fabrikat" as "Marke_ori",
 	   T7."Order_By" as "Fabrikat_Order_By_ori",
-	   T6."Hauptbetrieb_ID" as "Rechtseinheit_ID",
-	   T6."Hauptbetrieb_Name" as "Rechtseinheit_Name",
-	   T6."Standort_ID" as "Betrieb_ID",
-	   T6."Standort_Name" as "Betrieb_Name",
+	   CASE WHEN (T6."Hauptbetrieb_ID" IS NULL) THEN ('1') ELSE (T6."Hauptbetrieb_ID") END as "Rechtseinheit_ID",
+	   CASE WHEN (T6."Hauptbetrieb_Name" IS NULL) THEN ('Heidenreich') ELSE (T6."Hauptbetrieb_Name") END as "Rechtseinheit_Name",
+	   CASE WHEN (T6."Standort_ID" IS NULL) THEN ('01') ELSE (T6."Standort_ID") END as "Betrieb_ID",
+	   CASE WHEN (T6."Standort_Name" IS NULL) THEN ('Witzenhausen') ELSE (T6."Standort_Name") END as "Betrieb_Name",
 	   T7."Fabrikat" as "Marke",
 	   T7."Order_By" as "Fabrikat_Order_By"
 from "OPTIMA"."import"."ACCOUNT_INFO" T1,

System/OPTIMA/SQL/schema/OPTIMA/views/staging.guv_8_o21_stk_csv_imr.sql

@@ -76,7 +76,7 @@ select T1."ACCT_NR" as "Acct Nr_ori",
 	   T7."Hauptbetrieb_Name" as "Rechtseinheit_Name",
 	   T7."Standort_ID" as "Betrieb_ID",
 	   T7."Standort_Name" as "Betrieb_Name",
-	   CASE WHEN (T4."DESCRIPTION" LIKE '%Opel%') THEN ('Opel') WHEN (T4."DESCRIPTION" LIKE '%Suzuki%') THEN ('Suzuki') WHEN (T4."DESCRIPTION" LIKE '%Chevrolet%') THEN ('Chevrolet') WHEN (T4."DESCRIPTION" LIKE '%Saab%') THEN ('Saab') WHEN (T4."DESCRIPTION" LIKE '%Kia%') THEN ('Kia') WHEN (T4."DESCRIPTION" LIKE '%Fiat%') THEN ('Fiat') WHEN (T4."DESCRIPTION" LIKE '%Peugeot%') THEN ('Peugeot') WHEN (T4."DESCRIPTION" LIKE '%Reifenlager%') THEN ('Reifenlager') WHEN (T4."DESCRIPTION" LIKE '%MG%') THEN ('MG') ELSE ('Marke fehlt') END as "Marke",
+	   T8."Fabrikat" as "Marke",
 	   T8."Order_By" as "Fabrikat_Order_By",
 	   T6."EST_TIME_INT" as "Est Time Int",
 	   T6."INV_TIME_INT" as "Inv Time Int",

System/OPTIMA/SQL/schema/OPTIMA/views/staging.monteur_neu_zeiterf_neu_imr.sql

@@ -41,15 +41,16 @@ select "Unique Ident" as "Unique Ident",
 	   "Activity Description" as "Activity Description",
 	   "Present_Activity" as "Present_Activity",
 	   "Anwesenheit" as "Anwesenheit",
+	   RSUM("Anwesenheit") as "Summe  (Anwesenheit) Nr.1",
 	   "Nacharbeit" as "Nacharbeit",
 	   "Leerlauf/Wartezeit" as "Leerlauf/Wartezeit",
-	   "Prob.fahrt/Endkontr._" as "Prob.fahrt/Endkontr._",
+	   "Hol u Bring Service" as "Hol u Bring Service",
 	   "Instandhltg. Werkstatt" as "Instandhltg. Werkstatt",
 	   "Unprod. Anwes." as "Unprod. Anwes.",
 	   "Hilfslohn" as "Hilfslohn",
 	   "Schulung intern" as "Schulung intern",
 	   "Schulung extern" as "Schulung extern",
-	   "Reifenwechsel" as "Reifenwechsel",
+	   "Reifenlager" as "Reifenlager",
 	   "Krank" as "Krank",
 	   "Arzt" as "Arzt",
 	   "Urlaub" as "Urlaub",
@@ -78,16 +79,16 @@ select "Unique Ident" as "Unique Ident",
 	   "Monteur_ori" as "Monteur_ori",
 	   "Konv Zeitkonto minus" as "Konv Zeitkonto minus",
 	   "Berufsschule" as "Berufsschule",
-	   "Ausb.Zeit mit Handwerker nur Azubi" as "Ausb.Zeit mit Handwerker nur Azubi",
+	   "Ausb.Zeit mit Handwerker nur Azubi_" as "Ausb.Zeit mit Handwerker nur Azubi_",
 	   "Work Leader Group Id" as "Work Leader Group Id",
-	   "Fahrten für KDD_" as "Fahrten für KDD_",
-	   "MW tanken_" as "MW tanken_",
-	   "Arbeiten Anlage B_" as "Arbeiten Anlage B_",
-	   "Aushilfe Annahme_" as "Aushilfe Annahme_",
+	   "GW-Bewertung" as "GW-Bewertung",
+	   "Waschanlage" as "Waschanlage",
+	   "Sondereinsatz lt. WL" as "Sondereinsatz lt. WL",
+	   "Abschleppen" as "Abschleppen",
 	   "Abzug T390" as "Abzug T390",
 	   "Monteur_Gruppe" as "Monteur_Gruppe",
 	   "Monteur" as "Monteur",
-	   "Aushilfe GW_" as "Aushilfe GW_",
+	   "Tag beenden" as "Tag beenden",
 	   "Activity_Codes_Group1" as "Activity_Codes_Group1",
 	   "Activity_Codes_Group2" as "Activity_Codes_Group2",
 	   "Activity_Desc" as "Activity_Desc",
@@ -133,63 +134,63 @@ from
 	   T4."ACTIVITY_DESCRIPTION" as "Activity Description",
 	   T4."PRESENT" as "Present_Activity",
 	   CASE WHEN (T4."PRESENT" = 1) THEN (T1."USED_TIME_INT") ELSE (0) END as "Anwesenheit",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('W4  ','2200')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Nacharbeit",
-	   CASE WHEN ((substring(T1."ACTIVITY_CODE", 2, 1)) = 'L') THEN (T1."USED_TIME_INT") ELSE (0) END as "Leerlauf/Wartezeit",
-	   '' as "Prob.fahrt/Endkontr._",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2830')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Nacharbeit",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2000')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Leerlauf/Wartezeit",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('HUB ')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Hol u Bring Service",
 	   CASE WHEN (T1."ACTIVITY_CODE" IN ('W1  ','2210')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Instandhltg. Werkstatt",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('1000','1002','1001','1003  ')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Unprod. Anwes.",
-	   CASE WHEN ((substring(T1."ACTIVITY_CODE", 2, 1)) = 'H') THEN (T1."USED_TIME_INT") ELSE (0) END as "Hilfslohn",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2100','1001','1000','1005','1004','2110')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Unprod. Anwes.",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2200','2210','2220','2250','2230')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Hilfslohn",
 	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2900')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Schulung intern",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5300')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Schulung extern",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('1060')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Reifenwechsel",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5100  ','5110')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Krank",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('3020')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Arzt",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5000')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Urlaub",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5010')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Sonderurlaub",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5200')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Feiertag",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5100')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Schulung extern",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2800')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Reifenlager",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5000  ')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Krank",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('3000')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Arzt",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5200')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Urlaub",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5210')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Sonderurlaub",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5300')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Feiertag",
 	   CASE WHEN (T1."ACTIVITY_CODE" IN ('4010')) THEN (T1."USED_TIME_INT") ELSE (0) END as "zu spät",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('4020')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Überstunden",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5400')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Überstunden",
 	   T5."ORDER_NUMBER" as "Order Number_Auftrag",
 	   T5."CUSTOMER_GROUP" as "Customer Group",
 	   CASE WHEN ((T5."CUSTOMER_GROUP" BETWEEN '10' AND '59') or (T5."CUSTOMER_GROUP" LIKE '7%')) THEN ('extern') WHEN (T5."CUSTOMER_GROUP" LIKE '6%') THEN ('GWL') WHEN (((T5."CUSTOMER_GROUP" LIKE '9%') or (T5."PMT_TERM" = 'IN')) or ((left(T5."CUSTOMER_GROUP",1)) BETWEEN 'A' AND 'Z')) THEN ('intern') ELSE null END as "Umsatzart",
-	   CASE WHEN ((substring(T1."ACTIVITY_CODE", 3, 2)) IN ('11','12','13')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Extern",
-	   CASE WHEN ((substring(T1."ACTIVITY_CODE", 3, 2)) IN ('21','22','23')) THEN (T1."USED_TIME_INT") ELSE (0) END as "GWL",
-	   CASE WHEN ((substring(T1."ACTIVITY_CODE", 3, 2)) IN ('31','32','33')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Intern",
-	   (CASE WHEN ((substring(T1."ACTIVITY_CODE", 3, 2)) IN ('11','12','13')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN ((substring(T1."ACTIVITY_CODE", 3, 2)) IN ('21','22','23')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN ((substring(T1."ACTIVITY_CODE", 3, 2)) IN ('31','32','33')) THEN (T1."USED_TIME_INT") ELSE (0) END) as "produktiv",
-	   (CASE WHEN (T1."ACTIVITY_CODE" IN ('1000','1002','1001','1003  ')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN ((substring(T1."ACTIVITY_CODE", 2, 1)) = 'L') THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('W4  ','2200')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('W1  ','2210')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN ((substring(T1."ACTIVITY_CODE", 2, 1)) = 'H') THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('2900')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('W3  ')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('1060')) THEN (T1."USED_TIME_INT") ELSE (0) END) as "unproduktiv",
-	   (CASE WHEN (T1."ACTIVITY_CODE" IN ('3020')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('5300')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('3920')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('4010')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('4020')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('5000')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('5010')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('5100  ','5110')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('5200')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('996')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('2999')) THEN (T1."USED_TIME_INT") ELSE (0) END) as "abwesend",
+	   CASE WHEN (T6."Zeitkategorie_2" IN ('Extern')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Extern",
+	   CASE WHEN (T6."Zeitkategorie_2" IN ('GWL')) THEN (T1."USED_TIME_INT") ELSE (0) END as "GWL",
+	   CASE WHEN (T6."Zeitkategorie_2" IN ('Intern')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Intern",
+	   (CASE WHEN (T6."Zeitkategorie_2" IN ('Extern')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T6."Zeitkategorie_2" IN ('GWL')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T6."Zeitkategorie_2" IN ('Intern')) THEN (T1."USED_TIME_INT") ELSE (0) END) as "produktiv",
+	   CASE WHEN (T6."Zeitkategorie_1" IN ('unproduktiv')) THEN (T1."USED_TIME_INT") ELSE (0) END as "unproduktiv",
+	   CASE WHEN (T6."Zeitkategorie_1" IN ('Abwesenheit')) THEN (T1."USED_TIME_INT") ELSE (0) END as "abwesend",
 	   T3."WORK_LEADER_GROUP" + ' - ' + T3."WORKLEADER_TEXT" as "Monteur_Gruppe_ori",
 	   ((T1."START_DATE_TIME")) as "Datum",
-	   T6."CLIENT_DB" as "Hauptbetrieb",
-	   T7."DEPARTMENT_TYPE_ID" as "Department Type Id",
-	   T7."DESCRIPTION" as "Description",
+	   T7."CLIENT_DB" as "Hauptbetrieb",
+	   T8."DEPARTMENT_TYPE_ID" as "Department Type Id",
+	   T8."DESCRIPTION" as "Description",
 	   (left(T2."SEL_DEPARTMENT",2)) as "Standort",
 	   (substring(T2."SEL_DEPARTMENT", 4, 1)) as "Kostenstelle",
 	   T2."SEL_NAME" as "Monteur_ori",
 	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2999')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Konv Zeitkonto minus",
 	   CASE WHEN (T1."ACTIVITY_CODE" IN ('3920')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Berufsschule",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('W3  ')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Ausb.Zeit mit Handwerker nur Azubi",
-	   T6."WORK_LEADER_GROUP_ID" as "Work Leader Group Id",
-	   '' as "Fahrten für KDD_",
-	   '' as "MW tanken_",
-	   '' as "Arbeiten Anlage B_",
-	   '' as "Aushilfe Annahme_",
+	   '' as "Ausb.Zeit mit Handwerker nur Azubi_",
+	   T7."WORK_LEADER_GROUP_ID" as "Work Leader Group Id",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2850')) THEN (T1."USED_TIME_INT") ELSE (0) END as "GW-Bewertung",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2810')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Waschanlage",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2820')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Sondereinsatz lt. WL",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2840')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Abschleppen",
 	   CASE WHEN (T1."ACTIVITY_CODE" IN ('996')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Abzug T390",
 	   (T3."WORK_LEADER_GROUP" + ' - ' + T3."WORKLEADER_TEXT") as "Monteur_Gruppe",
 	   T1."PROFILE_CODE" + ' - ' + T2."SEL_NAME" as "Monteur",
-	   '' as "Aushilfe GW_",
-	   T8."Zeitkategorie_1" as "Activity_Codes_Group1",
-	   T8."Zeitkategorie_2" as "Activity_Codes_Group2",
-	   T8."Activity_Code" + ' - ' + T8."Activity_Desc" as "Activity_Desc",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('1009')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Tag beenden",
+	   T6."Zeitkategorie_1" as "Activity_Codes_Group1",
+	   T6."Zeitkategorie_2" as "Activity_Codes_Group2",
+	   T6."Activity_Code" + ' - ' + T6."Activity_Desc" as "Activity_Desc",
 	   T9."Hauptbetrieb_ID" as "Hauptbetrieb Id",
 	   T9."Hauptbetrieb_Name" as "Hauptbetrieb Name",
 	   T9."Standort_ID" as "Standort Id",
 	   T9."Standort_Name" as "Standort Name"
-from "OPTIMA"."import"."EMPLOYEE" T6,
+from "OPTIMA"."import"."EMPLOYEE" T7,
 	"OPTIMA"."import"."VPP91" T3,
-	((((((("OPTIMA"."import"."PUNCH" T1 left outer join "OPTIMA"."import"."VPP43" T2 on (T1."PROFILE_CODE" = T2."SELLER_CODE") and (T1."CLIENT_DB" = T2."CLIENT_DB")) left outer join "OPTIMA"."import"."PROFILE" T10 on (T2."SELLER_CODE" = T10."PROFILE_CODE") and (T2."CLIENT_DB" = T10."CLIENT_DB")) left outer join "OPTIMA"."import"."ACTIVITY" T4 on (T1."ACTIVITY_CODE" = T4."ACTIVITY_CODE") and (T1."CLIENT_DB" = T4."CLIENT_DB")) left outer join "OPTIMA"."import"."ORDER_HEADER" T5 on (T5."ORDER_NUMBER" = T1."ORDER_NUMBER") and (T5."CLIENT_DB" = T1."CLIENT_DB")) left outer join "OPTIMA"."import"."DEPARTMENT_TYPE" T7 on (T2."SEL_DEPARTMENT" = T7."DEPARTMENT_TYPE_ID") and (T2."CLIENT_DB" = T7."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Activity_Codes" T8 on (T4."CLIENT_DB" = T8."Client_DB") and (T4."ACTIVITY_CODE" = T8."Activity_Code")) left outer join "OPTIMA"."data"."GC_Department" T9 on (T2."CLIENT_DB" = T9."Hauptbetrieb") and ((left(T2."SEL_DEPARTMENT",2)) = T9."Standort"))
-where ((T6."PERSON_ID" = T10."PERSON_ID") and (T6."CLIENT_DB" = T10."CLIENT_DB")) and ((T3."WORK_LEADER_GROUP" = T6."WORK_LEADER_GROUP_ID") and (T3."CLIENT_DB" = T6."CLIENT_DB"))
-and (((not T1."PROFILE_CODE" IN ('MARE')) and ((((T1."START_DATE_TIME"))) >= convert(date, '2020-01-01'))) and (((T3."WORK_LEADER_GROUP" + ' - ' + T3."WORKLEADER_TEXT")) IN ('1100 - LH KDD Mechaniker','1700 - LH VW','2100 - SE KDD Mechaniker','2120 - SE KDD 2 Mechaniker','2700 - SE VW','3100 - LÜ KDD Mechaniker','3200 - LÜ KAR','3300 - LÜ LACK','3700 - LÜ VW','4100 - WE KDD Mechaniker','4700 - WE VW','6100 - DO KDD Mechaniker','6700 - DO VW')))
+	((((((("OPTIMA"."import"."PUNCH" T1 left outer join "OPTIMA"."import"."VPP43" T2 on (T1."PROFILE_CODE" = T2."SELLER_CODE") and (T1."CLIENT_DB" = T2."CLIENT_DB")) left outer join "OPTIMA"."import"."PROFILE" T10 on (T2."SELLER_CODE" = T10."PROFILE_CODE") and (T2."CLIENT_DB" = T10."CLIENT_DB")) left outer join "OPTIMA"."import"."ACTIVITY" T4 on (T1."ACTIVITY_CODE" = T4."ACTIVITY_CODE") and (T1."CLIENT_DB" = T4."CLIENT_DB")) left outer join "OPTIMA"."import"."ORDER_HEADER" T5 on (T5."ORDER_NUMBER" = T1."ORDER_NUMBER") and (T5."CLIENT_DB" = T1."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Activity_Codes" T6 on (T4."CLIENT_DB" = T6."Client_DB") and (T4."ACTIVITY_CODE" = T6."Activity_Code")) left outer join "OPTIMA"."import"."DEPARTMENT_TYPE" T8 on (T2."SEL_DEPARTMENT" = T8."DEPARTMENT_TYPE_ID") and (T2."CLIENT_DB" = T8."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Department" T9 on (T2."CLIENT_DB" = T9."Hauptbetrieb") and ((left(T2."SEL_DEPARTMENT",2)) = T9."Standort"))
+where ((T7."PERSON_ID" = T10."PERSON_ID") and (T7."CLIENT_DB" = T10."CLIENT_DB")) and ((T3."WORK_LEADER_GROUP" = T7."WORK_LEADER_GROUP_ID") and (T3."CLIENT_DB" = T7."CLIENT_DB"))
+and (((not T1."PROFILE_CODE" IN ('MARE')) and ((((T1."START_DATE_TIME"))) >= convert(date, '2020-01-01'))) and (((T3."WORK_LEADER_GROUP" + ' - ' + T3."WORKLEADER_TEXT")) IN ('110  - WIZ Mechanik                  ','120  - WIZ Karosserie                ','140  - WIZ Lehrlinge                 ','310  - ESW Mechanik                  ','320  - ESW Karosserie                ','340  - ESW Lehrlinge                 ','510  - LPH Mechanik','520  - LPH Karosserie','540  - LPH Lehrlinge')))
 -- order by "Transact Date Long" asc
 ) D1
 GO

System/OPTIMA/SQL/schema/OPTIMA/views/staging.nw_auftragsbestand_imr.sql

@@ -127,7 +127,7 @@ select T1."ORDER_NUMBER" as "Order Number_2",
 	   T14."MODEL_TEXT" as "Model Text",
 	   T14."ORIG_MODEL_CODE" as "Orig Model Code",
 	   T14."MAKE_CODE" as "Make Code",
-	   CASE WHEN (T9."VEHICLE_TYPE" IN ('N','T','V','B','M')) THEN ('Neuwagen') WHEN (T9."VEHICLE_TYPE" IN ('D','R')) THEN ('Gebrauchtwagen') ELSE null END as "Fahrzeugart_AB",
+	   CASE WHEN (T9."VEHICLE_TYPE" IN ('N','T','V','B')) THEN ('Neuwagen') WHEN (T9."VEHICLE_TYPE" IN ('D','R','M')) THEN ('Gebrauchtwagen') ELSE null END as "Fahrzeugart_AB",
 	   '1' as "Hauptbetrieb",
 	   (left(T3."DEPARTMENT_TYPE_ID",2)) as "Standort",
 	   T4."SEL_NAME" as "Verkäufer_AB",
@@ -152,7 +152,7 @@ select T1."ORDER_NUMBER" as "Order Number_2",
 	   T16."ALLOC_DATE_GMD" as "Alloc Date Gmd_2",
 	   T16."DELIV_DATE_GMD" as "Deliv Date Gmd",
 	   (CASE WHEN (T16."EVENT_CODE_GMD" IS NULL) THEN ('Info fehlt') ELSE (T16."EVENT_CODE_GMD") END) + ' - ' + (CASE WHEN (T16."EVENT_DATE_GMD" IS NULL) THEN ('Info fehlt') ELSE ((convert(varchar(50), year(T16."EVENT_DATE_GMD")) + '-' + convert(varchar(50), month(T16."EVENT_DATE_GMD")) + '-' + convert(varchar(50), day(T16."EVENT_DATE_GMD")))) END) + ' - ' + (CASE WHEN (T16."ALLOC_DATE_GMD" IS NULL) THEN ('Info fehlt') ELSE ((convert(varchar(50), year(T16."ALLOC_DATE_GMD")) + '-' + convert(varchar(50), month(T16."ALLOC_DATE_GMD")) + '-' + convert(varchar(50), day(T16."ALLOC_DATE_GMD")))) END) + ' - ' + (CASE WHEN (T16."DELIV_DATE_GMD" IS NULL) THEN ('Info fehlt') ELSE ((convert(varchar(50), year(T16."DELIV_DATE_GMD")) + '-' + convert(varchar(50), month(T16."DELIV_DATE_GMD")) + '-' + convert(varchar(50), day(T16."DELIV_DATE_GMD")))) END) as "FZG_2(GD70)",
-	   CASE WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '10' AND '13') THEN ('Endkunden') WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '20' AND '23') THEN ('Geschäftskunden') WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '30' AND '33') THEN ('Großkunden') WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '40' AND '43') THEN ('Vermittler') WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '80' AND '80') THEN ('Händler') WHEN ((CASE WHEN (T9."VEHICLE_TYPE" IN ('N','T','V','B','M')) THEN ('Neuwagen') WHEN (T9."VEHICLE_TYPE" IN ('D','R')) THEN ('Gebrauchtwagen') ELSE null END) = 'Gebrauchtwagen') THEN ('GW' + ' ' + CASE WHEN ((T9."VEHICLE_TYPE" IN ('D','R')) and ((substring(T10."BOOK_KEEPING_CODE", 3, 3)) = '100')) THEN ('Endkunde') WHEN ((T9."VEHICLE_TYPE" IN ('D','R')) and ((substring(T10."BOOK_KEEPING_CODE", 3, 3)) = '300')) THEN ('Aufkäufer') WHEN ((T9."VEHICLE_TYPE" IN ('D','R')) and (not (substring(T10."BOOK_KEEPING_CODE", 3, 3)) IN ('100','300'))) THEN ('GW Sonstige') ELSE null END) ELSE null END as "Kundenart",
+	   CASE WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '10' AND '13') THEN ('Endkunden') WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '20' AND '23') THEN ('Geschäftskunden') WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '30' AND '33') THEN ('Großkunden') WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '40' AND '43') THEN ('Vermittler') WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '80' AND '80') THEN ('Händler') WHEN ((CASE WHEN (T9."VEHICLE_TYPE" IN ('N','T','V','B')) THEN ('Neuwagen') WHEN (T9."VEHICLE_TYPE" IN ('D','R','M')) THEN ('Gebrauchtwagen') ELSE null END) = 'Gebrauchtwagen') THEN ('GW' + ' ' + CASE WHEN ((T9."VEHICLE_TYPE" IN ('D','R')) and ((substring(T10."BOOK_KEEPING_CODE", 3, 3)) = '100')) THEN ('Endkunde') WHEN ((T9."VEHICLE_TYPE" IN ('D','R')) and ((substring(T10."BOOK_KEEPING_CODE", 3, 3)) = '300')) THEN ('Aufkäufer') WHEN ((T9."VEHICLE_TYPE" IN ('D','R')) and (not (substring(T10."BOOK_KEEPING_CODE", 3, 3)) IN ('100','300'))) THEN ('GW Sonstige') ELSE null END) ELSE null END as "Kundenart",
 	   CASE WHEN (T16."EVENT_CODE_GMD" IS NULL) THEN ('Info fehlt') ELSE (T16."EVENT_CODE_GMD") END as "Event Code Gmd",
 	   CASE WHEN (T16."EVENT_DATE_GMD" IS NULL) THEN ('Info fehlt') ELSE ((convert(varchar(50), year(T16."EVENT_DATE_GMD")) + '-' + convert(varchar(50), month(T16."EVENT_DATE_GMD")) + '-' + convert(varchar(50), day(T16."EVENT_DATE_GMD")))) END as "Event Date Gmd",
 	   CASE WHEN (T16."ALLOC_DATE_GMD" IS NULL) THEN ('Info fehlt') ELSE ((convert(varchar(50), year(T16."ALLOC_DATE_GMD")) + '-' + convert(varchar(50), month(T16."ALLOC_DATE_GMD")) + '-' + convert(varchar(50), day(T16."ALLOC_DATE_GMD")))) END as "Alloc Date Gmd",
@@ -162,7 +162,7 @@ select T1."ORDER_NUMBER" as "Order Number_2",
 from ((((((("OPTIMA"."import"."VEH_ORDER_HEADER" T1 left outer join "OPTIMA"."import"."VPP25" T2 on (T1."STATUS" = T2."STAT_CODE") and (T1."CLIENT_DB" = T2."CLIENT_DB")) left outer join "OPTIMA"."import"."DEPARTMENT_TYPE" T3 on (T1."DEPARTMENT" = T3."DEPARTMENT_TYPE_ID") and (T1."CLIENT_DB" = T3."CLIENT_DB")) left outer join "OPTIMA"."import"."VEH_ORDER_LINE" T8 on (T1."ORDER_NUMBER" = T8."ORDER_NUMBER") and (T1."CLIENT_DB" = T8."CLIENT_DB")) left outer join "OPTIMA"."import"."vPP4K" T5 on (T1."FLEET_OWNER" = T5."FLEET_OWNER_CODE") and (T1."CLIENT_DB" = T5."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP48" T6 on (T1."CUSTOMER_GROUP" = T6."CUSTOMER_GROUP") and (T1."CLIENT_DB" = T6."CLIENT_DB")) left outer join "OPTIMA"."import"."vPP61" T7 on (T1."STOCK" = T7."STOCK") and (T1."CLIENT_DB" = T7."CLIENT_DB")) left outer join "OPTIMA"."import"."vPP5M" T10 on (T8."ACCOUNTING_CODE" = T10."BOOK_KEEPING_CODE") and (T8."CLIENT_DB" = T10."CLIENT_DB")),
 	((((((("OPTIMA"."import"."UNIT_FILE" T11 left outer join "OPTIMA"."import"."VPP43" T4 on (T4."SELLER_CODE" = T11."SALE_SALESMAN") and (T4."CLIENT_DB" = T11."CLIENT_DB")) left outer join "OPTIMA"."import"."vPP5R" T9 on (T11."VEHICLE_TYPE" = T9."VEHICLE_TYPE") and (T11."CLIENT_DB" = T9."CLIENT_DB")) left outer join "OPTIMA"."import"."VEHICLE" T12 on T11."BASIS_NUMBER" = T12."BASIS_NUMBER") left outer join "OPTIMA"."import"."VPP5Q" T13 on ((T12."MODEL_LINE" = T13."MODEL_LINE") and (T12."MAKE_CD" = T13."MAKE_CD")) and (T12."CLIENT_DB" = T13."CLIENT_DB")) left outer join "OPTIMA"."import"."vPP74" T14 on ((T12."WORKSHOP_MODEL" = T14."WORKSHOP_MODEL") and (T12."MAKE_CD" = T14."MAKE_CD")) and (T12."CLIENT_DB" = T14."CLIENT_DB")) left outer join "OPTIMA"."import"."GLOBAL_MAKE" T15 on (T12."MAKE_CD" = T15."GLOBAL_MAKE_CD") and (T12."CLIENT_DB" = T15."CLIENT_DB")) left outer join "OPTIMA"."import"."GM_DRIVE_ORDER" T16 on (T11."UNIT_NUMBER" = T16."UNIT_NUMBER") and (T11."CLIENT_DB" = T16."CLIENT_DB"))
 where ((T8."UNIT_NUMBER" = T11."UNIT_NUMBER") and (T8."CLIENT_DB" = T11."CLIENT_DB"))
-and (((((CASE WHEN (T9."VEHICLE_TYPE" IN ('N','T','V','B','M')) THEN ('Neuwagen') WHEN (T9."VEHICLE_TYPE" IN ('D','R')) THEN ('Gebrauchtwagen') ELSE null END) = 'Neuwagen') and (T8."LINE_TYPE_VEH" <> 'Z')) and (T1."ORDER_DATE" >= convert(datetime, '2021-01-01 00:00:00.000'))) and ((CASE WHEN (T1."STATUS" IN ('FG','FR','FS')) THEN ('fakturiert') ELSE ('Auftragsbestand') END) = 'Auftragsbestand'))
+and (((((CASE WHEN (T9."VEHICLE_TYPE" IN ('N','T','V','B')) THEN ('Neuwagen') WHEN (T9."VEHICLE_TYPE" IN ('D','R','M')) THEN ('Gebrauchtwagen') ELSE null END) = 'Neuwagen') and (T8."LINE_TYPE_VEH" <> 'Z')) and (T1."ORDER_DATE" >= convert(datetime, '2021-01-01 00:00:00.000'))) and ((CASE WHEN (T1."STATUS" IN ('FG','FR','FS')) THEN ('fakturiert') ELSE ('Auftragsbestand') END) = 'Auftragsbestand'))
 -- order by "Unit Number_2" asc
 GO
 SET QUOTED_IDENTIFIER OFF 

System/OPTIMA/SQL/schema/OPTIMA/views/staging.nw_be_csv_imr.sql

@@ -769,7 +769,7 @@ from
 	   T1."ECC_STATUS" as "Ecc Status",
 	   T1."BASIS_NUMBER" as "Basis Number_2"
 from (((((((((("OPTIMA"."import"."UNIT_FILE" T1 left outer join "OPTIMA"."import"."vPP5R" T2 on (T1."VEHICLE_TYPE" = T2."VEHICLE_TYPE") and (T1."CLIENT_DB" = T2."CLIENT_DB")) left outer join "OPTIMA"."import"."VEHICLE" T3 on T1."BASIS_NUMBER" = T3."BASIS_NUMBER") left outer join "OPTIMA"."import"."VPP5Q" T4 on ((T3."MODEL_LINE" = T4."MODEL_LINE") and (T3."MAKE_CD" = T4."MAKE_CD")) and (T3."CLIENT_DB" = T4."CLIENT_DB")) left outer join "OPTIMA"."import"."vPP74" T5 on ((T3."WORKSHOP_MODEL" = T5."WORKSHOP_MODEL") and (T3."MAKE_CD" = T5."MAKE_CD")) and (T3."CLIENT_DB" = T5."CLIENT_DB")) left outer join "OPTIMA"."import"."DEPARTMENT_TYPE" T6 on (T1."PURCH_DEPARTMENT" = T6."DEPARTMENT_TYPE_ID") and (T1."CLIENT_DB" = T6."CLIENT_DB")) left outer join "OPTIMA"."import"."GLOBAL_MAKE" T7 on (T3."MAKE_CD" = T7."GLOBAL_MAKE_CD") and (T3."CLIENT_DB" = T7."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP43" T8 on (T1."PURCH_SALSMAN_CODE" = T8."SELLER_CODE") and (T1."CLIENT_DB" = T8."CLIENT_DB")) left outer join "OPTIMA"."import"."UNIT_CHANGE_HIST" T9 on ((T9."UNIT_NUMBER" = T1."UNIT_NUMBER") and (T9."DEPARTMENT" <> ' ')) and (T1."CLIENT_DB" = T9."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Department" T10 on (T1."CLIENT_DB" = T10."Hauptbetrieb") and ((left(T1."PURCH_DEPARTMENT",2)) = T10."Standort")) left outer join "OPTIMA"."data"."GC_Marken" T11 on (T3."CLIENT_DB" = T11."Client_DB") and (T3."MAKE_CD" = T11."Make"))
-where ((T1."ECC_STATUS" IN ('41','42','44')) and (not T1."VEHICLE_TYPE" IN ('G')))
+where ((T1."ECC_STATUS" IN ('41','44')) and (not T1."VEHICLE_TYPE" IN ('G')))
 ) D2
 ) D1
 where ((c262 = "Unique Ident_unique_change_history") or ("Unique Ident_unique_change_history" IS NULL))

System/OPTIMA/SQL/schema/OPTIMA/views/staging.nw_gw_vk_csv_imr.sql

@@ -544,17 +544,17 @@ from
 from 
 (select T1."UNIT_NUMBER" as "Unit Number",
 	   (rtrim(T1."UNIT_NUMBER")) + ' - ' + (rtrim(T16."Standort_Name")) + ' - ' + (rtrim((CASE WHEN (T1."VEHICLE_TYPE" IS NULL) THEN (T1."VEHICLE_TYPE") ELSE (T1."VEHICLE_TYPE" + ' - ' + T2."VEHICLE_TYPE_TEXT") END))) + ' - ' + (rtrim(T5."SEL_NAME")) + ' - ' + (rtrim(((rtrim(T6."CUSTOMER_NUMBER")) + ' - ' + (rtrim(T6."NAME"))))) as "FZG_Detail",
-	   (CASE WHEN (T13."TRANSACTION_CODE" IN ('10','12','24')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('15','16','18','19','90','91','93')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('14')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) - (CASE WHEN (T13."TRANSACTION_CODE" IN ('11 ')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) - (CASE WHEN (T13."TRANSACTION_CODE" IN ('13')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) - ((CASE WHEN (T13."TRANSACTION_CODE" IN ('25 ','26 ','27 ','28 ','29 ','30','31','32','33','17')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('37 ','39 ','40 ','41 ','47 ','49 ','50','51','59','61','63','67','69','70 ','75 ')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END)) as "DB1",
-	   (((CASE WHEN (T13."TRANSACTION_CODE" IN ('25 ','26 ','27 ','28 ','29 ','30','31','32','33','17')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('37 ','39 ','40 ','41 ','47 ','49 ','50','51','59','61','63','67','69','70 ','75 ')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END))) as "Einsatz",
-	   (CASE WHEN (T13."TRANSACTION_CODE" IN ('14')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) as "Ums. Fracht und Überf.",
-	   ((CASE WHEN (T13."TRANSACTION_CODE" IN ('10','12','24')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END)) as "Erlös",
+	   (CASE WHEN (T13."TRANSACTION_CODE" IN ('10','14','24')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('15','16','18','19','90','91','93','92')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('12')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) - (CASE WHEN (T13."TRANSACTION_CODE" IN ('11 ')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) - (CASE WHEN (T13."TRANSACTION_CODE" IN ('13')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) - ((CASE WHEN (T13."TRANSACTION_CODE" IN ('25 ','26 ','27 ','28 ','29 ','30','31','32','33','17')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('59','37','39','40','41','47','49')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END)) as "DB1",
+	   (((CASE WHEN (T13."TRANSACTION_CODE" IN ('25 ','26 ','27 ','28 ','29 ','30','31','32','33','17')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('59','37','39','40','41','47','49')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END))) as "Einsatz",
+	   (CASE WHEN (T13."TRANSACTION_CODE" IN ('12')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) as "Ums. Fracht und Überf.",
+	   ((CASE WHEN (T13."TRANSACTION_CODE" IN ('10','14','24')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END)) as "Erlös",
 	   ((CASE WHEN (T13."TRANSACTION_CODE" IN ('13')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END)) as "Provisionen",
 	   T1."PREV_OWNER" as "Prev Owner",
 	   (rtrim((((T13."DOCUMENT_NR"))))) + ' - ' + T13."TRANSACTION_CODE" + ' - ' + T13."REFERENCE" as "Buch_Text",
 	   T12."SEL_NAME" as "Sel Name_EK_vpp43",
 	   (rtrim(T12."SEL_NAME")) + ' / ' + T1."PREV_OWNER" as "Einkäufer/Vorbesitzer",
 	   CASE WHEN (T11."Order_By" IS NULL) THEN (1) ELSE (T11."Order_By") END as "Order By",
-	   (CASE WHEN (T13."TRANSACTION_CODE" IN ('15','16','18','19','90','91','93')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) as "Sonst. Erlöse",
+	   (CASE WHEN (T13."TRANSACTION_CODE" IN ('15','16','18','19','90','91','93','92')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) as "Sonst. Erlöse",
 	   T6."ZIPCODE" as "Zipcode",
 	   (substring(T6."ZIPCODE", 1, 4)) as "PLZ_4",
 	   (substring(T6."ZIPCODE", 1, 3)) as "PLZ_3",
@@ -576,7 +576,7 @@ from
 	   CASE WHEN (T10."DESCRIPTION" IN ('Opel')) THEN (T10."DESCRIPTION") ELSE ('Fremdfabrikat') END as "Fabrikat_manuell",
 	   CASE WHEN (T1."RECEPTION_DATE" IS NULL) THEN ((day(T1."SALE_DATE" - T1."PURCH_DATE"))) ELSE ((day(T1."SALE_DATE" - T1."RECEPTION_DATE"))) END as "Standtage",
 	   CASE WHEN (T13."TRANSACTION_CODE" IN ('26','27','28','29','31','32','33','17')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END as "VK_Hilfen",
-	   CASE WHEN (T13."TRANSACTION_CODE" IN ('37 ','39 ','40 ','41 ','47 ','49 ','50','51','59','61','63','67','69','70 ','75 ')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END as "FZG-Kosten",
+	   CASE WHEN (T13."TRANSACTION_CODE" IN ('59','37','39','40','41','47','49')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END as "FZG-Kosten",
 	   CASE WHEN (T13."TRANSACTION_CODE" IN ('25 ','26 ','27 ','28 ','29 ','30','31','32','33','17')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END as "EK Fahrzeug",
 	   CASE WHEN (T13."TRANSACTION_CODE" IN ('11 ')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END as "Nachlass",
 	   T13."INT_VOUCHER_NO" as "Int Voucher No",
@@ -612,7 +612,7 @@ from
 	   T6."CUSTOMER_GROUP" + ' - ' + T7."CUST_GROUP_SPECIFY" as "Kundenart",
 	   (rtrim(T6."CUSTOMER_NUMBER")) + ' - ' + (rtrim(T6."NAME")) as "Kunde",
 	   CASE WHEN (T1."VEHICLE_TYPE" IS NULL) THEN (T1."VEHICLE_TYPE") ELSE (T1."VEHICLE_TYPE" + ' - ' + T2."VEHICLE_TYPE_TEXT") END as "Fahrzeugtyp",
-	   CASE WHEN (T1."VEHICLE_TYPE" IN ('N','T','W','M','V','B')) THEN ('Neuwagen') WHEN (T1."VEHICLE_TYPE" IN ('D','G','K','R')) THEN ('Gebrauchtwagen') ELSE null END as "Fahrzeugart",
+	   CASE WHEN (T1."VEHICLE_TYPE" IN ('N','T','W','V','B')) THEN ('Neuwagen') WHEN (T1."VEHICLE_TYPE" IN ('D','G','K','R','M')) THEN ('Gebrauchtwagen') ELSE null END as "Fahrzeugart",
 	   T8."CHASSIS_NUMBER" as "Chassis Number",
 	   CASE WHEN ((CASE WHEN (T11."Fabrikat" IS NULL) THEN ('Fremdfabrikat') ELSE (T11."Fabrikat") END) = 'Fremdfabrikat') THEN (T8."MODEL_TEXT") ELSE (T9."MOD_LIN_SPECIFY") END as "Model",
 	   T10."DESCRIPTION" as "Description_Global_Make",

System/OPTIMA/SQL/schema/OPTIMA/views/staging.offene_auftraege_csv_imr.sql

@@ -158,7 +158,7 @@ select "Order Number_ori_2",
 	   "Model",
 	   "Fahrzeug",
 	   "Auftrag_Det_S",
-	   "Auftrag_Det_T",
+	   '' as "Auftrag_Det_T",
 	   "Anzahl Tage",
 	   "Order Number",
 	   "Fabrikat",
@@ -181,9 +181,8 @@ from
 	   (day((getdate()) - T1."ORDER_DATE")) as "Anzahl Tage",
 	   T1."ORDER_DATE" as "Order Date",
 	   CASE WHEN (T9."Fabrikat" IS NULL) THEN ('Fremd') ELSE (T9."Fabrikat") END as "Fabrikat",
-	   (left((((T1."ORDER_NUMBER"))),7)) + ' - ' + (rtrim(((rtrim(T1."DEBIT_ACCOUNT")) + ' - ' + T1."NAME"))) + ' - ' + T1."REGISTER_NUMBER" as "Order Number",
-	   (left((((T1."ORDER_NUMBER"))),7)) + ' - ' + (substring((convert(varchar(50), year(T1."ORDER_DATE")) + '-' + convert(varchar(50), month(T1."ORDER_DATE")) + '-' + convert(varchar(50), day(T1."ORDER_DATE"))), 1, 10)) + ' - ' + T1."DELIVERY_ACCOUNT" + T1."NAME" + ' - ' + T1."REGISTER_NUMBER" + ' - ' + T1."STATUS" as "Auftrag_Det_T",
-	   (left((((T1."ORDER_NUMBER"))),7)) + ' - ' + (substring((convert(varchar(50), year(T1."ORDER_DATE")) + '-' + convert(varchar(50), month(T1."ORDER_DATE")) + '-' + convert(varchar(50), day(T1."ORDER_DATE"))), 1, 10)) + ' - ' + (rtrim(T1."DELIVERY_ACCOUNT")) + ' ' + T1."NAME" + ' - ' + (rtrim(T1."REGISTER_NUMBER")) + ' - ' + T1."STATUS" as "Auftrag_Det_S",
+	   CASE WHEN (T1."ORDER_NUMBER" IN (3502817)) THEN ((left((((T1."ORDER_NUMBER"))),7)) + ' - ' + (rtrim(((rtrim(T1."DEBIT_ACCOUNT")) + ' - ' + T1."NAME")))) ELSE ((left((((T1."ORDER_NUMBER"))),7)) + ' - ' + (rtrim(((rtrim(T1."DEBIT_ACCOUNT")) + ' - ' + T1."NAME"))) + ' - ' + T1."REGISTER_NUMBER") END as "Order Number",
+	   CASE WHEN (T1."ORDER_NUMBER" IN (3502817)) THEN ((left((((T1."ORDER_NUMBER"))),7)) + ' - ' + (substring((convert(varchar(50), year(T1."ORDER_DATE")) + '-' + convert(varchar(50), month(T1."ORDER_DATE")) + '-' + convert(varchar(50), day(T1."ORDER_DATE"))), 1, 10)) + ' - ' + (rtrim(T1."DELIVERY_ACCOUNT")) + ' ' + T1."NAME") ELSE ((left((((T1."ORDER_NUMBER"))),7)) + ' - ' + (substring((convert(varchar(50), year(T1."ORDER_DATE")) + '-' + convert(varchar(50), month(T1."ORDER_DATE")) + '-' + convert(varchar(50), day(T1."ORDER_DATE"))), 1, 10)) + ' - ' + (rtrim(T1."DELIVERY_ACCOUNT")) + ' ' + T1."NAME" + ' - ' + (rtrim(T1."REGISTER_NUMBER")) + ' - ' + T1."STATUS") END as "Auftrag_Det_S",
 	   T1."BASIS_NUMBER" + ' - ' + T1."CHASSIS_NUMBER" as "Fahrzeug",
 	   T11."MOD_LIN_SPECIFY" as "Model",
 	   T10."DESCRIPTION" as "Description",
@@ -330,7 +329,7 @@ from
 	   T1."STATUS" as "Status",
 	   T1."REGISTER_NUMBER" as "Register Number"
 from (((((((((((("OPTIMA"."import"."ORDER_HEADER" T1 left outer join "OPTIMA"."import"."ORDER_LINE" T2 on (T1."ORDER_NUMBER" = T2."ORDER_NUMBER") and (T1."CLIENT_DB" = T2."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP25" T3 on (T1."STATUS" = T3."STAT_CODE") and (T1."CLIENT_DB" = T3."CLIENT_DB")) left outer join "OPTIMA"."import"."DEPARTMENT_TYPE" T4 on (T1."DEPARTMENT" = T4."DEPARTMENT_TYPE_ID") and (T1."CLIENT_DB" = T4."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP43" T5 on (T1."SALESMAN" = T5."SELLER_CODE") and (T1."CLIENT_DB" = T5."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP48" T6 on (T1."CUSTOMER_GROUP" = T6."CUSTOMER_GROUP") and (T1."CLIENT_DB" = T6."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP43" T7 on (T2."MECHANIC_CODE" = T7."SELLER_CODE") and (T2."CLIENT_DB" = T7."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP73" T8 on ((T2."REPAIR_GROUP" = T8."REPAIR_GROUP") and (T2."MAKE_CD" = T8."MAKE_CD")) and (T2."CLIENT_DB" = T8."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Marken" T9 on (T1."MAKE_CD" = T9."Make") and (T1."CLIENT_DB" = T9."Client_DB")) left outer join "OPTIMA"."import"."GLOBAL_MAKE" T10 on (T1."MAKE_CD" = T10."GLOBAL_MAKE_CD") and (T1."CLIENT_DB" = T10."CLIENT_DB")) left outer join "OPTIMA"."import"."VEHICLE" T13 on ((T13."CHASSIS_NUMBER" = T1."CHASSIS_NUMBER") and (T13."BASIS_NUMBER" = T1."BASIS_NUMBER")) and (T13."CLIENT_DB" = T1."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP5Q" T11 on ((T13."MODEL_LINE" = T11."MODEL_LINE") and (T13."MAKE_CD" = T11."MAKE_CD")) and (T13."CLIENT_DB" = T11."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Department" T12 on ((left(T1."DEPARTMENT",2)) = T12."Standort") and (T1."CLIENT_DB" = T12."Hauptbetrieb"))
-where ((((T1."STATUS" IN ('30','40','42','43','44')) and (T1."INVOICE_DATE" = convert(datetime, '1800-01-01 00:00:00.000'))) and (T1."ORDER_DATE" >= convert(datetime, '2020-01-01 00:00:00.000'))) and (T2."ORDER_LINETYPE" <> '2'))
+where ((((not T1."STATUS" IN ('39','41','49','91','31','47','37','33','35')) and (T1."INVOICE_DATE" = convert(datetime, '1800-01-01 00:00:00.000'))) and (T1."ORDER_DATE" >= convert(datetime, '2020-01-01 00:00:00.000'))) and (T2."ORDER_LINETYPE" <> '2'))
 -- order by "Order Number_ori_2" asc
 ) D1
 GO

System/OPTIMA/SQL/schema/OPTIMA/views/staging.op_as_imr.sql

@@ -178,7 +178,7 @@ from
 	   T5."SEL_DEPARTMENT" as "Sel Department",
 	   '1' as "Hauptbetrieb",
 	   (left(T3."DEPARTMENT",2)) as "Standort",
-	   CASE WHEN (T1."STATUS" LIKE '3%') THEN ('3') ELSE ('4') END as "Kostenstelle",
+	   (substring(T3."DEPARTMENT", 4, 1)) as "Kostenstelle",
 	   T6."CUSTOMER_NUMBER" as "Customer Number_Deliv",
 	   T6."NAME" as "Name_Deliv",
 	   (getdate()) as "Heute",
@@ -188,7 +188,7 @@ from
 	   T6."NAME" + ' - ' + T6."CUSTOMER_NUMBER" as "Lieferkunde",
 	   (convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE"))) as "Datum_Zeichen",
 	   (((T3."INVOICE_NUMBER"))) as "Voucher_Zeichen",
-	   (substring((left(((((T3."INVOICE_NUMBER")))),7)) + ' - ' + ((left(T1."COMMENT_CU",50))) + ' - ' + ((convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE")))) + ' - MS: ' + T1."DUNTIMES", 1, 100)) as "Beleg",
+	   (substring((left(((((T3."INVOICE_NUMBER")))),7)) + ' - ' + ((left(T1."COMMENT_CU",50))) + ' - ' + ((convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE")))) + ' - MS: ' + T1."DUNTIMES", 1, 100)) + ' - ' + (((T3."ORDER_NUMBER"))) as "Beleg",
 	   '1' as "Hauptbetrieb_ID",
 	   T7."Hauptbetrieb_Name" as "Hauptbetrieb_Name",
 	   ((left(T3."DEPARTMENT",2))) as "Standort_ID_",

System/OPTIMA/SQL/schema/OPTIMA/views/staging.op_fzg_imr.sql

@@ -83,7 +83,7 @@ select T1."CUSTOMER_NUMBER" as "Customer Number_2",
 	   T5."SEL_DEPARTMENT" as "Sel Department",
 	   '1' as "Hauptbetrieb",
 	   (left(T3."DEPARTMENT",2)) as "Standort",
-	   (substring(T3."DEPARTMENT", 3, 1)) as "Kostenstelle",
+	   (substring(T3."DEPARTMENT", 4, 1)) as "Kostenstelle",
 	   T6."CUSTOMER_NUMBER" as "Customer Number_Deliv",
 	   T6."NAME" as "Name_Deliv",
 	   (getdate()) as "Heute",
@@ -93,7 +93,7 @@ select T1."CUSTOMER_NUMBER" as "Customer Number_2",
 	   T6."NAME" + ' - ' + T6."CUSTOMER_NUMBER" as "Lieferkunde",
 	   (convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE"))) as "Datum_Zeichen",
 	   (((T1."VOUCHER_NO"))) as "Voucher_Zeichen",
-	   CASE WHEN ((T2."NAME" + ' - ' + T1."CUSTOMER_NUMBER") = (T6."NAME" + ' - ' + T6."CUSTOMER_NUMBER")) THEN ((substring((left(((((T1."VOUCHER_NO")))),7)) + ' - ' + (CASE WHEN (T1."VOUCHER_NO" = 3271990) THEN (' - ') ELSE ((left(T1."COMMENT_CU",100))) END) + ' - ' + ((convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE")))) + ' - MS: ' + T1."DUNTIMES", 1, 100))) ELSE ((substring((rtrim(T6."NAME")) + ' - ' + (left(((((T1."VOUCHER_NO")))),7)) + ' - ' + (CASE WHEN (T1."VOUCHER_NO" = 3271990) THEN (' - ') ELSE ((left(T1."COMMENT_CU",100))) END) + ' - ' + ((convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE")))) + ' - MS: ' + T1."DUNTIMES", 1, 100))) END as "Beleg",
+	   CASE WHEN ((T2."NAME" + ' - ' + T1."CUSTOMER_NUMBER") = (T6."NAME" + ' - ' + T6."CUSTOMER_NUMBER")) THEN ((substring((left(((((T1."VOUCHER_NO")))),7)) + ' - ' + (CASE WHEN (T1."VOUCHER_NO" = 3271990) THEN (' - ') ELSE ((left(T1."COMMENT_CU",100))) END) + ' - ' + ((convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE")))) + ' - MS: ' + T1."DUNTIMES", 1, 100))) ELSE ((substring((rtrim(T6."NAME")) + ' - ' + (left(((((T1."VOUCHER_NO")))),7)) + ' - ' + (CASE WHEN (T1."VOUCHER_NO" = 3271990) THEN (' - ') ELSE ((left(T1."COMMENT_CU",100))) END) + ' - ' + ((convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE")))) + ' - MS: ' + T1."DUNTIMES", 1, 100))) END + ' - ' + (((T3."ORDER_NUMBER"))) as "Beleg",
 	   '1' as "Hauptbetrieb_ID",
 	   T7."Hauptbetrieb_Name" as "Hauptbetrieb_Name",
 	   ((left(T3."DEPARTMENT",2))) as "Standort_ID_",

System/OPTIMA/SQL/schema/OPTIMA/views/staging.schichtplan_pro_ma_neu_imr.sql

@@ -30,14 +30,14 @@ select T1."REFERENCE_IDENT" as "Reference Ident",
 	   T6."CALENDAR_TYPE_ID" as "Calendar Type Id",
 	   T6."RECURRING_TYPE_ID" as "Recurring Type Id",
 	   T6."HOLIDAY_ID" as "Holiday Id",
-	   (datepart(weekday, T6."EVENT_START")) as "Wochentag",
-	   T3."SEL_NAME" as "Monteur_ori",
+	   (datepart(weekday, T6."EVENT_START")) + 1 as "Wochentag",
+	   T3."SEL_NAME" + ' - ' + T7."PROFILE_CODE" as "Monteur_2",
 	   T6."EVENT_START" as "Datum",
-	   T7."PERS_DEPARTMENT" as "Pers Department",
-	   T4."CLIENT_DB" as "Hauptbetrieb",
+	   T8."PERS_DEPARTMENT" as "Pers Department",
+	   '1' as "Hauptbetrieb",
 	   (left(T3."SEL_DEPARTMENT",2)) as "Standort",
-	   T8."PROFILE_CODE" as "Profile Code",
-	   (substring(T3."SEL_DEPARTMENT", 4, 1)) as "Kostenstelle",
+	   T7."PROFILE_CODE" as "Profile Code",
+	   CASE WHEN ((substring(T3."SEL_DEPARTMENT", 3, 2)) = '20') THEN ('2') WHEN ((substring(T3."SEL_DEPARTMENT", 3, 2)) IN ('30','80')) THEN ('6') WHEN ((substring(T3."SEL_DEPARTMENT", 3, 2)) = '40') THEN ('3') WHEN ((substring(T3."SEL_DEPARTMENT", 3, 2)) = '41') THEN ('4') WHEN (T3."SEL_DEPARTMENT" IN ('1F  ')) THEN ('3') ELSE null END as "Kostenstelle",
 	   T4."CORE_WORKING_HOURS" as "Feiertag",
 	   '' as "Order Number",
 	   T9."WORK_LEADER_GROUP_ID" as "Work Leader Group Id",
@@ -47,7 +47,7 @@ select T1."REFERENCE_IDENT" as "Reference Ident",
 	   T4."CORE_WORKING_HOURS" as "Core Working Hours",
 	   T4."WORKINGDAY" as "Workingday",
 	   T4."START_DAY_ID" as "Start Day Id",
-	   (rtrim(T8."PROFILE_CODE")) + ' - ' + T3."SEL_NAME" as "Monteur",
+	   (rtrim(T7."PROFILE_CODE")) + ' - ' + T3."SEL_NAME" as "Monteur",
 	   'Abwesenheit' as "Activity_Codes_Group1",
 	   'Feiertag' as "Activity_Codes_Group2",
 	   '' as "Activity_Desc",
@@ -59,10 +59,10 @@ from "OPTIMA"."import"."WORKING_PERIOD" T4,
 	"OPTIMA"."import"."EMPLOYEE" T9,
 	"OPTIMA"."import"."VPP91" T5,
 	"OPTIMA"."import"."CALENDAR_EVENT" T6,
-	(("OPTIMA"."import"."CALENDAR_INFO" T1 left outer join "OPTIMA"."import"."CALENDAR_PATTERN" T2 on (T2."CALENDAR_INFO_ID" = T1."REFERENCE_IDENT") and (T2."CLIENT_DB" = T1."CLIENT_DB")) left outer join "OPTIMA"."import"."PERSON_INFO" T7 on (T1."REFERENCE_NAME" = T7."PERSON_NUMBER") and (T1."CLIENT_DB" = T7."CLIENT_DB")),
-	(("OPTIMA"."import"."VPP43" T3 left outer join "OPTIMA"."import"."PROFILE" T8 on (T3."SELLER_CODE" = T8."PROFILE_CODE") and (T3."CLIENT_DB" = T8."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Department" T10 on (T3."CLIENT_DB" = T10."Hauptbetrieb") and ((left(T3."SEL_DEPARTMENT",2)) = T10."Standort"))
-where ((T8."PROFILE_CODE" = T1."REFERENCE_NAME") and (T8."CLIENT_DB" = T1."CLIENT_DB")) and ((T2."RECURRING_PATTERN_ID" = T4."RECURRING_PATTERN_ID") and (T2."CLIENT_DB" = T4."CLIENT_DB")) and ((T9."PERSON_ID" = T8."PERSON_ID") and (T9."CLIENT_DB" = T8."CLIENT_DB")) and ((T5."WORK_LEADER_GROUP" = T9."WORK_LEADER_GROUP_ID") and (T5."CLIENT_DB" = T9."CLIENT_DB"))
-and ((((((((not T8."PROFILE_CODE" IN ('MARE')) and (T6."HOLIDAY_ID" IS NOT NULL)) and (T6."EVENT_START" >= convert(datetime, '2020-01-01 00:00:00.000'))) and (T6."HOLIDAY_ID" IN (1,3,5,6,7,9,10,12,14,17,18))) and (((datepart(weekday, T6."EVENT_START"))) BETWEEN 2 AND 6)) and (T6."EVENT_START" < (getdate()))) and ((T5."WORK_LEADER_GROUP" + ' - ' + T5."WORKLEADER_TEXT") IN ('1100 - LH KDD Mechaniker','1700 - LH VW','2100 - SE KDD Mechaniker','2700 - SE VW','3100 - LÜ KDD Mechaniker','3200 - LÜ KAR','3300 - LÜ LACK','3700 - LÜ VW','4100 - WE KDD Mechaniker','4700 - WE VW','6100 - DO KDD Mechaniker','6700 - DO VW'))) and ((T9."JOB_END_DATE" = convert(datetime, '1800-01-01 00:00:00.000')) or (T6."EVENT_START" < T9."JOB_END_DATE")))
+	(("OPTIMA"."import"."CALENDAR_INFO" T1 left outer join "OPTIMA"."import"."CALENDAR_PATTERN" T2 on (T2."CALENDAR_INFO_ID" = T1."REFERENCE_IDENT") and (T2."CLIENT_DB" = T1."CLIENT_DB")) left outer join "OPTIMA"."import"."PERSON_INFO" T8 on (T1."REFERENCE_NAME" = T8."PERSON_NUMBER") and (T1."CLIENT_DB" = T8."CLIENT_DB")),
+	(("OPTIMA"."import"."VPP43" T3 left outer join "OPTIMA"."import"."PROFILE" T7 on (T3."SELLER_CODE" = T7."PROFILE_CODE") and (T3."CLIENT_DB" = T7."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Department" T10 on (T3."CLIENT_DB" = T10."Hauptbetrieb") and ((left(T3."SEL_DEPARTMENT",2)) = T10."Standort"))
+where ((T7."PROFILE_CODE" = T1."REFERENCE_NAME") and (T7."CLIENT_DB" = T1."CLIENT_DB")) and ((T2."RECURRING_PATTERN_ID" = T4."RECURRING_PATTERN_ID") and (T2."CLIENT_DB" = T4."CLIENT_DB")) and ((T9."PERSON_ID" = T7."PERSON_ID") and (T9."CLIENT_DB" = T7."CLIENT_DB")) and ((T5."WORK_LEADER_GROUP" = T9."WORK_LEADER_GROUP_ID") and (T5."CLIENT_DB" = T9."CLIENT_DB"))
+and (((((((((T6."HOLIDAY_ID" IS NOT NULL) and (T6."EVENT_START" >= convert(datetime, '2013-01-02 00:00:00.000'))) and (T6."HOLIDAY_ID" IN (20,22,24,25,26,28,29,31,36,37))) and (((datepart(weekday, T6."EVENT_START")) + 1) BETWEEN 2 AND 6)) and (T6."EVENT_START" < (getdate()))) and ((T5."WORK_LEADER_GROUP" + ' - ' + T5."WORKLEADER_TEXT") IN ('110  - WIZ Mechanik                  ','120  - WIZ Karosserie                ','140  - WIZ Lehrlinge                 ','310  - ESW Mechanik                  ','320  - ESW Karosserie                ','340  - ESW Lehrlinge                 '))) and ((T9."JOB_END_DATE" = convert(datetime, '1800-01-01 00:00:00.000')) or (T6."EVENT_START" < T9."JOB_END_DATE"))) and ((T2."RECURRING_PATTERN_PRIORITY" = 0) or (T2."RECURRING_PATTERN_PRIORITY" IS NULL))) and (((datepart(weekday, T6."EVENT_START")) + 1) = T4."START_DAY_ID"))
 -- order by "Reference Name" asc
 GO
 SET QUOTED_IDENTIFIER OFF