Эх сурвалжийг харах

Neuer Export von iqd_convert.py

Global Cube 2 жил өмнө
parent
commit
706a1049b6
23 өөрчлөгдсөн 215 нэмэгдсэн , 177 устгасан
  1. 2 2
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.auftraege_gutschrift_imr.sql
  2. 1 1
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.auftraege_mont_spp_1340_benutzte_aw_imr.sql
  3. 1 1
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.auftraege_mont_spp_1340_verk_aw_imr.sql
  4. 13 15
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.auftraege_spp_split_csv_imr.sql
  5. 1 1
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.bilanzbelege_o21_csv_imr.sql
  6. 22 9
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.current_date_prognose_imr.sql
  7. 22 8
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.current_date_prognose_jeder_tag_imr.sql
  8. 22 8
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.current_date_prognose_vj_imr.sql
  9. 8 9
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.fokus_auftraege_spp_split_csv_imr.sql
  10. 2 2
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.guv_8_o21_csv_imr.sql
  11. 2 2
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.guv_8_o21_csv_umsatz_belege_imr.sql
  12. 2 2
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.guv_8_o21_stk_csv_imr.sql
  13. 12 12
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.gw_be_vorlauf_imr.sql
  14. 10 10
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.monteur_neu_zeiterf_neu_imr.sql
  15. 6 6
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.nw_auftragsbestand_imr.sql
  16. 6 6
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.nw_be_bilanz_imr.sql
  17. 12 12
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.nw_be_csv_imr.sql
  18. 54 54
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.nw_gw_vk_csv_imr.sql
  19. 4 4
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.offene_auftraege_csv_imr.sql
  20. 3 3
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.op_as_imr.sql
  21. 1 1
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.op_fzg_imr.sql
  22. 7 7
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.op_ohne_auftrag_o21_imr.sql
  23. 2 2
      System/OPTIMA/SQL/schema/OPTIMA/views/staging.schichtplan_pro_ma_neu_imr.sql

+ 2 - 2
System/OPTIMA/SQL/schema/OPTIMA/views/staging.auftraege_gutschrift_imr.sql

@@ -119,7 +119,7 @@ select T1."REGISTER_NUMBER" as "Register Number",
 	   T2."LINES_NET_VALUE" as "Umsatz_Gutschriften",
 	   T2."LINES_NET_VALUE" as "Umsatz_Gutschriften",
 	   '1' as "Hauptbetrieb Id",
 	   '1' as "Hauptbetrieb Id",
 	   (CASE WHEN (T7."SEL_DEPARTMENT" = '0316      ') THEN ((left(T7."SEL_DEPARTMENT",2))) ELSE ((left(T4."DEPARTMENT_TYPE_ID",2))) END) as "Standort Id"
 	   (CASE WHEN (T7."SEL_DEPARTMENT" = '0316      ') THEN ((left(T7."SEL_DEPARTMENT",2))) ELSE ((left(T4."DEPARTMENT_TYPE_ID",2))) END) as "Standort Id"
-from ((((((("OPTIMA"."import"."ORDER_HEADER" T1 left outer join "OPTIMA"."import"."ORDER_LINE" T2 on T1."ORDER_NUMBER" = T2."ORDER_NUMBER") left outer join "OPTIMA"."import"."vPP25" T3 on T1."STATUS" = T3."STAT_CODE") left outer join "OPTIMA"."import"."DEPARTMENT_TYPE" T4 on T1."DEPARTMENT" = T4."DEPARTMENT_TYPE_ID") left outer join "OPTIMA"."import"."vPP43" T5 on T1."SALESMAN" = T5."SELLER_CODE") left outer join "OPTIMA"."import"."vPP48" T6 on T1."CUSTOMER_GROUP" = T6."CUSTOMER_GROUP") left outer join "OPTIMA"."import"."vPP43" T7 on T2."MECHANIC_CODE" = T7."SELLER_CODE") left outer join "OPTIMA"."import"."vPP73" T8 on (T2."REPAIR_GROUP" = T8."REPAIR_GROUP") and (T2."MAKE_CD" = T8."MAKE_CD"))
+from ((((((("deop01"."dbo"."ORDER_HEADER" T1 left outer join "deop01"."dbo"."ORDER_LINE" T2 on T1."ORDER_NUMBER" = T2."ORDER_NUMBER") left outer join "deop01"."dbo"."vPP25" T3 on T1."STATUS" = T3."STAT_CODE") left outer join "deop01"."dbo"."DEPARTMENT_TYPE" T4 on T1."DEPARTMENT" = T4."DEPARTMENT_TYPE_ID") left outer join "deop01"."dbo"."vPP43" T5 on T1."SALESMAN" = T5."SELLER_CODE") left outer join "deop01"."dbo"."vPP48" T6 on T1."CUSTOMER_GROUP" = T6."CUSTOMER_GROUP") left outer join "deop01"."dbo"."vPP43" T7 on T2."MECHANIC_CODE" = T7."SELLER_CODE") left outer join "deop01"."dbo"."vPP73" T8 on (T2."REPAIR_GROUP" = T8."REPAIR_GROUP") and (T2."MAKE_CD" = T8."MAKE_CD"))
 where (((T1."STATUS" IN ('35','37','39','47','49','50','51','36')) and ((CASE WHEN (T1."STATUS" IN ('35','37','47','50')) THEN ('Rechnung') WHEN (T1."STATUS" IN ('36','39','49','51')) THEN ('Gutschrift') ELSE null END) LIKE '%Gutschrift%')) and ((day((getdate()) - T1."INVOICE_DATE")) <= 10))
 where (((T1."STATUS" IN ('35','37','39','47','49','50','51','36')) and ((CASE WHEN (T1."STATUS" IN ('35','37','47','50')) THEN ('Rechnung') WHEN (T1."STATUS" IN ('36','39','49','51')) THEN ('Gutschrift') ELSE null END) LIKE '%Gutschrift%')) and ((day((getdate()) - T1."INVOICE_DATE")) <= 10))
 GO
 GO
 SET QUOTED_IDENTIFIER OFF 
 SET QUOTED_IDENTIFIER OFF 
@@ -127,4 +127,4 @@ GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 1 - 1
System/OPTIMA/SQL/schema/OPTIMA/views/staging.auftraege_mont_spp_1340_benutzte_aw_imr.sql

@@ -34,4 +34,4 @@ GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 1 - 1
System/OPTIMA/SQL/schema/OPTIMA/views/staging.auftraege_mont_spp_1340_verk_aw_imr.sql

@@ -34,4 +34,4 @@ GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 13 - 15
System/OPTIMA/SQL/schema/OPTIMA/views/staging.auftraege_spp_split_csv_imr.sql

@@ -2,7 +2,7 @@ SET QUOTED_IDENTIFIER ON
 GO
 GO
 SET ANSI_NULLS ON 
 SET ANSI_NULLS ON 
 GO
 GO
-CREATE VIEW [staging].[auftraege_spp_split_csv_imr] AS
+CREATE VIEW staging.auftraege_spp_split_csv_imr AS
 
 
 select "Order Number_ori",
 select "Order Number_ori",
 	   "Register Number",
 	   "Register Number",
@@ -120,7 +120,7 @@ select "Order Number_ori",
 	   "Kostenstelle",
 	   "Kostenstelle",
 	   "Kundenart",
 	   "Kundenart",
 	   "Umsatzart",
 	   "Umsatzart",
-	   "Geschäftsart",
+	   "Geschäftsart",
 	   "Serviceberater",
 	   "Serviceberater",
 	   "Licence Id",
 	   "Licence Id",
 	   "Sel Name_Monteur" as "Monteur",
 	   "Sel Name_Monteur" as "Monteur",
@@ -170,7 +170,7 @@ select "Order Number_ori",
 	   "Rabatt Lohn",
 	   "Rabatt Lohn",
 	   "Preiscode",
 	   "Preiscode",
 	   "DG1",
 	   "DG1",
-	   COUNT("Status") OVER (partition by "Order Number_ori") as "Anzahl_Datensätze",
+	   COUNT("Status") OVER (partition by "Order Number_ori") as "Anzahl_Datensätze",
 	   ("DG1") / (COUNT("Status") OVER (partition by "Order Number_ori")) as "DG",
 	   ("DG1") / (COUNT("Status") OVER (partition by "Order Number_ori")) as "DG",
 	   "Order_Desc_100",
 	   "Order_Desc_100",
 	   "Order_Desc_30_alt",
 	   "Order_Desc_30_alt",
@@ -190,26 +190,24 @@ select "Order Number_ori",
 	   "Standort_Name",
 	   "Standort_Name",
 	   "Line Group Code"
 	   "Line Group Code"
 from 
 from 
-
 (select T1."ORDER_NUMBER" as "Order Number_ori",
 (select T1."ORDER_NUMBER" as "Order Number_ori",
 	   T3."LINE_GROUP_CODE" as "Line Group Code",
 	   T3."LINE_GROUP_CODE" as "Line Group Code",
 	   T14."Standort_Name" as "Standort_Name",
 	   T14."Standort_Name" as "Standort_Name",
 	   T14."Standort_ID" as "Standort_ID",
 	   T14."Standort_ID" as "Standort_ID",
 	   T14."Hauptbetrieb_Name" as "Hauptbetrieb_Name",
 	   T14."Hauptbetrieb_Name" as "Hauptbetrieb_Name",
 	   CASE WHEN (T14."Hauptbetrieb_ID" IS NULL) THEN ('1') ELSE (T14."Hauptbetrieb_ID") END as "Hauptbetrieb_ID",
 	   CASE WHEN (T14."Hauptbetrieb_ID" IS NULL) THEN ('1') ELSE (T14."Hauptbetrieb_ID") END as "Hauptbetrieb_ID",
-	   CASE WHEN (((day((getdate()) - T1."INVOICE_DATE")) <= 30) and (T3."ORDER_LINETYPE" = '4')) THEN ((rtrim((((T3."LINE_NUMBER"))))) + ' - ' + T3."REPAIR_CODE" + ' ' + (CASE WHEN (T3."REPAIR_NAME" LIKE '%;%') THEN ('ungültiger Repair Name') ELSE (T3."REPAIR_NAME") END)) WHEN (((day((getdate()) - T1."INVOICE_DATE")) <= 30) and (T3."ORDER_LINETYPE" <> '4')) THEN ((rtrim((((T3."LINE_NUMBER"))))) + ' - ' + T3."PROD_CODE" + ' ' + T3."PROD_NAME") ELSE ('Aufträge älter 30 Tage') END as "Auftragsposition",
-	   CASE WHEN ((day((getdate()) - T1."INVOICE_DATE")) <= 30) THEN ((CASE WHEN ((CASE WHEN ((T2."SEL_FAMILY_NAME" IS NULL) or (T2."SEL_FAMILY_NAME" = '                              ')) THEN (T1."SALESMAN" + ' - ' + T2."SEL_NAME") ELSE ((rtrim(T2."SEL_FAMILY_NAME")) + ', ' + T2."SEL_FIRST_NAME") END) IS NOT NULL) THEN ((left((((T1."ORDER_NUMBER"))),7)) + ' - ' + ((rtrim(T1."DELIVERY_ACCOUNT")) + ' - ' + T1."NAME") + ' - ' + (rtrim(T2."SEL_FAMILY_NAME"))) ELSE ((left((((T1."ORDER_NUMBER"))),7)) + ' - ' + ((rtrim(T1."DELIVERY_ACCOUNT")) + ' - ' + T1."NAME") + ' - ' + T1."SALESMAN") END)) ELSE ('Aufträge älter 30 Tage') END as "Order_Desc_30",
+	   CASE WHEN (((day((getdate()) - T1."INVOICE_DATE")) <= 30) and (T3."ORDER_LINETYPE" = '4')) THEN ((rtrim((((T3."LINE_NUMBER"))))) + ' - ' + T3."REPAIR_CODE" + ' ' + (CASE WHEN (T3."REPAIR_NAME" LIKE '%;%') THEN ('ungültiger Repair Name') ELSE (T3."REPAIR_NAME") END)) WHEN (((day((getdate()) - T1."INVOICE_DATE")) <= 30) and (T3."ORDER_LINETYPE" <> '4')) THEN ((rtrim((((T3."LINE_NUMBER"))))) + ' - ' + T3."PROD_CODE" + ' ' + T3."PROD_NAME") ELSE ('Aufträge älter 30 Tage') END as "Auftragsposition",
+	   CASE WHEN ((day((getdate()) - T1."INVOICE_DATE")) <= 30) THEN ((CASE WHEN ((CASE WHEN ((T2."SEL_FAMILY_NAME" IS NULL) or (T2."SEL_FAMILY_NAME" = '                              ')) THEN (T1."SALESMAN" + ' - ' + T2."SEL_NAME") ELSE ((rtrim(T2."SEL_FAMILY_NAME")) + ', ' + T2."SEL_FIRST_NAME") END) IS NOT NULL) THEN ((left((((T1."ORDER_NUMBER"))),7)) + ' - ' + ((rtrim(T1."DELIVERY_ACCOUNT")) + ' - ' + T1."NAME") + ' - ' + (rtrim(T2."SEL_FAMILY_NAME"))) ELSE ((left((((T1."ORDER_NUMBER"))),7)) + ' - ' + ((rtrim(T1."DELIVERY_ACCOUNT")) + ' - ' + T1."NAME") + ' - ' + T1."SALESMAN") END)) ELSE ('Aufträge älter 30 Tage') END as "Order_Desc_30",
 	   T1."ZIPCODE" as "Zipcode",
 	   T1."ZIPCODE" as "Zipcode",
 	   (left(T1."ZIPCODE",4)) as "PLZ_4_Stelle",
 	   (left(T1."ZIPCODE",4)) as "PLZ_4_Stelle",
 	   (left(T1."ZIPCODE",3)) as "PLZ_3_Stelle",
 	   (left(T1."ZIPCODE",3)) as "PLZ_3_Stelle",
 	   (left(T1."ZIPCODE",2)) as "PLZ_2_Stelle",
 	   (left(T1."ZIPCODE",2)) as "PLZ_2_Stelle",
 	   (left(T1."ZIPCODE",1)) as "PLZ_1_Stelle",
 	   (left(T1."ZIPCODE",1)) as "PLZ_1_Stelle",
 	   T8."REPAIR_GRP_SPECIFY" as "Repair Grp Specify",
 	   T8."REPAIR_GRP_SPECIFY" as "Repair Grp Specify",
-	   CASE WHEN ((day((getdate()) - T1."INVOICE_DATE")) <= 30) THEN ((CASE WHEN ((CASE WHEN ((T2."SEL_FAMILY_NAME" IS NULL) or (T2."SEL_FAMILY_NAME" = '                              ')) THEN (T1."SALESMAN" + ' - ' + T2."SEL_NAME") ELSE ((rtrim(T2."SEL_FAMILY_NAME")) + ', ' + T2."SEL_FIRST_NAME") END) IS NOT NULL) THEN ((left((((T1."INVOICE_NUMBER"))),7)) + ' - ' + ((rtrim(T1."DELIVERY_ACCOUNT")) + ' - ' + T1."NAME") + ' - ' + (rtrim(T2."SEL_FAMILY_NAME"))) ELSE ((left((((T1."INVOICE_NUMBER"))),7)) + ' - ' + ((rtrim(T1."DELIVERY_ACCOUNT")) + ' - ' + T1."NAME") + ' - ' + T1."SALESMAN") END)) ELSE ('Rechnungen älter 30 Tage') END as "Invoice_Desc_30",
+	   CASE WHEN ((day((getdate()) - T1."INVOICE_DATE")) <= 30) THEN ((CASE WHEN ((CASE WHEN ((T2."SEL_FAMILY_NAME" IS NULL) or (T2."SEL_FAMILY_NAME" = '                              ')) THEN (T1."SALESMAN" + ' - ' + T2."SEL_NAME") ELSE ((rtrim(T2."SEL_FAMILY_NAME")) + ', ' + T2."SEL_FIRST_NAME") END) IS NOT NULL) THEN ((left((((T1."INVOICE_NUMBER"))),7)) + ' - ' + ((rtrim(T1."DELIVERY_ACCOUNT")) + ' - ' + T1."NAME") + ' - ' + (rtrim(T2."SEL_FAMILY_NAME"))) ELSE ((left((((T1."INVOICE_NUMBER"))),7)) + ' - ' + ((rtrim(T1."DELIVERY_ACCOUNT")) + ' - ' + T1."NAME") + ' - ' + T1."SALESMAN") END)) ELSE ('Rechnungen älter 30 Tage') END as "Invoice_Desc_30",
 	   CASE WHEN ((CASE WHEN ((T2."SEL_FAMILY_NAME" IS NULL) or (T2."SEL_FAMILY_NAME" = '                              ')) THEN (T1."SALESMAN" + ' - ' + T2."SEL_NAME") ELSE ((rtrim(T2."SEL_FAMILY_NAME")) + ', ' + T2."SEL_FIRST_NAME") END) IS NOT NULL) THEN ((left((((T1."INVOICE_NUMBER"))),7)) + ' - ' + ((rtrim(T1."DELIVERY_ACCOUNT")) + ' - ' + T1."NAME") + ' - ' + (rtrim(T2."SEL_FAMILY_NAME"))) ELSE ((left((((T1."INVOICE_NUMBER"))),7)) + ' - ' + ((rtrim(T1."DELIVERY_ACCOUNT")) + ' - ' + T1."NAME") + ' - ' + T1."SALESMAN") END as "Invoice_Desc",
 	   CASE WHEN ((CASE WHEN ((T2."SEL_FAMILY_NAME" IS NULL) or (T2."SEL_FAMILY_NAME" = '                              ')) THEN (T1."SALESMAN" + ' - ' + T2."SEL_NAME") ELSE ((rtrim(T2."SEL_FAMILY_NAME")) + ', ' + T2."SEL_FIRST_NAME") END) IS NOT NULL) THEN ((left((((T1."INVOICE_NUMBER"))),7)) + ' - ' + ((rtrim(T1."DELIVERY_ACCOUNT")) + ' - ' + T1."NAME") + ' - ' + (rtrim(T2."SEL_FAMILY_NAME"))) ELSE ((left((((T1."INVOICE_NUMBER"))),7)) + ' - ' + ((rtrim(T1."DELIVERY_ACCOUNT")) + ' - ' + T1."NAME") + ' - ' + T1."SALESMAN") END as "Invoice_Desc",
-	   --CASE WHEN (((day((getdate()) - T1."INVOICE_DATE")) <= 30) and ((CASE WHEN ((T1."CUSTOMER_GROUP" = '00') and (T1."PMT_TERM" = 'IN')) THEN ('Intern') ELSE (T9."Zuordnung") END) <> 'Intern')) THEN ((((T1."ORDER_NUMBER")))) WHEN (((day((getdate()) - T1."INVOICE_DATE")) <= 30) and ((CASE WHEN ((T1."CUSTOMER_GROUP" = '00') and (T1."PMT_TERM" = 'IN')) THEN ('Intern') ELSE (T9."Zuordnung") END) = 'Intern')) THEN ('Intern') ELSE ('Aufträge älter 30 Tage') END as "Order_Desc_30_alt",
-	   '' as "Order_Desc_30_alt",
-	   CASE WHEN ((day((getdate()) - T1."INVOICE_DATE")) <= 100) THEN ((CASE WHEN ((CASE WHEN ((T2."SEL_FAMILY_NAME" IS NULL) or (T2."SEL_FAMILY_NAME" = '                              ')) THEN (T1."SALESMAN" + ' - ' + T2."SEL_NAME") ELSE ((rtrim(T2."SEL_FAMILY_NAME")) + ', ' + T2."SEL_FIRST_NAME") END) IS NOT NULL) THEN ((left((((T1."ORDER_NUMBER"))),7)) + ' - ' + ((rtrim(T1."DELIVERY_ACCOUNT")) + ' - ' + T1."NAME") + ' - ' + (rtrim(T2."SEL_FAMILY_NAME"))) ELSE ((left((((T1."ORDER_NUMBER"))),7)) + ' - ' + ((rtrim(T1."DELIVERY_ACCOUNT")) + ' - ' + T1."NAME") + ' - ' + T1."SALESMAN") END)) ELSE ('Aufträge älter 100 Tage') END as "Order_Desc_100",
+	   CASE WHEN (((day((getdate()) - T1."INVOICE_DATE")) <= 30) and ((CASE WHEN ((T1."CUSTOMER_GROUP" = '00') and (T1."PMT_TERM" = 'IN')) THEN ('Intern') ELSE (T9."Zuordnung") END) <> 'Intern')) THEN ((((T1."ORDER_NUMBER")))) WHEN (((day((getdate()) - T1."INVOICE_DATE")) <= 30) and ((CASE WHEN ((T1."CUSTOMER_GROUP" = '00') and (T1."PMT_TERM" = 'IN')) THEN ('Intern') ELSE (T9."Zuordnung") END) = 'Intern')) THEN ('Intern') ELSE ('Aufträge älter 30 Tage') END as "Order_Desc_30_alt",
+	   CASE WHEN ((day((getdate()) - T1."INVOICE_DATE")) <= 100) THEN ((CASE WHEN ((CASE WHEN ((T2."SEL_FAMILY_NAME" IS NULL) or (T2."SEL_FAMILY_NAME" = '                              ')) THEN (T1."SALESMAN" + ' - ' + T2."SEL_NAME") ELSE ((rtrim(T2."SEL_FAMILY_NAME")) + ', ' + T2."SEL_FIRST_NAME") END) IS NOT NULL) THEN ((left((((T1."ORDER_NUMBER"))),7)) + ' - ' + ((rtrim(T1."DELIVERY_ACCOUNT")) + ' - ' + T1."NAME") + ' - ' + (rtrim(T2."SEL_FAMILY_NAME"))) ELSE ((left((((T1."ORDER_NUMBER"))),7)) + ' - ' + ((rtrim(T1."DELIVERY_ACCOUNT")) + ' - ' + T1."NAME") + ' - ' + T1."SALESMAN") END)) ELSE ('Aufträge älter 100 Tage') END as "Order_Desc_100",
 	   CASE WHEN ((CASE WHEN (T1."STATUS" IN ('35','37','47','50')) THEN ('Rechnung') WHEN (T1."STATUS" IN ('36','39','49','51')) THEN ('Gutschrift') ELSE null END) = 'Gutschrift') THEN (-1) ELSE (1) END as "DG1",
 	   CASE WHEN ((CASE WHEN (T1."STATUS" IN ('35','37','47','50')) THEN ('Rechnung') WHEN (T1."STATUS" IN ('36','39','49','51')) THEN ('Gutschrift') ELSE null END) = 'Gutschrift') THEN (-1) ELSE (1) END as "DG1",
 	   (rtrim(T1."PRICE_CODE")) + ' - ' + (rtrim(T1."WORKSHOP_PRICECODE")) as "Preiscode",
 	   (rtrim(T1."PRICE_CODE")) + ' - ' + (rtrim(T1."WORKSHOP_PRICECODE")) as "Preiscode",
 	   CASE WHEN (T3."ORDER_LINETYPE" <> '1') THEN (T3."DISCOUNT") ELSE (0) END as "Rabatt Lohn",
 	   CASE WHEN (T3."ORDER_LINETYPE" <> '1') THEN (T3."DISCOUNT") ELSE (0) END as "Rabatt Lohn",
@@ -258,12 +256,12 @@ from
 	   T7."SEL_NAME" as "Sel Name_Monteur",
 	   T7."SEL_NAME" as "Sel Name_Monteur",
 	   T2."LICENCE_ID" as "Licence Id",
 	   T2."LICENCE_ID" as "Licence Id",
 	   CASE WHEN ((T2."SEL_FAMILY_NAME" IS NULL) or (T2."SEL_FAMILY_NAME" = '                              ')) THEN (T1."SALESMAN" + ' - ' + T2."SEL_NAME") ELSE ((rtrim(T2."SEL_FAMILY_NAME")) + ', ' + T2."SEL_FIRST_NAME") END as "Serviceberater",
 	   CASE WHEN ((T2."SEL_FAMILY_NAME" IS NULL) or (T2."SEL_FAMILY_NAME" = '                              ')) THEN (T1."SALESMAN" + ' - ' + T2."SEL_NAME") ELSE ((rtrim(T2."SEL_FAMILY_NAME")) + ', ' + T2."SEL_FIRST_NAME") END as "Serviceberater",
-	   T1."PMT_TERM" + ' - ' + (CASE WHEN (T2."SEL_NAME" IN ('Dietmar Brehmer','Ömer Cokbilir','Carsten Göbelt','Carsten Goebelt','Silke Liebe','Rene Schäfer','Thomas Kienbaum','Marcos Pazos Nieto','Michael Zeller','Thomas Barnebeck','Christian Libowski','Bünyamin Tanrikulu','Andre Biller','Felice Mastrandrea','Matthias Molter','Alexander Lappöhn','Sinan Cetin','Jeremias Perske','Andre Scheurich','Janek Van Der Lucht','Alexander Englert','Christian Hartig','Holger Conrad','Markus Gawlik','Ibrahim Küyner','Michael Christ','Manfred Peter','Christian Heim','Andreas Podlipny    ','Nadine Wierschin','Andreas Müller      ','Arsenio Rosso       ','Roberto Bombardieri','Christian Jung','Marcus Schwarz','Thomas Schulz','Michael Staudinger','Dennis Rapp','Gerhard Janetzko','Christian Agneskirchner','Nico Amend','Francesco Galoppo','Bernd Fahm','Hagen Borth','Frank Lieske','Matthias Ernst','Stefan Bohn','Guenter Lewold','Reinhard Zucker','Juergen Klug')) THEN ('Serviceberater') ELSE ('Sonstige') END) as "Geschäftsart",
+	   T1."PMT_TERM" + ' - ' + (CASE WHEN (T2."SEL_NAME" IN ('Dietmar Brehmer','Ömer Cokbilir','Carsten Göbelt','Carsten Goebelt','Silke Liebe','Rene Schäfer','Thomas Kienbaum','Marcos Pazos Nieto','Michael Zeller','Thomas Barnebeck','Christian Libowski','Bünyamin Tanrikulu','Andre Biller','Felice Mastrandrea','Matthias Molter','Alexander Lappöhn','Sinan Cetin','Jeremias Perske','Andre Scheurich','Janek Van Der Lucht','Alexander Englert','Christian Hartig','Holger Conrad','Markus Gawlik','Ibrahim Küyner','Michael Christ','Manfred Peter','Christian Heim','Andreas Podlipny    ','Nadine Wierschin','Andreas Müller      ','Arsenio Rosso       ','Roberto Bombardieri','Christian Jung','Marcus Schwarz','Thomas Schulz','Michael Staudinger','Dennis Rapp','Gerhard Janetzko','Christian Agneskirchner','Nico Amend','Francesco Galoppo','Bernd Fahm','Hagen Borth','Frank Lieske','Matthias Ernst','Stefan Bohn','Guenter Lewold','Reinhard Zucker','Juergen Klug')) THEN ('Serviceberater') ELSE ('Sonstige') END) as "Geschäftsart",
 	   CASE WHEN ((T1."CUSTOMER_GROUP" = '00') and (T1."PMT_TERM" = 'IN')) THEN ('Intern') ELSE (T9."Zuordnung") END as "Umsatzart",
 	   CASE WHEN ((T1."CUSTOMER_GROUP" = '00') and (T1."PMT_TERM" = 'IN')) THEN ('Intern') ELSE (T9."Zuordnung") END as "Umsatzart",
 	   T6."CUSTOMER_GROUP" + ' - ' + T6."CUST_GROUP_SPECIFY" as "Kundenart",
 	   T6."CUSTOMER_GROUP" + ' - ' + T6."CUST_GROUP_SPECIFY" as "Kundenart",
 	   T5."DEPARTMENT_TYPE_ID" + ' - ' + T5."DESCRIPTION" as "Kostenstelle",
 	   T5."DEPARTMENT_TYPE_ID" + ' - ' + T5."DESCRIPTION" as "Kostenstelle",
 	   (substring(T1."DEPARTMENT", 2, 1)) as "Marke",
 	   (substring(T1."DEPARTMENT", 2, 1)) as "Marke",
-	   left(T1."DEPARTMENT",2) as "Standort",
+	   CASE WHEN (((T1."INVOICE_DATE" <= convert(datetime, '2019-11-22 00:00:00.000')) and (T1."CLIENT_DB" = 'deop01')) and ((left(T1."DEPARTMENT",2)) = '11')) THEN ('111') ELSE ((left(T1."DEPARTMENT",2))) END as "Standort",
 	   T1."CLIENT_DB" as "Hauptbetrieb",
 	   T1."CLIENT_DB" as "Hauptbetrieb",
 	   T8."MAKE_CD" as "Make Cd",
 	   T8."MAKE_CD" as "Make Cd",
 	   T8."REPAIR_GROUP" as "Repair Group",
 	   T8."REPAIR_GROUP" as "Repair Group",
@@ -288,7 +286,7 @@ from
 	   T3."INV_TIME" as "Inv Time",
 	   T3."INV_TIME" as "Inv Time",
 	   T3."EST_TIME" as "Est Time",
 	   T3."EST_TIME" as "Est Time",
 	   T3."USED_TIME" as "Used Time",
 	   T3."USED_TIME" as "Used Time",
-	   CASE WHEN (T3."REPAIR_NAME" LIKE '%;%') THEN ('ungültiger Repair Name') ELSE (T3."REPAIR_NAME") END as "Repair Name",
+	   CASE WHEN (T3."REPAIR_NAME" LIKE '%;%') THEN ('ungültiger Repair Name') ELSE (T3."REPAIR_NAME") END as "Repair Name",
 	   T3."REPAIR_GROUP" as "Repair Group_2",
 	   T3."REPAIR_GROUP" as "Repair Group_2",
 	   T3."REPAIR_CODE" as "Repair Code",
 	   T3."REPAIR_CODE" as "Repair Code",
 	   T3."LINE_COSTS" as "Line Costs",
 	   T3."LINE_COSTS" as "Line Costs",
@@ -348,7 +346,7 @@ from
 	   T1."ORDERS_GROSSVALUE" as "Orders Grossvalue",
 	   T1."ORDERS_GROSSVALUE" as "Orders Grossvalue",
 	   T1."PURCH_TAX" as "Purch Tax",
 	   T1."PURCH_TAX" as "Purch Tax",
 	   T1."COSTS" as "Costs",
 	   T1."COSTS" as "Costs",
-	   CASE WHEN (T2."SEL_NAME" IN ('Dietmar Brehmer','Ömer Cokbilir','Carsten Göbelt','Carsten Goebelt','Silke Liebe','Rene Schäfer','Thomas Kienbaum','Marcos Pazos Nieto','Michael Zeller','Thomas Barnebeck','Christian Libowski','Bünyamin Tanrikulu','Andre Biller','Felice Mastrandrea','Matthias Molter','Alexander Lappöhn','Sinan Cetin','Jeremias Perske','Andre Scheurich','Janek Van Der Lucht','Alexander Englert','Christian Hartig','Holger Conrad','Markus Gawlik','Ibrahim Küyner','Michael Christ','Manfred Peter','Christian Heim','Andreas Podlipny    ','Nadine Wierschin','Andreas Müller      ','Arsenio Rosso       ','Roberto Bombardieri','Christian Jung','Marcus Schwarz','Thomas Schulz','Michael Staudinger','Dennis Rapp','Gerhard Janetzko','Christian Agneskirchner','Nico Amend','Francesco Galoppo','Bernd Fahm','Hagen Borth','Frank Lieske','Matthias Ernst','Stefan Bohn','Guenter Lewold','Reinhard Zucker','Juergen Klug')) THEN ('Serviceberater') ELSE ('Sonstige') END as "Payment Text",
+	   CASE WHEN (T2."SEL_NAME" IN ('Dietmar Brehmer','Ömer Cokbilir','Carsten Göbelt','Carsten Goebelt','Silke Liebe','Rene Schäfer','Thomas Kienbaum','Marcos Pazos Nieto','Michael Zeller','Thomas Barnebeck','Christian Libowski','Bünyamin Tanrikulu','Andre Biller','Felice Mastrandrea','Matthias Molter','Alexander Lappöhn','Sinan Cetin','Jeremias Perske','Andre Scheurich','Janek Van Der Lucht','Alexander Englert','Christian Hartig','Holger Conrad','Markus Gawlik','Ibrahim Küyner','Michael Christ','Manfred Peter','Christian Heim','Andreas Podlipny    ','Nadine Wierschin','Andreas Müller      ','Arsenio Rosso       ','Roberto Bombardieri','Christian Jung','Marcus Schwarz','Thomas Schulz','Michael Staudinger','Dennis Rapp','Gerhard Janetzko','Christian Agneskirchner','Nico Amend','Francesco Galoppo','Bernd Fahm','Hagen Borth','Frank Lieske','Matthias Ernst','Stefan Bohn','Guenter Lewold','Reinhard Zucker','Juergen Klug')) THEN ('Serviceberater') ELSE ('Sonstige') END as "Payment Text",
 	   T1."DUEDATE_1" as "Duedate 1",
 	   T1."DUEDATE_1" as "Duedate 1",
 	   T1."PMT_TERM" as "Pmt Term",
 	   T1."PMT_TERM" as "Pmt Term",
 	   T1."INVOICE_DATE" as "Invoice Date",
 	   T1."INVOICE_DATE" as "Invoice Date",
@@ -378,4 +376,4 @@ GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 1 - 1
System/OPTIMA/SQL/schema/OPTIMA/views/staging.bilanzbelege_o21_csv_imr.sql

@@ -84,4 +84,4 @@ GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 22 - 9
System/OPTIMA/SQL/schema/OPTIMA/views/staging.current_date_prognose_imr.sql

@@ -2,9 +2,23 @@ SET QUOTED_IDENTIFIER ON
 GO
 GO
 SET ANSI_NULLS ON 
 SET ANSI_NULLS ON 
 GO
 GO
-CREATE VIEW [staging].[current_date_prognose_imr] AS
+CREATE VIEW staging.current_date_prognose_imr AS
 
 
-select T1."bundeslaender_id" as "Bundeslaender Id",
+select "Bundeslaender Id" as "Bundeslaender Id",
+	   "Datum" as "Datum",
+	   "Wochentage Id" as "Wochentage Id",
+	   "Arbeitstag Mofr" as "Arbeitstag Mofr",
+	   "Zaehler Mofr" as "Zaehler Mofr",
+	   "Summe Mofr" as "Summe Mofr",
+	   "Arbeitstag Mosa" as "Arbeitstag Mosa",
+	   "Zaehler Mosa" as "Zaehler Mosa",
+	   "Summe Mosa" as "Summe Mosa",
+	   "Feiertage Id" as "Feiertage Id",
+	   "Jahr" as "Jahr",
+	   CASE WHEN ("Arbeitstag Mofr" = 1) THEN (RCOUNT("Arbeitstag Mofr")) ELSE null END as "Arbeitstag Nr Jahr",
+	   "Gesamt Arbeitstage" as "Gesamt Arbeitstage"
+from 
+(select T1."bundeslaender_id" as "Bundeslaender Id",
 	   T1."datum" as "Datum",
 	   T1."datum" as "Datum",
 	   T1."wochentage_id" as "Wochentage Id",
 	   T1."wochentage_id" as "Wochentage Id",
 	   T1."arbeitstag_mofr" as "Arbeitstag Mofr",
 	   T1."arbeitstag_mofr" as "Arbeitstag Mofr",
@@ -14,17 +28,16 @@ select T1."bundeslaender_id" as "Bundeslaender Id",
 	   T1."zaehler_mosa" as "Zaehler Mosa",
 	   T1."zaehler_mosa" as "Zaehler Mosa",
 	   T1."summe_mosa" as "Summe Mosa",
 	   T1."summe_mosa" as "Summe Mosa",
 	   T1."feiertage_id" as "Feiertage Id",
 	   T1."feiertage_id" as "Feiertage Id",
-	   (getdate()) - 1 as "Jahr",
-	   case when T1."arbeitstag_mofr" = '1' then T1."zaehler_jahr_mofr" else 0 end as "Arbeitstag Nr Jahr",
-	   T1."summe_jahr_mofr" as "Gesamt Arbeitstage"
-
-from "OPTIMA"."data"."Arbeitstage" T1
-where ((((((T1."bundeslaender_id" = '7') and (T1."arbeitstag_mofr" = 1)) and ((year(T1."datum")) = (year(((getdate()) - 1))))) and (T1."datum" <= ((getdate()) - 1))) and (T1."datum" <= ((getdate()) - 1))) or ((((T1."bundeslaender_id" = '7') and ((year(T1."datum")) = (year(((getdate()) - 1))))) and (T1."datum" <= ((getdate()) - 1))) and (T1."datum" IN (convert(datetime, '2019-01-01 00:00:00.000'),convert(datetime, '2020-01-01 00:00:00.000'),convert(datetime, '2021-01-01 00:00:00.000'),convert(datetime, '2022-01-01 00:00:00.000'),convert(datetime, '2023-01-01 00:00:00.000')))))
+	   (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" = '7') and (T1."arbeitstag_mofr" = 1)) and ((year(T1."datum")) = (year(((getdate()) - INTERVAL '001 00:00:00.000'))))) and (T1."datum" <= ((getdate()) - INTERVAL '001 00:00:00.000'))) and (T1."datum" <= ((getdate()) - INTERVAL '001 00:00:00.000'))) or ((((T1."bundeslaender_id" = '7') and ((year(T1."datum")) = (year(((getdate()) - INTERVAL '001 00:00:00.000'))))) and (T1."datum" <= ((getdate()) - INTERVAL '001 00:00:00.000'))) and (T1."datum" IN (convert(datetime, '2019-01-01 00:00:00.000'),convert(datetime, '2020-01-01 00:00:00.000'),convert(datetime, '2021-01-01 00:00:00.000'),convert(datetime, '2022-01-01 00:00:00.000'),convert(datetime, '2023-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
 -- 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
 GO
 SET QUOTED_IDENTIFIER OFF 
 SET QUOTED_IDENTIFIER OFF 
 GO
 GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 22 - 8
System/OPTIMA/SQL/schema/OPTIMA/views/staging.current_date_prognose_jeder_tag_imr.sql

@@ -2,9 +2,23 @@ SET QUOTED_IDENTIFIER ON
 GO
 GO
 SET ANSI_NULLS ON 
 SET ANSI_NULLS ON 
 GO
 GO
-CREATE VIEW [staging].[current_date_prognose_jeder_tag_imr] AS
+CREATE VIEW staging.current_date_prognose_jeder_tag_imr AS
 
 
-select T1."bundeslaender_id" as "Bundeslaender Id",
+select "Bundeslaender Id" as "Bundeslaender Id",
+	   "Datum" as "Datum",
+	   "Wochentage Id" as "Wochentage Id",
+	   "Arbeitstag Mofr" as "Arbeitstag Mofr",
+	   "Zaehler Mofr" as "Zaehler Mofr",
+	   "Summe Mofr" as "Summe Mofr",
+	   "Arbeitstag Mosa" as "Arbeitstag Mosa",
+	   "Zaehler Mosa" as "Zaehler Mosa",
+	   "Summe Mosa" as "Summe Mosa",
+	   "Feiertage Id" as "Feiertage Id",
+	   "Jahr" as "Jahr",
+	   CASE WHEN ("Arbeitstag Mofr" = 1) THEN (RCOUNT("Arbeitstag Mofr")) ELSE null END as "Arbeitstag Nr Jahr",
+	   "Gesamt Arbeitstage" as "Gesamt Arbeitstage"
+from 
+(select T1."bundeslaender_id" as "Bundeslaender Id",
 	   T1."datum" as "Datum",
 	   T1."datum" as "Datum",
 	   T1."wochentage_id" as "Wochentage Id",
 	   T1."wochentage_id" as "Wochentage Id",
 	   T1."arbeitstag_mofr" as "Arbeitstag Mofr",
 	   T1."arbeitstag_mofr" as "Arbeitstag Mofr",
@@ -14,16 +28,16 @@ select T1."bundeslaender_id" as "Bundeslaender Id",
 	   T1."zaehler_mosa" as "Zaehler Mosa",
 	   T1."zaehler_mosa" as "Zaehler Mosa",
 	   T1."summe_mosa" as "Summe Mosa",
 	   T1."summe_mosa" as "Summe Mosa",
 	   T1."feiertage_id" as "Feiertage Id",
 	   T1."feiertage_id" as "Feiertage Id",
-	   (getdate()) - 0 as "Jahr",
-	   case when T1."arbeitstag_mofr" = '1' then T1."zaehler_jahr_mofr" else 0 end as "Arbeitstag Nr Jahr",
-	   T1."summe_jahr_mofr" as "Gesamt Arbeitstage"
-from "OPTIMA"."data"."Arbeitstage" T1
-where (((((T1."bundeslaender_id" = '7') and ((year(T1."datum")) = (year(((getdate()) - 0))))) and (T1."datum" <= ((getdate()) - 0))) and (T1."datum" <= ((getdate()) - 0))) or ((((T1."bundeslaender_id" = '7') and ((year(T1."datum")) = (year(((getdate()) - 0))))) and (T1."datum" <= ((getdate()) - 0))) and (T1."datum" IN (convert(datetime, '2019-01-01 00:00:00.000'),convert(datetime, '2020-01-01 00:00:00.000'),convert(datetime, '2021-01-01 00:00:00.000'),convert(datetime, '2022-01-01 00:00:00.000'),convert(datetime, '2023-01-01 00:00:00.000')))))
+	   (getdate()) - INTERVAL '000 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" = '7') and ((year(T1."datum")) = (year(((getdate()) - INTERVAL '000 00:00:00.000'))))) and (T1."datum" <= ((getdate()) - INTERVAL '000 00:00:00.000'))) and (T1."datum" <= ((getdate()) - INTERVAL '000 00:00:00.000'))) or ((((T1."bundeslaender_id" = '7') and ((year(T1."datum")) = (year(((getdate()) - INTERVAL '000 00:00:00.000'))))) and (T1."datum" <= ((getdate()) - INTERVAL '000 00:00:00.000'))) and (T1."datum" IN (convert(datetime, '2019-01-01 00:00:00.000'),convert(datetime, '2020-01-01 00:00:00.000'),convert(datetime, '2021-01-01 00:00:00.000'),convert(datetime, '2022-01-01 00:00:00.000'),convert(datetime, '2023-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
 -- 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
 GO
 SET QUOTED_IDENTIFIER OFF 
 SET QUOTED_IDENTIFIER OFF 
 GO
 GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 22 - 8
System/OPTIMA/SQL/schema/OPTIMA/views/staging.current_date_prognose_vj_imr.sql

@@ -2,9 +2,23 @@ SET QUOTED_IDENTIFIER ON
 GO
 GO
 SET ANSI_NULLS ON 
 SET ANSI_NULLS ON 
 GO
 GO
-CREATE VIEW [staging].[current_date_prognose_vj_imr] AS
+CREATE VIEW staging.current_date_prognose_vj_imr AS
 
 
-select T1."bundeslaender_id" as "Bundeslaender Id",
+select "Bundeslaender Id" as "Bundeslaender Id",
+	   "Datum" as "Datum",
+	   "Wochentage Id" as "Wochentage Id",
+	   "Arbeitstag Mofr" as "Arbeitstag Mofr",
+	   "Zaehler Mofr" as "Zaehler Mofr",
+	   "Summe Mofr" as "Summe Mofr",
+	   "Arbeitstag Mosa" as "Arbeitstag Mosa",
+	   "Zaehler Mosa" as "Zaehler Mosa",
+	   "Summe Mosa" as "Summe Mosa",
+	   "Feiertage Id" as "Feiertage Id",
+	   "Jahr" as "Jahr",
+	   CASE WHEN ("Arbeitstag Mofr" = 1) THEN (RCOUNT("Arbeitstag Mofr")) ELSE null END as "Arbeitstag Nr Jahr",
+	   "Gesamt Arbeitstage" as "Gesamt Arbeitstage"
+from 
+(select T1."bundeslaender_id" as "Bundeslaender Id",
 	   T1."datum" as "Datum",
 	   T1."datum" as "Datum",
 	   T1."wochentage_id" as "Wochentage Id",
 	   T1."wochentage_id" as "Wochentage Id",
 	   T1."arbeitstag_mofr" as "Arbeitstag Mofr",
 	   T1."arbeitstag_mofr" as "Arbeitstag Mofr",
@@ -14,16 +28,16 @@ select T1."bundeslaender_id" as "Bundeslaender Id",
 	   T1."zaehler_mosa" as "Zaehler Mosa",
 	   T1."zaehler_mosa" as "Zaehler Mosa",
 	   T1."summe_mosa" as "Summe Mosa",
 	   T1."summe_mosa" as "Summe Mosa",
 	   T1."feiertage_id" as "Feiertage Id",
 	   T1."feiertage_id" as "Feiertage Id",
-	   (getdate()) - 365 as "Jahr",
-	   case when T1."arbeitstag_mofr" = '1' then T1."zaehler_jahr_mofr" else 0 end as "Arbeitstag Nr Jahr",
-	   T1."summe_jahr_mofr" as "Gesamt Arbeitstage"
-from "OPTIMA"."data"."Arbeitstage" T1
-where ((((T1."bundeslaender_id" = '7') and (T1."arbeitstag_mofr" = 1)) and ((year(T1."datum")) = (year(((getdate()) - 365))))) or ((((T1."bundeslaender_id" = '7') and ((year(T1."datum")) = (year(((getdate()) - 365))))) and (T1."datum" <= ((getdate()) - 365))) and (T1."datum" IN (convert(datetime, '2019-01-01 00:00:00.000'),convert(datetime, '2020-01-01 00:00:00.000'),convert(datetime, '2021-01-01 00:00:00.000'),convert(datetime, '2022-01-01 00:00:00.000'),convert(datetime, '2023-01-01 00:00:00.000')))))
+	   (getdate()) - INTERVAL '365 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" = '7') and (T1."arbeitstag_mofr" = 1)) and ((year(T1."datum")) = (year(((getdate()) - INTERVAL '365 00:00:00.000'))))) or ((((T1."bundeslaender_id" = '7') and ((year(T1."datum")) = (year(((getdate()) - INTERVAL '365 00:00:00.000'))))) and (T1."datum" <= ((getdate()) - INTERVAL '365 00:00:00.000'))) and (T1."datum" IN (convert(datetime, '2019-01-01 00:00:00.000'),convert(datetime, '2020-01-01 00:00:00.000'),convert(datetime, '2021-01-01 00:00:00.000'),convert(datetime, '2022-01-01 00:00:00.000'),convert(datetime, '2023-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
 -- 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
 GO
 SET QUOTED_IDENTIFIER OFF 
 SET QUOTED_IDENTIFIER OFF 
 GO
 GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 8 - 9
System/OPTIMA/SQL/schema/OPTIMA/views/staging.fokus_auftraege_spp_split_csv_imr.sql


+ 2 - 2
System/OPTIMA/SQL/schema/OPTIMA/views/staging.guv_8_o21_csv_imr.sql

@@ -58,7 +58,7 @@ select T1."ACCT_NR" as "Acct Nr",
 	   T2."DEBIT_AMOUNT" + T2."CREDIT_AMOUNT" as "Betrag",
 	   T2."DEBIT_AMOUNT" + T2."CREDIT_AMOUNT" as "Betrag",
 	   (db_name()) as "Mandant",
 	   (db_name()) as "Mandant",
 	   CASE WHEN (((T2."AA_TRTYPE" = 5104) and (T6."LINE_GROUP_CODE" = '150')) and (((left(T3."COMMENT",4))) <> 'A  7')) THEN (T6."EST_TIME_INT") WHEN ((T2."AA_TRTYPE" = 5104) and (((left(T3."COMMENT",4))) <> 'A  7')) THEN (T6."INV_TIME_INT") WHEN (T1."ACCT_NR" IN ('81700','81701','81720','83107','84700','82700','82701','82705')) THEN (0) ELSE (T2."DEBIT_QUANTITY" + T2."CREDIT_QUANTITY") END as "Menge",
 	   CASE WHEN (((T2."AA_TRTYPE" = 5104) and (T6."LINE_GROUP_CODE" = '150')) and (((left(T3."COMMENT",4))) <> 'A  7')) THEN (T6."EST_TIME_INT") WHEN ((T2."AA_TRTYPE" = 5104) and (((left(T3."COMMENT",4))) <> 'A  7')) THEN (T6."INV_TIME_INT") WHEN (T1."ACCT_NR" IN ('81700','81701','81720','83107','84700','82700','82701','82705')) THEN (0) ELSE (T2."DEBIT_QUANTITY" + T2."CREDIT_QUANTITY") END as "Menge",
-	   CASE WHEN ((day((getdate()) - T2."BOOKKEEP_DATE")) <= 90) THEN ((left((((T2."DOCUMENT_NO"))),7)) + ' - ' + T3."COMMENT") ELSE ('Summe Belege älter 90 Tage') END as "Text",
+	   CASE WHEN ((day((getdate()) - T2."BOOKKEEP_DATE")) <= 90) THEN ((left((((T2."DOCUMENT_NO"))),7)) + ' - ' + T3."COMMENT") ELSE ('Summe Belege älter 90 Tage') END as "Text",
 	   (left(T1."ACCT_NR",1)) as "Susa",
 	   (left(T1."ACCT_NR",1)) as "Susa",
 	   T6."ORDER_NUMBER" as "Order Number",
 	   T6."ORDER_NUMBER" as "Order Number",
 	   T6."LINE_NUMBER" as "Line Number",
 	   T6."LINE_NUMBER" as "Line Number",
@@ -86,4 +86,4 @@ GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 2 - 2
System/OPTIMA/SQL/schema/OPTIMA/views/staging.guv_8_o21_csv_umsatz_belege_imr.sql

@@ -58,7 +58,7 @@ select T1."ACCT_NR" as "Acct Nr_Umsatz",
 	   T2."DEBIT_AMOUNT" + T2."CREDIT_AMOUNT" as "Betrag_",
 	   T2."DEBIT_AMOUNT" + T2."CREDIT_AMOUNT" as "Betrag_",
 	   (db_name()) as "Mandant",
 	   (db_name()) as "Mandant",
 	   T2."DEBIT_QUANTITY" + T2."CREDIT_QUANTITY" as "Menge",
 	   T2."DEBIT_QUANTITY" + T2."CREDIT_QUANTITY" as "Menge",
-	   CASE WHEN ((day((getdate()) - T2."BOOKKEEP_DATE")) <= 90) THEN ((left((((T2."DOCUMENT_NO"))),7)) + ' - ' + T3."COMMENT") ELSE ('Summe Belege älter 90 Tage') END as "Text",
+	   CASE WHEN ((day((getdate()) - T2."BOOKKEEP_DATE")) <= 90) THEN ((left((((T2."DOCUMENT_NO"))),7)) + ' - ' + T3."COMMENT") ELSE ('Summe Belege älter 90 Tage') END as "Text",
 	   (left(T1."ACCT_NR",1)) as "Susa",
 	   (left(T1."ACCT_NR",1)) as "Susa",
 	   T6."ORDER_NUMBER" as "Order Number",
 	   T6."ORDER_NUMBER" as "Order Number",
 	   T6."LINE_NUMBER" as "Line Number",
 	   T6."LINE_NUMBER" as "Line Number",
@@ -89,4 +89,4 @@ GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 2 - 2
System/OPTIMA/SQL/schema/OPTIMA/views/staging.guv_8_o21_stk_csv_imr.sql

@@ -57,7 +57,7 @@ select T1."ACCT_NR" as "Acct Nr_ori",
 	   CASE WHEN ((T1."ACCT_NR" LIKE '9%') and (T2."DEPARTMENT" = '')) THEN ('1') ELSE ((substring(T4."DEPARTMENT_TYPE_ID", 3, 1))) END as "Marke_ori_alt",
 	   CASE WHEN ((T1."ACCT_NR" LIKE '9%') and (T2."DEPARTMENT" = '')) THEN ('1') ELSE ((substring(T4."DEPARTMENT_TYPE_ID", 3, 1))) END as "Marke_ori_alt",
 	   (db_name()) as "Mandant",
 	   (db_name()) as "Mandant",
 	   CASE WHEN (((T2."AA_TRTYPE" = 5104) and (T6."LINE_GROUP_CODE" = '150')) and (((left(T3."COMMENT",4))) <> 'A  7')) THEN (T6."EST_TIME_INT") WHEN ((T2."AA_TRTYPE" = 5104) and (((left(T3."COMMENT",4))) <> 'A  7')) THEN (T6."INV_TIME_INT") WHEN (T1."ACCT_NR" IN ('81700','81701','81720','83107','84700')) THEN (0) ELSE (T2."DEBIT_QUANTITY" + T2."CREDIT_QUANTITY") END as "Betrag",
 	   CASE WHEN (((T2."AA_TRTYPE" = 5104) and (T6."LINE_GROUP_CODE" = '150')) and (((left(T3."COMMENT",4))) <> 'A  7')) THEN (T6."EST_TIME_INT") WHEN ((T2."AA_TRTYPE" = 5104) and (((left(T3."COMMENT",4))) <> 'A  7')) THEN (T6."INV_TIME_INT") WHEN (T1."ACCT_NR" IN ('81700','81701','81720','83107','84700')) THEN (0) ELSE (T2."DEBIT_QUANTITY" + T2."CREDIT_QUANTITY") END as "Betrag",
-	   CASE WHEN ((day((getdate()) - T2."BOOKKEEP_DATE")) <= 90) THEN ((left((((T2."DOCUMENT_NO"))),7)) + ' - ' + T3."COMMENT") ELSE ('Summe Belege älter 90 Tage') END as "Text",
+	   CASE WHEN ((day((getdate()) - T2."BOOKKEEP_DATE")) <= 90) THEN ((left((((T2."DOCUMENT_NO"))),7)) + ' - ' + T3."COMMENT") ELSE ('Summe Belege älter 90 Tage') END as "Text",
 	   (left(T1."ACCT_NR",5)) + '_STK' as "Acct Nr",
 	   (left(T1."ACCT_NR",5)) + '_STK' as "Acct Nr",
 	   'STK' as "Susa",
 	   'STK' as "Susa",
 	   T6."ORDER_NUMBER" as "Order Number",
 	   T6."ORDER_NUMBER" as "Order Number",
@@ -93,4 +93,4 @@ GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 12 - 12
System/OPTIMA/SQL/schema/OPTIMA/views/staging.gw_be_vorlauf_imr.sql

@@ -249,10 +249,10 @@ select "Unit Number" as "Unit Number",
 	   "Model" as "Model",
 	   "Model" as "Model",
 	   "Fahrzeugtyp_1" as "Fahrzeugtyp_1",
 	   "Fahrzeugtyp_1" as "Fahrzeugtyp_1",
 	   "Standort_1" as "Standort_1",
 	   "Standort_1" as "Standort_1",
-	   "Lieferant/Einkäufer" as "Lieferant/Einkäufer",
+	   "Lieferant/Einkäufer" as "Lieferant/Einkäufer",
 	   "Name_Lieferant" as "Name_Lieferant",
 	   "Name_Lieferant" as "Name_Lieferant",
-	   "Name_Einkäufer" as "Name_Einkäufer",
-	   "FZG_Einkäufer" as "FZG_Einkäufer",
+	   "Name_Einkäufer" as "Name_Einkäufer",
+	   "FZG_Einkäufer" as "FZG_Einkäufer",
 	   "EZ" as "EZ",
 	   "EZ" as "EZ",
 	   "Km-stand" as "Km-stand",
 	   "Km-stand" as "Km-stand",
 	   "Plan VK Netz brutto" as "Plan VK Netz brutto",
 	   "Plan VK Netz brutto" as "Plan VK Netz brutto",
@@ -510,10 +510,10 @@ from
 	   "Model Text_2" as "Model",
 	   "Model Text_2" as "Model",
 	   '' as "Fahrzeugtyp_1",
 	   '' as "Fahrzeugtyp_1",
 	   "Location Code" as "Standort_1",
 	   "Location Code" as "Standort_1",
-	   "Lieferant/Einkäufer",
+	   "Lieferant/Einkäufer",
 	   "Name_Lieferant",
 	   "Name_Lieferant",
-	   "Name_Einkäufer",
-	   "FZG_Einkäufer",
+	   "Name_Einkäufer",
+	   "FZG_Einkäufer",
 	   "EZ",
 	   "EZ",
 	   "Mileage_2" as "Km-stand",
 	   "Mileage_2" as "Km-stand",
 	   0 as "Plan VK Netz brutto",
 	   0 as "Plan VK Netz brutto",
@@ -530,7 +530,7 @@ from
 from 
 from 
 (select T1."UNIT_NUMBER" as "Unit Number",
 (select T1."UNIT_NUMBER" as "Unit Number",
 	   T1."PURCH_PRICE_UNIT" as "Purch Price Unit",
 	   T1."PURCH_PRICE_UNIT" as "Purch Price Unit",
-	   CASE WHEN (T1."BOOK_KEEPING_CODE" IN ('RE300','RZ300')) THEN ('GW aus EI Hdl. reg.') WHEN (T1."BOOK_KEEPING_CODE" = 'DE300') THEN ('GW aus EI Hdl. §25a') ELSE ((CASE WHEN (T2."VEHICLE_TYPE" IS NULL) THEN (T1."VEHICLE_TYPE") ELSE (T2."VEHICLE_TYPE" + ' - ' + T2."VEHICLE_TYPE_TEXT") END)) END as "Fahrzeugtyp",
+	   CASE WHEN (T1."BOOK_KEEPING_CODE" IN ('RE300','RZ300')) THEN ('GW aus EI Hdl. reg.') WHEN (T1."BOOK_KEEPING_CODE" = 'DE300') THEN ('GW aus EI Hdl. §25a') ELSE ((CASE WHEN (T2."VEHICLE_TYPE" IS NULL) THEN (T1."VEHICLE_TYPE") ELSE (T2."VEHICLE_TYPE" + ' - ' + T2."VEHICLE_TYPE_TEXT") END)) END as "Fahrzeugtyp",
 	   CASE WHEN (T1."ECC_STATUS" IN ('21','41')) THEN ('Lager') WHEN (T1."ECC_STATUS" IN ('25','44')) THEN ('verkauft') ELSE null END as "Lager / verkauft",
 	   CASE WHEN (T1."ECC_STATUS" IN ('21','41')) THEN ('Lager') WHEN (T1."ECC_STATUS" IN ('25','44')) THEN ('verkauft') ELSE null END as "Lager / verkauft",
 	   CASE WHEN (T1."ECC_STATUS" LIKE '2%') THEN ('Vorlauf') WHEN (T1."ECC_STATUS" LIKE '4%') THEN ('Bestand') ELSE null END as "Status",
 	   CASE WHEN (T1."ECC_STATUS" LIKE '2%') THEN ('Vorlauf') WHEN (T1."ECC_STATUS" LIKE '4%') THEN ('Bestand') ELSE null END as "Status",
 	   CASE WHEN (T3."MODEL_TEXT" IS NOT NULL) THEN ((rtrim(T3."MODEL_TEXT")) + ' - ' + T1."UNIT_NUMBER") ELSE (T1."UNIT_NUMBER") END as "FZG_Bestand_Dashboard",
 	   CASE WHEN (T3."MODEL_TEXT" IS NOT NULL) THEN ((rtrim(T3."MODEL_TEXT")) + ' - ' + T1."UNIT_NUMBER") ELSE (T1."UNIT_NUMBER") END as "FZG_Bestand_Dashboard",
@@ -538,10 +538,10 @@ from
 	   T1."BUD_SALE_DET" as "Bud Sale Det",
 	   T1."BUD_SALE_DET" as "Bud Sale Det",
 	   T1."MILEAGE" as "Mileage_2",
 	   T1."MILEAGE" as "Mileage_2",
 	   (convert(varchar(50), year(T3."FIRST_REG_DATE")) + '-' + convert(varchar(50), month(T3."FIRST_REG_DATE")) + '-' + convert(varchar(50), day(T3."FIRST_REG_DATE"))) as "EZ",
 	   (convert(varchar(50), year(T3."FIRST_REG_DATE")) + '-' + convert(varchar(50), month(T3."FIRST_REG_DATE")) + '-' + convert(varchar(50), day(T3."FIRST_REG_DATE"))) as "EZ",
-	   (rtrim(T1."UNIT_NUMBER")) + ' - ' + (CASE WHEN (T8."SEL_NAME" IS NOT NULL) THEN (T8."SEL_NAME") ELSE (' - ') END) as "FZG_Einkäufer",
-	   CASE WHEN (T8."SEL_NAME" IS NOT NULL) THEN (T8."SEL_NAME") ELSE (' - ') END as "Name_Einkäufer",
+	   (rtrim(T1."UNIT_NUMBER")) + ' - ' + (CASE WHEN (T8."SEL_NAME" IS NOT NULL) THEN (T8."SEL_NAME") ELSE (' - ') END) as "FZG_Einkäufer",
+	   CASE WHEN (T8."SEL_NAME" IS NOT NULL) THEN (T8."SEL_NAME") ELSE (' - ') END as "Name_Einkäufer",
 	   CASE WHEN ((T1."PREV_OWNER" IS NULL) or (T1."PREV_OWNER" = ' ')) THEN (' - ') ELSE ((left(T1."PREV_OWNER",30))) END as "Name_Lieferant",
 	   CASE WHEN ((T1."PREV_OWNER" IS NULL) or (T1."PREV_OWNER" = ' ')) THEN (' - ') ELSE ((left(T1."PREV_OWNER",30))) END as "Name_Lieferant",
-	   (rtrim((CASE WHEN ((T1."PREV_OWNER" IS NULL) or (T1."PREV_OWNER" = ' ')) THEN (' - ') ELSE ((left(T1."PREV_OWNER",30))) END))) + ' / ' + (CASE WHEN (T8."SEL_NAME" IS NOT NULL) THEN (T8."SEL_NAME") ELSE (' - ') END) as "Lieferant/Einkäufer",
+	   (rtrim((CASE WHEN ((T1."PREV_OWNER" IS NULL) or (T1."PREV_OWNER" = ' ')) THEN (' - ') ELSE ((left(T1."PREV_OWNER",30))) END))) + ' / ' + (CASE WHEN (T8."SEL_NAME" IS NOT NULL) THEN (T8."SEL_NAME") ELSE (' - ') END) as "Lieferant/Einkäufer",
 	   T1."LOCATION_CODE" as "Location Code",
 	   T1."LOCATION_CODE" as "Location Code",
 	   T3."MODEL_TEXT" as "Model Text_2",
 	   T3."MODEL_TEXT" as "Model Text_2",
 	   T4."MOD_LIN_SPECIFY" as "Mod Lin Specify",
 	   T4."MOD_LIN_SPECIFY" as "Mod Lin Specify",
@@ -568,7 +568,7 @@ from
 	   T7."DESCRIPTION" as "Fabrikat_ori",
 	   T7."DESCRIPTION" as "Fabrikat_ori",
 	   T7."GLOBAL_MAKE_CD" as "Global Make Cd",
 	   T7."GLOBAL_MAKE_CD" as "Global Make Cd",
 	   CASE WHEN (T2."VEHICLE_TYPE" IS NULL) THEN (T1."VEHICLE_TYPE") ELSE (T2."VEHICLE_TYPE" + ' - ' + T2."VEHICLE_TYPE_TEXT") END as "Fahrzeugtyp_alt",
 	   CASE WHEN (T2."VEHICLE_TYPE" IS NULL) THEN (T1."VEHICLE_TYPE") ELSE (T2."VEHICLE_TYPE" + ' - ' + T2."VEHICLE_TYPE_TEXT") END as "Fahrzeugtyp_alt",
-	   (rtrim(T1."UNIT_NUMBER")) + ' - ' + T3."CHASSIS_NUMBER" + ' - ' + (rtrim((CASE WHEN (T1."BOOK_KEEPING_CODE" IN ('RE300','RZ300')) THEN ('GW aus EI Hdl. reg.') WHEN (T1."BOOK_KEEPING_CODE" = 'DE300') THEN ('GW aus EI Hdl. §25a') ELSE ((CASE WHEN (T2."VEHICLE_TYPE" IS NULL) THEN (T1."VEHICLE_TYPE") ELSE (T2."VEHICLE_TYPE" + ' - ' + T2."VEHICLE_TYPE_TEXT") END)) END))) + ' - ' + T1."ECC_STATUS" as "FZG",
+	   (rtrim(T1."UNIT_NUMBER")) + ' - ' + T3."CHASSIS_NUMBER" + ' - ' + (rtrim((CASE WHEN (T1."BOOK_KEEPING_CODE" IN ('RE300','RZ300')) THEN ('GW aus EI Hdl. reg.') WHEN (T1."BOOK_KEEPING_CODE" = 'DE300') THEN ('GW aus EI Hdl. §25a') ELSE ((CASE WHEN (T2."VEHICLE_TYPE" IS NULL) THEN (T1."VEHICLE_TYPE") ELSE (T2."VEHICLE_TYPE" + ' - ' + T2."VEHICLE_TYPE_TEXT") END)) END))) + ' - ' + T1."ECC_STATUS" as "FZG",
 	   T3."COLOUR_CODE" + ' - ' + T3."COLOUR_CF" as "Farbe",
 	   T3."COLOUR_CODE" + ' - ' + T3."COLOUR_CF" as "Farbe",
 	   T3."CHASSIS_NUMBER" as "Chassis Number",
 	   T3."CHASSIS_NUMBER" as "Chassis Number",
 	   CASE WHEN (T2."VEHICLE_TYPE" IN ('M','N','T','V','B')) THEN ('Neuwagen') WHEN (T2."VEHICLE_TYPE" IN ('D','G','K','R')) THEN ('Gebrauchtwagen') ELSE null END as "Fahrzeugart",
 	   CASE WHEN (T2."VEHICLE_TYPE" IN ('M','N','T','V','B')) THEN ('Neuwagen') WHEN (T2."VEHICLE_TYPE" IN ('D','G','K','R')) THEN ('Gebrauchtwagen') ELSE null END as "Fahrzeugart",
@@ -780,4 +780,4 @@ GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 10 - 10
System/OPTIMA/SQL/schema/OPTIMA/views/staging.monteur_neu_zeiterf_neu_imr.sql

@@ -55,8 +55,8 @@ select "Unique Ident" as "Unique Ident",
 	   "Urlaub" as "Urlaub",
 	   "Urlaub" as "Urlaub",
 	   "Sonderurlaub" as "Sonderurlaub",
 	   "Sonderurlaub" as "Sonderurlaub",
 	   "Feiertag" as "Feiertag",
 	   "Feiertag" as "Feiertag",
-	   "zu spät" as "zu spät",
-	   "Überstunden" as "Überstunden",
+	   "zu spät" as "zu spät",
+	   "Überstunden" as "Überstunden",
 	   "Order Number_Auftrag" as "Order Number_Auftrag",
 	   "Order Number_Auftrag" as "Order Number_Auftrag",
 	   "Customer Group" as "Customer Group",
 	   "Customer Group" as "Customer Group",
 	   "Umsatzart" as "Umsatzart",
 	   "Umsatzart" as "Umsatzart",
@@ -64,9 +64,9 @@ select "Unique Ident" as "Unique Ident",
 	   "GWL" as "GWL",
 	   "GWL" as "GWL",
 	   "Intern" as "Intern",
 	   "Intern" as "Intern",
 	   "produktiv" as "produktiv",
 	   "produktiv" as "produktiv",
-	   --RSUM("produktiv") as "Summe  (produktiv) Nr.1",
+	   RSUM("produktiv") as "Summe  (produktiv) Nr.1",
 	   "unproduktiv" as "unproduktiv",
 	   "unproduktiv" as "unproduktiv",
-	   --RSUM("unproduktiv") as "Summe  (unproduktiv) Nr.1",
+	   RSUM("unproduktiv") as "Summe  (unproduktiv) Nr.1",
 	   "abwesend" as "abwesend",
 	   "abwesend" as "abwesend",
 	   "Monteur_Gruppe_ori" as "Monteur_Gruppe_ori",
 	   "Monteur_Gruppe_ori" as "Monteur_Gruppe_ori",
 	   "Datum" as "Datum",
 	   "Datum" as "Datum",
@@ -80,7 +80,7 @@ select "Unique Ident" as "Unique Ident",
 	   "Berufsschule" as "Berufsschule",
 	   "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",
 	   "Work Leader Group Id" as "Work Leader Group Id",
-	   "Fahrten für KDD_" as "Fahrten für KDD_",
+	   "Fahrten für KDD_" as "Fahrten für KDD_",
 	   "MW tanken_" as "MW tanken_",
 	   "MW tanken_" as "MW tanken_",
 	   "Arbeiten Anlage B_" as "Arbeiten Anlage B_",
 	   "Arbeiten Anlage B_" as "Arbeiten Anlage B_",
 	   "Aushilfe Annahme_" as "Aushilfe Annahme_",
 	   "Aushilfe Annahme_" as "Aushilfe Annahme_",
@@ -147,8 +147,8 @@ from
 	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5000')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Urlaub",
 	   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 ('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 ('5200')) 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 ('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",
 	   T5."ORDER_NUMBER" as "Order Number_Auftrag",
 	   T5."ORDER_NUMBER" as "Order Number_Auftrag",
 	   T5."CUSTOMER_GROUP" as "Customer Group",
 	   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 ((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",
@@ -170,7 +170,7 @@ from
 	   CASE WHEN (T1."ACTIVITY_CODE" IN ('3920')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Berufsschule",
 	   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",
 	   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",
 	   T6."WORK_LEADER_GROUP_ID" as "Work Leader Group Id",
-	   '' as "Fahrten für KDD_",
+	   '' as "Fahrten für KDD_",
 	   '' as "MW tanken_",
 	   '' as "MW tanken_",
 	   '' as "Arbeiten Anlage B_",
 	   '' as "Arbeiten Anlage B_",
 	   '' as "Aushilfe Annahme_",
 	   '' as "Aushilfe Annahme_",
@@ -189,7 +189,7 @@ from "OPTIMA"."import"."EMPLOYEE" T6,
 	"OPTIMA"."import"."VPP91" T3,
 	"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"))
 	((((((("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"))
 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')))
+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')))
 -- order by "Transact Date Long" asc
 -- order by "Transact Date Long" asc
 ) D1
 ) D1
 GO
 GO
@@ -198,4 +198,4 @@ GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 6 - 6
System/OPTIMA/SQL/schema/OPTIMA/views/staging.nw_auftragsbestand_imr.sql

@@ -118,7 +118,7 @@ select T1."ORDER_NUMBER" as "Order Number_2",
 	   T12."SEATS" as "Seats",
 	   T12."SEATS" as "Seats",
 	   T12."COLOUR_CODE" as "Colour Code",
 	   T12."COLOUR_CODE" as "Colour Code",
 	   T12."TYPE_YEAR" as "Type Year",
 	   T12."TYPE_YEAR" as "Type Year",
-	   CASE WHEN (T11."ECC_STATUS" = '21') THEN ('21 - Vorlauf') WHEN (T11."ECC_STATUS" = '25') THEN ('25 - für Kd best. FZG') WHEN (T11."ECC_STATUS" = '41') THEN ('41 - Bestand') WHEN (T11."ECC_STATUS" = '44') THEN ('44 - am Hof nicht fakt.') WHEN (T11."ECC_STATUS" = '64') THEN ('64 - verkauft') ELSE null END as "Ecc_Status_Text",
+	   CASE WHEN (T11."ECC_STATUS" = '21') THEN ('21 - Vorlauf') WHEN (T11."ECC_STATUS" = '25') THEN ('25 - für Kd best. FZG') WHEN (T11."ECC_STATUS" = '41') THEN ('41 - Bestand') WHEN (T11."ECC_STATUS" = '44') THEN ('44 - am Hof nicht fakt.') WHEN (T11."ECC_STATUS" = '64') THEN ('64 - verkauft') ELSE null END as "Ecc_Status_Text",
 	   T13."MODEL_LINE" as "Model Line",
 	   T13."MODEL_LINE" as "Model Line",
 	   T13."MOD_LIN_SPECIFY" as "Mod Lin Specify",
 	   T13."MOD_LIN_SPECIFY" as "Mod Lin Specify",
 	   T13."MAKE_CD" as "Make Cd_2",
 	   T13."MAKE_CD" as "Make Cd_2",
@@ -130,14 +130,14 @@ select T1."ORDER_NUMBER" as "Order Number_2",
 	   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','M')) THEN ('Neuwagen') WHEN (T9."VEHICLE_TYPE" IN ('D','R')) THEN ('Gebrauchtwagen') ELSE null END as "Fahrzeugart_AB",
 	   '1' as "Hauptbetrieb",
 	   '1' as "Hauptbetrieb",
 	   (left(T3."DEPARTMENT_TYPE_ID",2)) as "Standort",
 	   (left(T3."DEPARTMENT_TYPE_ID",2)) as "Standort",
-	   T4."SEL_NAME" as "Verkäufer_AB",
+	   T4."SEL_NAME" as "Verkäufer_AB",
 	   T15."DESCRIPTION" as "Fabrikat_AB",
 	   T15."DESCRIPTION" as "Fabrikat_AB",
 	   T13."MOD_LIN_SPECIFY" as "Model_AB",
 	   T13."MOD_LIN_SPECIFY" as "Model_AB",
 	   T12."MODEL_TEXT" as "Modellbez",
 	   T12."MODEL_TEXT" as "Modellbez",
 	   T12."CHASSIS_NUMBER" as "Fahrgestellnr",
 	   T12."CHASSIS_NUMBER" as "Fahrgestellnr",
 	   T1."DELIVERY_ACCOUNT" + ' - ' + T1."NAME" as "Kunde",
 	   T1."DELIVERY_ACCOUNT" + ' - ' + T1."NAME" as "Kunde",
-	   CASE WHEN (T10."BOOK_KEEPING_CODE" = 'AGENT') THEN ('Behörden FZG') ELSE (T1."FLEET_OWNER" + ' - ' + T5."SPECIFY") END as "Kundenart_alt",
-	   T1."PMT_TERM" + ' - ' + T1."PAYMENT_TEXT" as "Geschäftsart",
+	   CASE WHEN (T10."BOOK_KEEPING_CODE" = 'AGENT') THEN ('Behörden FZG') ELSE (T1."FLEET_OWNER" + ' - ' + T5."SPECIFY") END as "Kundenart_alt",
+	   T1."PMT_TERM" + ' - ' + T1."PAYMENT_TEXT" as "Geschäftsart",
 	   T12."COLOUR_CODE" + ' - ' + T12."COLOUR_CF" as "Farbe",
 	   T12."COLOUR_CODE" + ' - ' + T12."COLOUR_CF" as "Farbe",
 	   T9."VEHICLE_TYPE" + ' - ' + T9."VEHICLE_TYPE_TEXT" as "Fahrzeugtyp_AB",
 	   T9."VEHICLE_TYPE" + ' - ' + T9."VEHICLE_TYPE_TEXT" as "Fahrzeugtyp_AB",
 	   T8."UNIT_NUMBER" + ' - ' + T12."CHASSIS_NUMBER" as "FZG_AB",
 	   T8."UNIT_NUMBER" + ' - ' + T12."CHASSIS_NUMBER" as "FZG_AB",
@@ -152,7 +152,7 @@ select T1."ORDER_NUMBER" as "Order Number_2",
 	   T16."ALLOC_DATE_GMD" as "Alloc Date Gmd_2",
 	   T16."ALLOC_DATE_GMD" as "Alloc Date Gmd_2",
 	   T16."DELIV_DATE_GMD" as "Deliv Date Gmd",
 	   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 (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','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 (T16."EVENT_CODE_GMD" IS NULL) THEN ('Info fehlt') ELSE (T16."EVENT_CODE_GMD") END as "Event Code Gmd",
 	   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."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",
 	   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",
@@ -170,4 +170,4 @@ GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 6 - 6
System/OPTIMA/SQL/schema/OPTIMA/views/staging.nw_be_bilanz_imr.sql

@@ -114,7 +114,7 @@ select T1."UNIT_NUMBER" as "Unit Number",
 	   T1."UNIQUE_IDENT" as "Unique Ident",
 	   T1."UNIQUE_IDENT" as "Unique Ident",
 	   T2."VEHICLE_TYPE" as "Vehicle Type",
 	   T2."VEHICLE_TYPE" as "Vehicle Type",
 	   T2."VEHICLE_TYPE_TEXT" as "Vehicle Type Text",
 	   T2."VEHICLE_TYPE_TEXT" as "Vehicle Type Text",
-	   CASE WHEN (T1."ECC_STATUS" = '21') THEN ('21 - Vorlauf') WHEN (T1."ECC_STATUS" = '25') THEN ('25 - für Kd best. FZG') WHEN (T1."ECC_STATUS" = '41') THEN ('41 - Bestand') WHEN (T1."ECC_STATUS" = '44') THEN ('44 - am Hof nicht fakt.') WHEN (T1."ECC_STATUS" = '64') THEN ('64 - verkauft') ELSE null END as "ECC_Status_Text",
+	   CASE WHEN (T1."ECC_STATUS" = '21') THEN ('21 - Vorlauf') WHEN (T1."ECC_STATUS" = '25') THEN ('25 - für Kd best. FZG') WHEN (T1."ECC_STATUS" = '41') THEN ('41 - Bestand') WHEN (T1."ECC_STATUS" = '44') THEN ('44 - am Hof nicht fakt.') WHEN (T1."ECC_STATUS" = '64') THEN ('64 - verkauft') ELSE null END as "ECC_Status_Text",
 	   T3."BASIS_NUMBER" as "Basis Number",
 	   T3."BASIS_NUMBER" as "Basis Number",
 	   T3."TRANSACT_DATE" as "Transact Date",
 	   T3."TRANSACT_DATE" as "Transact Date",
 	   T3."HANDLER" as "Handler",
 	   T3."HANDLER" as "Handler",
@@ -200,7 +200,7 @@ select T1."UNIT_NUMBER" as "Unit Number",
 	   T1."LOCATION_CODE" as "Standort",
 	   T1."LOCATION_CODE" as "Standort",
 	   T6."DEPARTMENT_TYPE_ID" as "Department Type Id",
 	   T6."DEPARTMENT_TYPE_ID" as "Department Type Id",
 	   T6."DESCRIPTION" as "Description_2",
 	   T6."DESCRIPTION" as "Description_2",
-	   CASE WHEN (T1."VEHICLE_TYPE" IN ('N','T','V','M','B')) THEN ('Neuwagen') WHEN (T1."VEHICLE_TYPE" IN ('D','R')) THEN ('Gebrauchtwagen') WHEN (T1."VEHICLE_TYPE" IN ('G')) THEN ('Geschäftsfahrzeug') ELSE null END as "Fahrzeugart",
+	   CASE WHEN (T1."VEHICLE_TYPE" IN ('N','T','V','M','B')) THEN ('Neuwagen') WHEN (T1."VEHICLE_TYPE" IN ('D','R')) THEN ('Gebrauchtwagen') WHEN (T1."VEHICLE_TYPE" IN ('G')) THEN ('Geschäftsfahrzeug') ELSE null END as "Fahrzeugart",
 	   T7."DESCRIPTION" as "Fabrikat",
 	   T7."DESCRIPTION" as "Fabrikat",
 	   T4."MOD_LIN_SPECIFY" as "Model",
 	   T4."MOD_LIN_SPECIFY" as "Model",
 	   T3."MODEL_TEXT" as "Modellbez",
 	   T3."MODEL_TEXT" as "Modellbez",
@@ -218,15 +218,15 @@ select T1."UNIT_NUMBER" as "Unit Number",
 	   T3."CAR_LETTER" as "Car Letter",
 	   T3."CAR_LETTER" as "Car Letter",
 	   CASE WHEN (T3."CAR_LETTER" = 'Konsi') THEN ('Konsi-FZG') ELSE ('Lagerfahrzeug') END as "Fahrzeugart_Konsi",
 	   CASE WHEN (T3."CAR_LETTER" = 'Konsi') THEN ('Konsi-FZG') ELSE ('Lagerfahrzeug') END as "Fahrzeugart_Konsi",
 	   (CASE WHEN (T1."RECEPTION_DATE" IS NULL) THEN ((day(((getdate())) - T1."PURCH_DATE"))) ELSE ((day(((getdate())) - T1."RECEPTION_DATE"))) END) * 15 as "kalk_Kosten",
 	   (CASE WHEN (T1."RECEPTION_DATE" IS NULL) THEN ((day(((getdate())) - T1."PURCH_DATE"))) ELSE ((day(((getdate())) - T1."RECEPTION_DATE"))) END) * 15 as "kalk_Kosten",
-	   CASE WHEN (T1."LOCATION_CODE" = '01        ') THEN ('Selm') WHEN (T1."LOCATION_CODE" = '02        ') THEN ('Lünen') WHEN (T1."LOCATION_CODE" = '03        ') THEN ('Werne') WHEN (T1."LOCATION_CODE" = '10        ') THEN ('Lüdingh.') WHEN (T1."LOCATION_CODE" = '99        ') THEN ('AOV Ros.') WHEN (T1."LOCATION_CODE" = '98') THEN ('AOV Wink.') ELSE (T1."LOCATION_CODE") END as "Betrieb_ori",
+	   CASE WHEN (T1."LOCATION_CODE" = '01        ') THEN ('Selm') WHEN (T1."LOCATION_CODE" = '02        ') THEN ('Lünen') WHEN (T1."LOCATION_CODE" = '03        ') THEN ('Werne') WHEN (T1."LOCATION_CODE" = '10        ') THEN ('Lüdingh.') WHEN (T1."LOCATION_CODE" = '99        ') THEN ('AOV Ros.') WHEN (T1."LOCATION_CODE" = '98') THEN ('AOV Wink.') ELSE (T1."LOCATION_CODE") END as "Betrieb_ori",
 	   T8."SELLER_CODE" as "Seller Code",
 	   T8."SELLER_CODE" as "Seller Code",
 	   T8."SEL_NAME" as "Sel Name",
 	   T8."SEL_NAME" as "Sel Name",
 	   T8."SEL_NAME" as "VB_Einkauf",
 	   T8."SEL_NAME" as "VB_Einkauf",
 	   T1."BUD_COST" as "geplante Kosten",
 	   T1."BUD_COST" as "geplante Kosten",
-	   T1."COST_UNIT" as "tatsächl. Kosten",
+	   T1."COST_UNIT" as "tatsächl. Kosten",
 	   T1."BUD_SALE_DET" as "geplanter VK",
 	   T1."BUD_SALE_DET" as "geplanter VK",
 	   'FZG-Bestand' as "Ebene1",
 	   'FZG-Bestand' as "Ebene1",
-	   (CASE WHEN (T1."VEHICLE_TYPE" IN ('N','T','V','M','B')) THEN ('Neuwagen') WHEN (T1."VEHICLE_TYPE" IN ('D','R')) THEN ('Gebrauchtwagen') WHEN (T1."VEHICLE_TYPE" IN ('G')) THEN ('Geschäftsfahrzeug') ELSE null END) as "Ebene2",
+	   (CASE WHEN (T1."VEHICLE_TYPE" IN ('N','T','V','M','B')) THEN ('Neuwagen') WHEN (T1."VEHICLE_TYPE" IN ('D','R')) THEN ('Gebrauchtwagen') WHEN (T1."VEHICLE_TYPE" IN ('G')) THEN ('Geschäftsfahrzeug') ELSE null END) as "Ebene2",
 	   (T2."VEHICLE_TYPE" + ' - ' + T2."VEHICLE_TYPE_TEXT") as "Ebene3",
 	   (T2."VEHICLE_TYPE" + ' - ' + T2."VEHICLE_TYPE_TEXT") as "Ebene3",
 	   T7."DESCRIPTION" as "Ebene4",
 	   T7."DESCRIPTION" as "Ebene4",
 	   'G.V.O.' as "Rechtseinheit",
 	   'G.V.O.' as "Rechtseinheit",
@@ -242,4 +242,4 @@ GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 12 - 12
System/OPTIMA/SQL/schema/OPTIMA/views/staging.nw_be_csv_imr.sql

@@ -249,10 +249,10 @@ select "Unit Number" as "Unit Number",
 	   "Model" as "Model",
 	   "Model" as "Model",
 	   "Fahrzeugtyp_1" as "Fahrzeugtyp_1",
 	   "Fahrzeugtyp_1" as "Fahrzeugtyp_1",
 	   "Standort_1" as "Standort_1",
 	   "Standort_1" as "Standort_1",
-	   "Lieferant/Einkäufer" as "Lieferant/Einkäufer",
+	   "Lieferant/Einkäufer" as "Lieferant/Einkäufer",
 	   "Name_Lieferant" as "Name_Lieferant",
 	   "Name_Lieferant" as "Name_Lieferant",
-	   "Name_Einkäufer" as "Name_Einkäufer",
-	   "FZG_Einkäufer" as "FZG_Einkäufer",
+	   "Name_Einkäufer" as "Name_Einkäufer",
+	   "FZG_Einkäufer" as "FZG_Einkäufer",
 	   "EZ" as "EZ",
 	   "EZ" as "EZ",
 	   "Km-stand" as "Km-stand",
 	   "Km-stand" as "Km-stand",
 	   "Plan VK Netz brutto" as "Plan VK Netz brutto",
 	   "Plan VK Netz brutto" as "Plan VK Netz brutto",
@@ -510,10 +510,10 @@ from
 	   "Model Text_2" as "Model",
 	   "Model Text_2" as "Model",
 	   '' as "Fahrzeugtyp_1",
 	   '' as "Fahrzeugtyp_1",
 	   "Location Code" as "Standort_1",
 	   "Location Code" as "Standort_1",
-	   "Lieferant/Einkäufer",
+	   "Lieferant/Einkäufer",
 	   "Name_Lieferant",
 	   "Name_Lieferant",
-	   "Name_Einkäufer",
-	   "FZG_Einkäufer",
+	   "Name_Einkäufer",
+	   "FZG_Einkäufer",
 	   "EZ",
 	   "EZ",
 	   "Mileage_2" as "Km-stand",
 	   "Mileage_2" as "Km-stand",
 	   0 as "Plan VK Netz brutto",
 	   0 as "Plan VK Netz brutto",
@@ -530,7 +530,7 @@ from
 from 
 from 
 (select T1."UNIT_NUMBER" as "Unit Number",
 (select T1."UNIT_NUMBER" as "Unit Number",
 	   T1."PURCH_PRICE_UNIT" as "Purch Price Unit",
 	   T1."PURCH_PRICE_UNIT" as "Purch Price Unit",
-	   CASE WHEN (T1."BOOK_KEEPING_CODE" IN ('RE300','RZ300')) THEN ('GW aus EI Hdl. reg.') WHEN (T1."BOOK_KEEPING_CODE" = 'DE300') THEN ('GW aus EI Hdl. §25a') ELSE ((CASE WHEN (T2."VEHICLE_TYPE" IS NULL) THEN (T1."VEHICLE_TYPE") ELSE (T2."VEHICLE_TYPE" + ' - ' + T2."VEHICLE_TYPE_TEXT") END)) END as "Fahrzeugtyp",
+	   CASE WHEN (T1."BOOK_KEEPING_CODE" IN ('RE300','RZ300')) THEN ('GW aus EI Hdl. reg.') WHEN (T1."BOOK_KEEPING_CODE" = 'DE300') THEN ('GW aus EI Hdl. §25a') ELSE ((CASE WHEN (T2."VEHICLE_TYPE" IS NULL) THEN (T1."VEHICLE_TYPE") ELSE (T2."VEHICLE_TYPE" + ' - ' + T2."VEHICLE_TYPE_TEXT") END)) END as "Fahrzeugtyp",
 	   CASE WHEN (T1."ECC_STATUS" IN ('21','41')) THEN ('Lager') WHEN (T1."ECC_STATUS" IN ('25','44')) THEN ('verkauft') ELSE null END as "Lager / verkauft",
 	   CASE WHEN (T1."ECC_STATUS" IN ('21','41')) THEN ('Lager') WHEN (T1."ECC_STATUS" IN ('25','44')) THEN ('verkauft') ELSE null END as "Lager / verkauft",
 	   CASE WHEN (T1."ECC_STATUS" LIKE '2%') THEN ('Vorlauf') WHEN (T1."ECC_STATUS" LIKE '4%') THEN ('Bestand') ELSE null END as "Status",
 	   CASE WHEN (T1."ECC_STATUS" LIKE '2%') THEN ('Vorlauf') WHEN (T1."ECC_STATUS" LIKE '4%') THEN ('Bestand') ELSE null END as "Status",
 	   CASE WHEN (T3."MODEL_TEXT" IS NOT NULL) THEN ((rtrim(T3."MODEL_TEXT")) + ' - ' + T1."UNIT_NUMBER") ELSE (T1."UNIT_NUMBER") END as "FZG_Bestand_Dashboard",
 	   CASE WHEN (T3."MODEL_TEXT" IS NOT NULL) THEN ((rtrim(T3."MODEL_TEXT")) + ' - ' + T1."UNIT_NUMBER") ELSE (T1."UNIT_NUMBER") END as "FZG_Bestand_Dashboard",
@@ -538,10 +538,10 @@ from
 	   T1."BUD_SALE_DET" as "Bud Sale Det",
 	   T1."BUD_SALE_DET" as "Bud Sale Det",
 	   T1."MILEAGE" as "Mileage_2",
 	   T1."MILEAGE" as "Mileage_2",
 	   (convert(varchar(50), year(T3."FIRST_REG_DATE")) + '-' + convert(varchar(50), month(T3."FIRST_REG_DATE")) + '-' + convert(varchar(50), day(T3."FIRST_REG_DATE"))) as "EZ",
 	   (convert(varchar(50), year(T3."FIRST_REG_DATE")) + '-' + convert(varchar(50), month(T3."FIRST_REG_DATE")) + '-' + convert(varchar(50), day(T3."FIRST_REG_DATE"))) as "EZ",
-	   (rtrim(T1."UNIT_NUMBER")) + ' - ' + (CASE WHEN (T8."SEL_NAME" IS NOT NULL) THEN (T8."SEL_NAME") ELSE (' - ') END) as "FZG_Einkäufer",
-	   CASE WHEN (T8."SEL_NAME" IS NOT NULL) THEN (T8."SEL_NAME") ELSE (' - ') END as "Name_Einkäufer",
+	   (rtrim(T1."UNIT_NUMBER")) + ' - ' + (CASE WHEN (T8."SEL_NAME" IS NOT NULL) THEN (T8."SEL_NAME") ELSE (' - ') END) as "FZG_Einkäufer",
+	   CASE WHEN (T8."SEL_NAME" IS NOT NULL) THEN (T8."SEL_NAME") ELSE (' - ') END as "Name_Einkäufer",
 	   CASE WHEN ((T1."PREV_OWNER" IS NULL) or (T1."PREV_OWNER" = ' ')) THEN (' - ') ELSE ((left(T1."PREV_OWNER",30))) END as "Name_Lieferant",
 	   CASE WHEN ((T1."PREV_OWNER" IS NULL) or (T1."PREV_OWNER" = ' ')) THEN (' - ') ELSE ((left(T1."PREV_OWNER",30))) END as "Name_Lieferant",
-	   (rtrim((CASE WHEN ((T1."PREV_OWNER" IS NULL) or (T1."PREV_OWNER" = ' ')) THEN (' - ') ELSE ((left(T1."PREV_OWNER",30))) END))) + ' / ' + (CASE WHEN (T8."SEL_NAME" IS NOT NULL) THEN (T8."SEL_NAME") ELSE (' - ') END) as "Lieferant/Einkäufer",
+	   (rtrim((CASE WHEN ((T1."PREV_OWNER" IS NULL) or (T1."PREV_OWNER" = ' ')) THEN (' - ') ELSE ((left(T1."PREV_OWNER",30))) END))) + ' / ' + (CASE WHEN (T8."SEL_NAME" IS NOT NULL) THEN (T8."SEL_NAME") ELSE (' - ') END) as "Lieferant/Einkäufer",
 	   T1."LOCATION_CODE" as "Location Code",
 	   T1."LOCATION_CODE" as "Location Code",
 	   T3."MODEL_TEXT" as "Model Text_2",
 	   T3."MODEL_TEXT" as "Model Text_2",
 	   T4."MOD_LIN_SPECIFY" as "Mod Lin Specify",
 	   T4."MOD_LIN_SPECIFY" as "Mod Lin Specify",
@@ -568,7 +568,7 @@ from
 	   T7."DESCRIPTION" as "Fabrikat_ori",
 	   T7."DESCRIPTION" as "Fabrikat_ori",
 	   T7."GLOBAL_MAKE_CD" as "Global Make Cd",
 	   T7."GLOBAL_MAKE_CD" as "Global Make Cd",
 	   CASE WHEN (T2."VEHICLE_TYPE" IS NULL) THEN (T1."VEHICLE_TYPE") ELSE (T2."VEHICLE_TYPE" + ' - ' + T2."VEHICLE_TYPE_TEXT") END as "Fahrzeugtyp_alt",
 	   CASE WHEN (T2."VEHICLE_TYPE" IS NULL) THEN (T1."VEHICLE_TYPE") ELSE (T2."VEHICLE_TYPE" + ' - ' + T2."VEHICLE_TYPE_TEXT") END as "Fahrzeugtyp_alt",
-	   (rtrim(T1."UNIT_NUMBER")) + ' - ' + T3."CHASSIS_NUMBER" + ' - ' + (rtrim((CASE WHEN (T1."BOOK_KEEPING_CODE" IN ('RE300','RZ300')) THEN ('GW aus EI Hdl. reg.') WHEN (T1."BOOK_KEEPING_CODE" = 'DE300') THEN ('GW aus EI Hdl. §25a') ELSE ((CASE WHEN (T2."VEHICLE_TYPE" IS NULL) THEN (T1."VEHICLE_TYPE") ELSE (T2."VEHICLE_TYPE" + ' - ' + T2."VEHICLE_TYPE_TEXT") END)) END))) + ' - ' + T1."ECC_STATUS" as "FZG",
+	   (rtrim(T1."UNIT_NUMBER")) + ' - ' + T3."CHASSIS_NUMBER" + ' - ' + (rtrim((CASE WHEN (T1."BOOK_KEEPING_CODE" IN ('RE300','RZ300')) THEN ('GW aus EI Hdl. reg.') WHEN (T1."BOOK_KEEPING_CODE" = 'DE300') THEN ('GW aus EI Hdl. §25a') ELSE ((CASE WHEN (T2."VEHICLE_TYPE" IS NULL) THEN (T1."VEHICLE_TYPE") ELSE (T2."VEHICLE_TYPE" + ' - ' + T2."VEHICLE_TYPE_TEXT") END)) END))) + ' - ' + T1."ECC_STATUS" as "FZG",
 	   T3."COLOUR_CODE" + ' - ' + T3."COLOUR_CF" as "Farbe",
 	   T3."COLOUR_CODE" + ' - ' + T3."COLOUR_CF" as "Farbe",
 	   T3."CHASSIS_NUMBER" as "Chassis Number",
 	   T3."CHASSIS_NUMBER" as "Chassis Number",
 	   CASE WHEN (T2."VEHICLE_TYPE" IN ('M','N','T','V','B')) THEN ('Neuwagen') WHEN (T2."VEHICLE_TYPE" IN ('D','G','K','R')) THEN ('Gebrauchtwagen') ELSE null END as "Fahrzeugart",
 	   CASE WHEN (T2."VEHICLE_TYPE" IN ('M','N','T','V','B')) THEN ('Neuwagen') WHEN (T2."VEHICLE_TYPE" IN ('D','G','K','R')) THEN ('Gebrauchtwagen') ELSE null END as "Fahrzeugart",
@@ -780,4 +780,4 @@ GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 54 - 54
System/OPTIMA/SQL/schema/OPTIMA/views/staging.nw_gw_vk_csv_imr.sql

@@ -82,7 +82,7 @@ select "Unit Number" as "Unit Number",
 	   "Invoice Date" as "Invoice Date",
 	   "Invoice Date" as "Invoice Date",
 	   "Hauptbetrieb" as "Hauptbetrieb",
 	   "Hauptbetrieb" as "Hauptbetrieb",
 	   "Standort_Verkaufskostenstelle" as "Standort_Verkaufskostenstelle",
 	   "Standort_Verkaufskostenstelle" as "Standort_Verkaufskostenstelle",
-	   "Verkäufer" as "Verkäufer",
+	   "Verkäufer" as "Verkäufer",
 	   "Fabrikat_ori" as "Fabrikat_ori",
 	   "Fabrikat_ori" as "Fabrikat_ori",
 	   "Model" as "Model",
 	   "Model" as "Model",
 	   "Modellbez" as "Modellbez",
 	   "Modellbez" as "Modellbez",
@@ -91,14 +91,14 @@ select "Unit Number" as "Unit Number",
 	   "Fahrzeugtyp" as "Fahrzeugtyp",
 	   "Fahrzeugtyp" as "Fahrzeugtyp",
 	   "Kunde" as "Kunde",
 	   "Kunde" as "Kunde",
 	   "Kundenart" as "Kundenart",
 	   "Kundenart" as "Kundenart",
-	   "Geschäftsart" as "Geschäftsart",
+	   "Geschäftsart" as "Geschäftsart",
 	   "Farbe" as "Farbe",
 	   "Farbe" as "Farbe",
 	   "ECC_Status_Text" as "ECC_Status_Text",
 	   "ECC_Status_Text" as "ECC_Status_Text",
 	   "FZG" as "FZG",
 	   "FZG" as "FZG",
 	   "FZG_1" as "FZG_1",
 	   "FZG_1" as "FZG_1",
 	   "FZG_Liste_1" as "FZG_Liste_1",
 	   "FZG_Liste_1" as "FZG_Liste_1",
 	   "Sel Name_EK_vpp43" as "Sel Name_EK_vpp43",
 	   "Sel Name_EK_vpp43" as "Sel Name_EK_vpp43",
-	   "Einkäufer" as "Einkäufer",
+	   "Einkäufer" as "Einkäufer",
 	   "Vorbesitzer" as "Vorbesitzer",
 	   "Vorbesitzer" as "Vorbesitzer",
 	   "FZG_Liste_2" as "FZG_Liste_2",
 	   "FZG_Liste_2" as "FZG_Liste_2",
 	   "FZG_Liste_3" as "FZG_Liste_3",
 	   "FZG_Liste_3" as "FZG_Liste_3",
@@ -126,16 +126,16 @@ select "Unit Number" as "Unit Number",
 	   "Department" as "Department",
 	   "Department" as "Department",
 	   "Destination" as "Destination",
 	   "Destination" as "Destination",
 	   "Int Voucher No" as "Int Voucher No",
 	   "Int Voucher No" as "Int Voucher No",
-	   "Erlös" as "Erlös",
-	   "Sonst. Erlöse" as "Sonst. Erlöse",
-	   "Ums. Fracht und Überf." as "Ums. Fracht und Überf.",
+	   "Erlös" as "Erlös",
+	   "Sonst. Erlöse" as "Sonst. Erlöse",
+	   "Ums. Fracht und Überf." as "Ums. Fracht und Überf.",
 	   "Nachlass" as "Nachlass",
 	   "Nachlass" as "Nachlass",
 	   "Provisionen" as "Provisionen",
 	   "Provisionen" as "Provisionen",
 	   "EK Fahrzeug" as "EK Fahrzeug",
 	   "EK Fahrzeug" as "EK Fahrzeug",
 	   "FZG-Kosten" as "FZG-Kosten",
 	   "FZG-Kosten" as "FZG-Kosten",
 	   "Einsatz" as "Einsatz",
 	   "Einsatz" as "Einsatz",
 	   SUM("Einsatz") OVER (partition by "Unit Number") as "Summe  (Einsatz) Nr.2",
 	   SUM("Einsatz") OVER (partition by "Unit Number") as "Summe  (Einsatz) Nr.2",
-	   SUM("Einsatz") OVER (partition by "Unit Number") as "Summe  (Einsatz) Nr.1",
+	   RSUM("Einsatz") as "Summe  (Einsatz) Nr.1",
 	   "VK_Hilfen" as "VK_Hilfen",
 	   "VK_Hilfen" as "VK_Hilfen",
 	   "Standtage" as "Standtage",
 	   "Standtage" as "Standtage",
 	   "Fabrikat_manuell" as "Fabrikat_manuell",
 	   "Fabrikat_manuell" as "Fabrikat_manuell",
@@ -163,24 +163,24 @@ select "Unit Number" as "Unit Number",
 	   "PLZ_3" as "PLZ_3",
 	   "PLZ_3" as "PLZ_3",
 	   "PLZ_4" as "PLZ_4",
 	   "PLZ_4" as "PLZ_4",
 	   "PLZ Code_Deb" as "PLZ Code_Deb",
 	   "PLZ Code_Deb" as "PLZ Code_Deb",
-	   "FZG_Erlös" as "FZG_Erlös",
+	   "FZG_Erlös" as "FZG_Erlös",
 	   "Einsatz_FZG" as "Einsatz_FZG",
 	   "Einsatz_FZG" as "Einsatz_FZG",
-	   "Erlös_Prov" as "Erlös_Prov",
-	   "Erlös_Überf." as "Erlös_Überf.",
-	   "Erlös Sonst." as "Erlös Sonst.",
+	   "Erlös_Prov" as "Erlös_Prov",
+	   "Erlös_Überf." as "Erlös_Überf.",
+	   "Erlös Sonst." as "Erlös Sonst.",
 	   "Order By" as "Order By",
 	   "Order By" as "Order By",
-	   "Einkäufer/Vorbesitzer" as "Einkäufer/Vorbesitzer",
+	   "Einkäufer/Vorbesitzer" as "Einkäufer/Vorbesitzer",
 	   "DB1 < 0" as "DB1 < 0",
 	   "DB1 < 0" as "DB1 < 0",
-	   "Name_Einkäufer" as "Name_Einkäufer",
+	   "Name_Einkäufer" as "Name_Einkäufer",
 	   "Konto" as "Konto",
 	   "Konto" as "Konto",
 	   "Buch_Text" as "Buch_Text",
 	   "Buch_Text" as "Buch_Text",
 	   "Name_Lieferant" as "Name_Lieferant",
 	   "Name_Lieferant" as "Name_Lieferant",
-	   "Erlös Prov" as "Erlös Prov",
-	   "Erlös_FZG" as "Erlös_FZG",
-	   "Erlös Überf." as "Erlös Überf.",
+	   "Erlös Prov" as "Erlös Prov",
+	   "Erlös_FZG" as "Erlös_FZG",
+	   "Erlös Überf." as "Erlös Überf.",
 	   "Einsatz FZG" as "Einsatz FZG",
 	   "Einsatz FZG" as "Einsatz FZG",
 	   "Menge_1" as "Menge_1",
 	   "Menge_1" as "Menge_1",
-	   "Anzahl_Datensätze" as "Anzahl_Datensätze",
+	   "Anzahl_Datensätze" as "Anzahl_Datensätze",
 	   "Menge" as "Menge",
 	   "Menge" as "Menge",
 	   "DB1" as "DB1",
 	   "DB1" as "DB1",
 	   "Summe_DB1" as "Summe_DB1",
 	   "Summe_DB1" as "Summe_DB1",
@@ -264,7 +264,7 @@ from
 	   "Invoice Date" as "Invoice Date",
 	   "Invoice Date" as "Invoice Date",
 	   "Hauptbetrieb" as "Hauptbetrieb",
 	   "Hauptbetrieb" as "Hauptbetrieb",
 	   "Standort_Verkaufskostenstelle" as "Standort_Verkaufskostenstelle",
 	   "Standort_Verkaufskostenstelle" as "Standort_Verkaufskostenstelle",
-	   "Verkäufer" as "Verkäufer",
+	   "Verkäufer" as "Verkäufer",
 	   "Fabrikat_ori" as "Fabrikat_ori",
 	   "Fabrikat_ori" as "Fabrikat_ori",
 	   "Model" as "Model",
 	   "Model" as "Model",
 	   "Modellbez" as "Modellbez",
 	   "Modellbez" as "Modellbez",
@@ -273,14 +273,14 @@ from
 	   "Fahrzeugtyp" as "Fahrzeugtyp",
 	   "Fahrzeugtyp" as "Fahrzeugtyp",
 	   "Kunde" as "Kunde",
 	   "Kunde" as "Kunde",
 	   "Kundenart" as "Kundenart",
 	   "Kundenart" as "Kundenart",
-	   "Geschäftsart" as "Geschäftsart",
+	   "Geschäftsart" as "Geschäftsart",
 	   "Farbe" as "Farbe",
 	   "Farbe" as "Farbe",
 	   "ECC_Status_Text" as "ECC_Status_Text",
 	   "ECC_Status_Text" as "ECC_Status_Text",
 	   "FZG" as "FZG",
 	   "FZG" as "FZG",
 	   "FZG_1" as "FZG_1",
 	   "FZG_1" as "FZG_1",
 	   "FZG_Liste_1" as "FZG_Liste_1",
 	   "FZG_Liste_1" as "FZG_Liste_1",
 	   "Sel Name_EK_vpp43" as "Sel Name_EK_vpp43",
 	   "Sel Name_EK_vpp43" as "Sel Name_EK_vpp43",
-	   "Einkäufer" as "Einkäufer",
+	   "Einkäufer" as "Einkäufer",
 	   "Vorbesitzer" as "Vorbesitzer",
 	   "Vorbesitzer" as "Vorbesitzer",
 	   "FZG_Liste_2" as "FZG_Liste_2",
 	   "FZG_Liste_2" as "FZG_Liste_2",
 	   "FZG_Liste_3" as "FZG_Liste_3",
 	   "FZG_Liste_3" as "FZG_Liste_3",
@@ -308,9 +308,9 @@ from
 	   "Department" as "Department",
 	   "Department" as "Department",
 	   "Destination" as "Destination",
 	   "Destination" as "Destination",
 	   "Int Voucher No" as "Int Voucher No",
 	   "Int Voucher No" as "Int Voucher No",
-	   "Erlös" as "Erlös",
-	   "Sonst. Erlöse" as "Sonst. Erlöse",
-	   "Ums. Fracht und Überf." as "Ums. Fracht und Überf.",
+	   "Erlös" as "Erlös",
+	   "Sonst. Erlöse" as "Sonst. Erlöse",
+	   "Ums. Fracht und Überf." as "Ums. Fracht und Überf.",
 	   "Nachlass" as "Nachlass",
 	   "Nachlass" as "Nachlass",
 	   "Provisionen" as "Provisionen",
 	   "Provisionen" as "Provisionen",
 	   "EK Fahrzeug" as "EK Fahrzeug",
 	   "EK Fahrzeug" as "EK Fahrzeug",
@@ -343,24 +343,24 @@ from
 	   "PLZ_3" as "PLZ_3",
 	   "PLZ_3" as "PLZ_3",
 	   "PLZ_4" as "PLZ_4",
 	   "PLZ_4" as "PLZ_4",
 	   "PLZ Code_Deb" as "PLZ Code_Deb",
 	   "PLZ Code_Deb" as "PLZ Code_Deb",
-	   "FZG_Erlös" as "FZG_Erlös",
+	   "FZG_Erlös" as "FZG_Erlös",
 	   "Einsatz_FZG" as "Einsatz_FZG",
 	   "Einsatz_FZG" as "Einsatz_FZG",
-	   "Erlös_Prov" as "Erlös_Prov",
-	   "Erlös_Überf." as "Erlös_Überf.",
-	   "Erlös Sonst." as "Erlös Sonst.",
+	   "Erlös_Prov" as "Erlös_Prov",
+	   "Erlös_Überf." as "Erlös_Überf.",
+	   "Erlös Sonst." as "Erlös Sonst.",
 	   "Order By" as "Order By",
 	   "Order By" as "Order By",
-	   "Einkäufer/Vorbesitzer" as "Einkäufer/Vorbesitzer",
+	   "Einkäufer/Vorbesitzer" as "Einkäufer/Vorbesitzer",
 	   CASE WHEN ((SUM("DB1") OVER (partition by "Unit Number")) < 0) THEN ('DB1 < 0') ELSE ('DB1 > 0') END as "DB1 < 0",
 	   CASE WHEN ((SUM("DB1") OVER (partition by "Unit Number")) < 0) THEN ('DB1 < 0') ELSE ('DB1 > 0') END as "DB1 < 0",
-	   "Name_Einkäufer" as "Name_Einkäufer",
+	   "Name_Einkäufer" as "Name_Einkäufer",
 	   "Konto" as "Konto",
 	   "Konto" as "Konto",
 	   "Buch_Text" as "Buch_Text",
 	   "Buch_Text" as "Buch_Text",
 	   "Name_Lieferant" as "Name_Lieferant",
 	   "Name_Lieferant" as "Name_Lieferant",
-	   "Erlös Prov" as "Erlös Prov",
-	   "Erlös_FZG" as "Erlös_FZG",
-	   "Erlös Überf." as "Erlös Überf.",
+	   "Erlös Prov" as "Erlös Prov",
+	   "Erlös_FZG" as "Erlös_FZG",
+	   "Erlös Überf." as "Erlös Überf.",
 	   "Einsatz FZG" as "Einsatz FZG",
 	   "Einsatz FZG" as "Einsatz FZG",
 	   "Menge_1" as "Menge_1",
 	   "Menge_1" as "Menge_1",
-	   COUNT("Basis Number") OVER (partition by "Unit Number") as "Anzahl_Datensätze",
+	   COUNT("Basis Number") OVER (partition by "Unit Number") as "Anzahl_Datensätze",
 	   ("Menge_1" / COUNT("Basis Number") OVER (partition by "Unit Number")) as "Menge",
 	   ("Menge_1" / COUNT("Basis Number") OVER (partition by "Unit Number")) as "Menge",
 	   "DB1" as "DB1",
 	   "DB1" as "DB1",
 	   SUM("DB1") OVER (partition by "Unit Number") as "Summe_DB1",
 	   SUM("DB1") OVER (partition by "Unit Number") as "Summe_DB1",
@@ -444,7 +444,7 @@ from
 	   "Sale Date" as "Invoice Date",
 	   "Sale Date" as "Invoice Date",
 	   "Hauptbetrieb",
 	   "Hauptbetrieb",
 	   "Standort_Verkaufskostenstelle",
 	   "Standort_Verkaufskostenstelle",
-	   "Sel Name_vpp43" as "Verkäufer",
+	   "Sel Name_vpp43" as "Verkäufer",
 	   "Description_Global_Make" as "Fabrikat_ori",
 	   "Description_Global_Make" as "Fabrikat_ori",
 	   "Model",
 	   "Model",
 	   "Model Text" as "Modellbez",
 	   "Model Text" as "Modellbez",
@@ -453,14 +453,14 @@ from
 	   "Fahrzeugtyp",
 	   "Fahrzeugtyp",
 	   "Kunde",
 	   "Kunde",
 	   "Kundenart",
 	   "Kundenart",
-	   '' as "Geschäftsart",
+	   '' as "Geschäftsart",
 	   "Farbe",
 	   "Farbe",
 	   "ECC_Status_Text",
 	   "ECC_Status_Text",
 	   "FZG",
 	   "FZG",
 	   "FZG_1",
 	   "FZG_1",
 	   "FZG_Liste_1",
 	   "FZG_Liste_1",
 	   "Sel Name_EK_vpp43",
 	   "Sel Name_EK_vpp43",
-	   "Sel Name_EK_vpp43" as "Einkäufer",
+	   "Sel Name_EK_vpp43" as "Einkäufer",
 	   "Prev Owner" as "Vorbesitzer",
 	   "Prev Owner" as "Vorbesitzer",
 	   "FZG_Liste_2",
 	   "FZG_Liste_2",
 	   "Model Text" as "FZG_Liste_3",
 	   "Model Text" as "FZG_Liste_3",
@@ -488,9 +488,9 @@ from
 	   "Department",
 	   "Department",
 	   "Destination",
 	   "Destination",
 	   "Int Voucher No",
 	   "Int Voucher No",
-	   "Erlös",
-	   "Sonst. Erlöse",
-	   "Ums. Fracht und Überf.",
+	   "Erlös",
+	   "Sonst. Erlöse",
+	   "Ums. Fracht und Überf.",
 	   "Nachlass",
 	   "Nachlass",
 	   "Provisionen",
 	   "Provisionen",
 	   "EK Fahrzeug",
 	   "EK Fahrzeug",
@@ -522,20 +522,20 @@ from
 	   "PLZ_3",
 	   "PLZ_3",
 	   "PLZ_4",
 	   "PLZ_4",
 	   "Zipcode" as "PLZ Code_Deb",
 	   "Zipcode" as "PLZ Code_Deb",
-	   "Erlös" as "FZG_Erlös",
+	   "Erlös" as "FZG_Erlös",
 	   "Einsatz" as "Einsatz_FZG",
 	   "Einsatz" as "Einsatz_FZG",
-	   "Provisionen" as "Erlös_Prov",
-	   "Ums. Fracht und Überf." as "Erlös_Überf.",
-	   "Sonst. Erlöse" as "Erlös Sonst.",
+	   "Provisionen" as "Erlös_Prov",
+	   "Ums. Fracht und Überf." as "Erlös_Überf.",
+	   "Sonst. Erlöse" as "Erlös Sonst.",
 	   "Order By",
 	   "Order By",
-	   "Einkäufer/Vorbesitzer",
-	   "Sel Name_EK_vpp43" as "Name_Einkäufer",
+	   "Einkäufer/Vorbesitzer",
+	   "Sel Name_EK_vpp43" as "Name_Einkäufer",
 	   '' as "Konto",
 	   '' as "Konto",
 	   "Buch_Text",
 	   "Buch_Text",
 	   "Prev Owner" as "Name_Lieferant",
 	   "Prev Owner" as "Name_Lieferant",
-	   "Provisionen" as "Erlös Prov",
-	   "Erlös" as "Erlös_FZG",
-	   "Ums. Fracht und Überf." as "Erlös Überf.",
+	   "Provisionen" as "Erlös Prov",
+	   "Erlös" as "Erlös_FZG",
+	   "Ums. Fracht und Überf." as "Erlös Überf.",
 	   "Einsatz" as "Einsatz FZG",
 	   "Einsatz" as "Einsatz FZG",
 	   1 as "Menge_1",
 	   1 as "Menge_1",
 	   "DB1",
 	   "DB1",
@@ -546,15 +546,15 @@ from
 	   (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",
 	   (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 ('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 ('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 ('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 ('13')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END)) as "Provisionen",
 	   ((CASE WHEN (T13."TRANSACTION_CODE" IN ('13')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END)) as "Provisionen",
 	   T1."PREV_OWNER" as "Prev Owner",
 	   T1."PREV_OWNER" as "Prev Owner",
 	   (rtrim((((T13."DOCUMENT_NR"))))) + ' - ' + T13."TRANSACTION_CODE" + ' - ' + T13."REFERENCE" as "Buch_Text",
 	   (rtrim((((T13."DOCUMENT_NR"))))) + ' - ' + T13."TRANSACTION_CODE" + ' - ' + T13."REFERENCE" as "Buch_Text",
 	   T12."SEL_NAME" as "Sel Name_EK_vpp43",
 	   T12."SEL_NAME" as "Sel Name_EK_vpp43",
-	   (rtrim(T12."SEL_NAME")) + ' / ' + T1."PREV_OWNER" as "Einkäufer/Vorbesitzer",
+	   (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 (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')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) as "Sonst. Erlöse",
 	   T6."ZIPCODE" as "Zipcode",
 	   T6."ZIPCODE" as "Zipcode",
 	   (substring(T6."ZIPCODE", 1, 4)) as "PLZ_4",
 	   (substring(T6."ZIPCODE", 1, 4)) as "PLZ_4",
 	   (substring(T6."ZIPCODE", 1, 3)) as "PLZ_3",
 	   (substring(T6."ZIPCODE", 1, 3)) as "PLZ_3",
@@ -607,7 +607,7 @@ from
 	   ((rtrim(T1."UNIT_NUMBER")) + ' - ' + ((rtrim(T6."CUSTOMER_NUMBER")) + ' - ' + (rtrim(T6."NAME")))) + ' - ' + T1."VEHICLE_TYPE" as "FZG_Liste_1",
 	   ((rtrim(T1."UNIT_NUMBER")) + ' - ' + ((rtrim(T6."CUSTOMER_NUMBER")) + ' - ' + (rtrim(T6."NAME")))) + ' - ' + T1."VEHICLE_TYPE" as "FZG_Liste_1",
 	   T1."UNIT_NUMBER" + ' - ' + T1."OWNER" + ' - ' + (convert(varchar(50), year(T8."ORIG_INV_DATE")) + '-' + convert(varchar(50), month(T8."ORIG_INV_DATE")) + '-' + convert(varchar(50), day(T8."ORIG_INV_DATE"))) as "FZG_1",
 	   T1."UNIT_NUMBER" + ' - ' + T1."OWNER" + ' - ' + (convert(varchar(50), year(T8."ORIG_INV_DATE")) + '-' + convert(varchar(50), month(T8."ORIG_INV_DATE")) + '-' + convert(varchar(50), day(T8."ORIG_INV_DATE"))) as "FZG_1",
 	   (rtrim(T1."UNIT_NUMBER")) + ' - ' + ((rtrim(T6."CUSTOMER_NUMBER")) + ' - ' + (rtrim(T6."NAME"))) as "FZG",
 	   (rtrim(T1."UNIT_NUMBER")) + ' - ' + ((rtrim(T6."CUSTOMER_NUMBER")) + ' - ' + (rtrim(T6."NAME"))) as "FZG",
-	   CASE WHEN (T1."ECC_STATUS" = '21') THEN ('21 - Vorlauf') WHEN (T1."ECC_STATUS" = '25') THEN ('25 - für Kd best. FZG') WHEN (T1."ECC_STATUS" = '41') THEN ('41 - Bestand') WHEN (T1."ECC_STATUS" = '44') THEN ('44 - am Hof nicht fakt.') WHEN (T1."ECC_STATUS" = '64') THEN ('64 - verkauft') ELSE null END as "ECC_Status_Text",
+	   CASE WHEN (T1."ECC_STATUS" = '21') THEN ('21 - Vorlauf') WHEN (T1."ECC_STATUS" = '25') THEN ('25 - für Kd best. FZG') WHEN (T1."ECC_STATUS" = '41') THEN ('41 - Bestand') WHEN (T1."ECC_STATUS" = '44') THEN ('44 - am Hof nicht fakt.') WHEN (T1."ECC_STATUS" = '64') THEN ('64 - verkauft') ELSE null END as "ECC_Status_Text",
 	   T8."COLOUR_CODE" + ' - ' + T8."COLOUR_CF" as "Farbe",
 	   T8."COLOUR_CODE" + ' - ' + T8."COLOUR_CF" as "Farbe",
 	   T6."CUSTOMER_GROUP" + ' - ' + T7."CUST_GROUP_SPECIFY" as "Kundenart",
 	   T6."CUSTOMER_GROUP" + ' - ' + T7."CUST_GROUP_SPECIFY" as "Kundenart",
 	   (rtrim(T6."CUSTOMER_NUMBER")) + ' - ' + (rtrim(T6."NAME")) as "Kunde",
 	   (rtrim(T6."CUSTOMER_NUMBER")) + ' - ' + (rtrim(T6."NAME")) as "Kunde",
@@ -701,4 +701,4 @@ GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 4 - 4
System/OPTIMA/SQL/schema/OPTIMA/views/staging.offene_auftraege_csv_imr.sql

@@ -136,7 +136,7 @@ select "Order Number_ori_2",
 	   "Kostenstelle",
 	   "Kostenstelle",
 	   "Kundenart",
 	   "Kundenart",
 	   "Umsatzart",
 	   "Umsatzart",
-	   "Geschäftsart",
+	   "Geschäftsart",
 	   "Sel Name" as "Serviceberater",
 	   "Sel Name" as "Serviceberater",
 	   "Sel Name_Monteur" as "Monteur",
 	   "Sel Name_Monteur" as "Monteur",
 	   "Auftragsart",
 	   "Auftragsart",
@@ -163,7 +163,7 @@ select "Order Number_ori_2",
 	   "Order Number",
 	   "Order Number",
 	   "Fabrikat",
 	   "Fabrikat",
 	   1 as "DG_1",
 	   1 as "DG_1",
-	   COUNT("Status") OVER (partition by "Order Number_ori_2") as "Anzahl_Datensätze",
+	   COUNT("Status") OVER (partition by "Order Number_ori_2") as "Anzahl_Datensätze",
 	   1 / (COUNT("Status") OVER (partition by "Order Number_ori_2")) as "DG",
 	   1 / (COUNT("Status") OVER (partition by "Order Number_ori_2")) as "DG",
 	   "Order Date" as "Invoice Date",
 	   "Order Date" as "Invoice Date",
 	   "Anzahl Tage" as "Tage offen_1",
 	   "Anzahl Tage" as "Tage offen_1",
@@ -204,7 +204,7 @@ from
 	   CASE WHEN (T1."STATUS" BETWEEN '30' AND '39') THEN ('Teile') WHEN (T1."STATUS" BETWEEN '40' AND '49') THEN ('Service') WHEN (T1."STATUS" = '70') THEN ('sonst. Auftrag') WHEN (T1."STATUS" = '91') THEN ('Anfrage') ELSE null END as "Auftragsart",
 	   CASE WHEN (T1."STATUS" BETWEEN '30' AND '39') THEN ('Teile') WHEN (T1."STATUS" BETWEEN '40' AND '49') THEN ('Service') WHEN (T1."STATUS" = '70') THEN ('sonst. Auftrag') WHEN (T1."STATUS" = '91') THEN ('Anfrage') ELSE null END as "Auftragsart",
 	   T7."SEL_NAME" as "Sel Name_Monteur",
 	   T7."SEL_NAME" as "Sel Name_Monteur",
 	   T5."SEL_NAME" as "Sel Name",
 	   T5."SEL_NAME" as "Sel Name",
-	   T1."PMT_TERM" + ' - ' + T1."PAYMENT_TEXT" as "Geschäftsart",
+	   T1."PMT_TERM" + ' - ' + T1."PAYMENT_TEXT" as "Geschäftsart",
 	   CASE WHEN (T1."CUSTOMER_GROUP" BETWEEN '10' AND '59') THEN ('extern') WHEN (T1."CUSTOMER_GROUP" IN ('91','92','60','70')) THEN ('GWL') WHEN (((T1."CUSTOMER_GROUP" IN ('99')) or (T1."PMT_TERM" = 'IN')) or ((left(T1."CUSTOMER_GROUP",1)) BETWEEN 'A' AND 'Z')) THEN ('intern') ELSE null END as "Umsatzart",
 	   CASE WHEN (T1."CUSTOMER_GROUP" BETWEEN '10' AND '59') THEN ('extern') WHEN (T1."CUSTOMER_GROUP" IN ('91','92','60','70')) THEN ('GWL') WHEN (((T1."CUSTOMER_GROUP" IN ('99')) or (T1."PMT_TERM" = 'IN')) or ((left(T1."CUSTOMER_GROUP",1)) BETWEEN 'A' AND 'Z')) THEN ('intern') ELSE null END as "Umsatzart",
 	   T6."CUSTOMER_GROUP" + ' - ' + T6."CUST_GROUP_SPECIFY" as "Kundenart",
 	   T6."CUSTOMER_GROUP" + ' - ' + T6."CUST_GROUP_SPECIFY" as "Kundenart",
 	   T4."DEPARTMENT_TYPE_ID" + ' - ' + T4."DESCRIPTION" as "Kostenstelle",
 	   T4."DEPARTMENT_TYPE_ID" + ' - ' + T4."DESCRIPTION" as "Kostenstelle",
@@ -339,4 +339,4 @@ GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 3 - 3
System/OPTIMA/SQL/schema/OPTIMA/views/staging.op_as_imr.sql

@@ -65,8 +65,8 @@ select "Customer Number_2" as "Customer Number_2",
 	   "Reminder Group" as "Reminder Group",
 	   "Reminder Group" as "Reminder Group",
 	   "Reminder Date" as "Reminder Date",
 	   "Reminder Date" as "Reminder Date",
 	   "Saldo_Beleg" as "Saldo_Beleg",
 	   "Saldo_Beleg" as "Saldo_Beleg",
-	   --RSUM("Saldo_Beleg") as "Summe  (Saldo_Beleg) Nr.2",
-	   --RSUM("Saldo_Beleg") as "Summe  (Saldo_Beleg) Nr.1",
+	   RSUM("Saldo_Beleg") as "Summe  (Saldo_Beleg) Nr.2",
+	   RSUM("Saldo_Beleg") as "Summe  (Saldo_Beleg) Nr.1",
 	   "Order Number" as "Order Number",
 	   "Order Number" as "Order Number",
 	   "Status" as "Status",
 	   "Status" as "Status",
 	   "Debit Account" as "Debit Account",
 	   "Debit Account" as "Debit Account",
@@ -205,4 +205,4 @@ GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 1 - 1
System/OPTIMA/SQL/schema/OPTIMA/views/staging.op_fzg_imr.sql

@@ -109,4 +109,4 @@ GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 7 - 7
System/OPTIMA/SQL/schema/OPTIMA/views/staging.op_ohne_auftrag_o21_imr.sql

@@ -38,7 +38,7 @@ select T1."CUSTOMER_NUMBER" as "Customer Number_2",
 	   T1."SETOFF_ACCT" as "Setoff Acct",
 	   T1."SETOFF_ACCT" as "Setoff Acct",
 	   T1."COLLECT_ACCT" as "Collect Acct",
 	   T1."COLLECT_ACCT" as "Collect Acct",
 	   T1."INTEREST_CALC" as "Interest Calc",
 	   T1."INTEREST_CALC" as "Interest Calc",
-	   cast(T1."INT_VOUCHER_NO" as varchar(10)) as "Int Voucher No",
+	   T1."INT_VOUCHER_NO" as "Int Voucher No",
 	   T2."CUSTOMER_NUMBER" as "Customer Number",
 	   T2."CUSTOMER_NUMBER" as "Customer Number",
 	   T2."STATE_CODE_CUST" as "State Code Cust",
 	   T2."STATE_CODE_CUST" as "State Code Cust",
 	   T2."TRANSACT_DATE" as "Transact Date",
 	   T2."TRANSACT_DATE" as "Transact Date",
@@ -88,13 +88,13 @@ select T1."CUSTOMER_NUMBER" as "Customer Number_2",
 	   CASE WHEN (((day(((getdate())) - T1."BOOKKEEP_DATE"))) BETWEEN 0 AND 14) THEN ('< 2 Wochen') WHEN (((day(((getdate())) - T1."BOOKKEEP_DATE"))) BETWEEN 15 AND 28) THEN ('2 - 4 Wochen') WHEN (((day(((getdate())) - T1."BOOKKEEP_DATE"))) BETWEEN 29 AND 42) THEN ('4 - 6 Wochen') WHEN (((day(((getdate())) - T1."BOOKKEEP_DATE"))) BETWEEN 43 AND 84) THEN ('6 - 12 Wochen') WHEN (((day(((getdate())) - T1."BOOKKEEP_DATE"))) > 84) THEN ('> 12 Wochen') ELSE null END as "Staffel",
 	   CASE WHEN (((day(((getdate())) - T1."BOOKKEEP_DATE"))) BETWEEN 0 AND 14) THEN ('< 2 Wochen') WHEN (((day(((getdate())) - T1."BOOKKEEP_DATE"))) BETWEEN 15 AND 28) THEN ('2 - 4 Wochen') WHEN (((day(((getdate())) - T1."BOOKKEEP_DATE"))) BETWEEN 29 AND 42) THEN ('4 - 6 Wochen') WHEN (((day(((getdate())) - T1."BOOKKEEP_DATE"))) BETWEEN 43 AND 84) THEN ('6 - 12 Wochen') WHEN (((day(((getdate())) - T1."BOOKKEEP_DATE"))) > 84) THEN ('> 12 Wochen') ELSE null END as "Staffel",
 	   T2."NAME" + ' - ' + T1."CUSTOMER_NUMBER" as "Kunde",
 	   T2."NAME" + ' - ' + T1."CUSTOMER_NUMBER" as "Kunde",
 	   '' as "Lieferkunde",
 	   '' as "Lieferkunde",
-	   (len(((cast(T1."INT_VOUCHER_NO" as varchar(10)))) + 'Z') - 1) as "Anzahl Stellem Rg",
-	   (((cast(T1."INT_VOUCHER_NO" as varchar(10))))) as "Voucher_Zeichen_2",
-	   (substring(((((cast(T1."INT_VOUCHER_NO" as varchar(10)))))), 7, 1)) as "7_Stelle",
+	   (len((((T1."INT_VOUCHER_NO"))) + 'Z') - 1) as "Anzahl Stellem Rg",
+	   (((T1."INT_VOUCHER_NO"))) as "Voucher_Zeichen_2",
+	   (substring(((((T1."INT_VOUCHER_NO")))), 7, 1)) as "7_Stelle",
 	   'nicht zuzuordnen' as "Standort",
 	   'nicht zuzuordnen' as "Standort",
 	   (convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE"))) as "Datum_Zeichen",
 	   (convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE"))) as "Datum_Zeichen",
-	   (((cast(T1."INT_VOUCHER_NO" as varchar(10))))) as "Voucher_Zeichen",
-	   (substring((left(((((cast(T1."INT_VOUCHER_NO" as varchar(10)))))),7)) + ' - ' + ((left(T1."COMMENT_CU",100))) + ' - ' + ((convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE")))), 1, 100)) as "Beleg",
+	   (((T1."INT_VOUCHER_NO"))) as "Voucher_Zeichen",
+	   (substring((left(((((T1."INT_VOUCHER_NO")))),7)) + ' - ' + ((left(T1."COMMENT_CU",100))) + ' - ' + ((convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE")))), 1, 100)) as "Beleg",
 	   '1' as "Hauptbetrieb_ID",
 	   '1' as "Hauptbetrieb_ID",
 	   T7."Hauptbetrieb_Name" as "Hauptbetrieb_Name",
 	   T7."Hauptbetrieb_Name" as "Hauptbetrieb_Name",
 	   'nicht zuzuordnen' as "Standort_ID",
 	   'nicht zuzuordnen' as "Standort_ID",
@@ -108,4 +108,4 @@ GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

+ 2 - 2
System/OPTIMA/SQL/schema/OPTIMA/views/staging.schichtplan_pro_ma_neu_imr.sql

@@ -62,7 +62,7 @@ from "OPTIMA"."import"."WORKING_PERIOD" T4,
 	(("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"."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"))
 	(("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"))
 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")))
+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")))
 -- order by "Reference Name" asc
 -- order by "Reference Name" asc
 GO
 GO
 SET QUOTED_IDENTIFIER OFF 
 SET QUOTED_IDENTIFIER OFF 
@@ -70,4 +70,4 @@ GO
 SET ANSI_NULLS OFF 
 SET ANSI_NULLS OFF 
 GO
 GO
 
 
-GO
+GO

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно