Anpassungen AH Stange

- DG-Berechnung für offene Aufträge
- div. Anpassungen Service

schema/GC_DWH_LOCOSOFT/tables/TBL_SERVICE_GUV_O21.sql

@@ -0,0 +1,81 @@
+CREATE TABLE [dbo].[TBL_SERVICE_GUV_O21] (
+   [Acct Nr] [varchar](50) NULL,
+   [Ledger Accts Name] [varchar](100) NULL,
+   [Product Group] [varchar](100) NULL,
+   [Repair Group] [varchar](100) NULL,
+   [Order Number] [varchar](50) NULL,
+   [RG-Typ] [varchar](20) NULL,
+   [RG-Nummer] [varchar](50) NULL,
+   [RG-Typ-Nr] [varchar](20) NULL,
+   [Rechtseinheit_ID] [varchar](10) NULL,
+   [Rechtseinheit_Name] [varchar](50) NULL,
+   [Fabrikat_Order_By] [int] NULL,
+   [Betrieb_ID] [varchar](10) NULL,
+   [Betrieb_Name] [varchar](50) NULL,
+   [Serviceberater] [varchar](200) NULL,
+   [Umsatzart] [varchar](10) NULL,
+   [verk. Stunden] [decimal](28,8) NULL,
+   [benutzte Zeit (Auftrag)] [decimal](28,8) NULL,
+   [DG] [decimal](28,8) NULL,
+   [Zuordnung_Funktion] [varchar](50) NULL,
+   [Zuordnung_Produktbuchungsgruppe] [varchar](300) NULL,
+   [Produktbuchungsgruppe] [varchar](20) NULL,
+   [Kostenstelle] [varchar](20) NULL,
+   [Auftragsart] [varchar](20) NULL,
+   [Kunde] [varchar](250) NULL,
+   [Kundenart] [varchar](20) NULL,
+   [Order_Desc_100] [varchar](500) NULL,
+   [Auftragsposition] [varchar](50) NULL,
+   [Repair_Group_Desc] [varchar](20) NULL,
+   [Rechnung/Gutschrift] [varchar](20) NULL,
+   [FZG-Altersstaffel] [varchar](20) NULL,
+   [VK < EK] [varchar](20) NULL,
+   [PLZ_1_Stelle] [varchar](20) NULL,
+   [PLZ_2_Stelle] [varchar](20) NULL,
+   [PLZ_3_Stelle] [varchar](20) NULL,
+   [PLZ_4_Stelle] [varchar](20) NULL,
+   [PLZ] [varchar](100) NULL,
+   [Invoice Date] [datetime] NULL,
+   [Lohn] [decimal](28,8) NULL,
+   [NL Lohn] [decimal](28,8) NULL,
+   [Fremdl.] [decimal](28,8) NULL,
+   [EW Fremdl.] [decimal](28,8) NULL,
+   [Teile_gesamt] [decimal](28,8) NULL,
+   [EW Teile_gesamt] [decimal](28,8) NULL,
+   [NL Teile] [decimal](28,8) NULL,
+   [Mietw.] [decimal](28,8) NULL,
+   [Sonst.] [decimal](28,8) NULL,
+   [EW Sonst.] [decimal](28,8) NULL,
+   [EW Mietw.] [decimal](28,8) NULL,
+   [NL %] [decimal](28,8) NULL,
+   [Kulanz %] [decimal](28,8) NULL,
+   [NL Lohn %] [decimal](28,8) NULL,
+   [NL Teile %] [decimal](28,8) NULL,
+   [Kul. Lohn %] [decimal](28,8) NULL,
+   [Kul. Teile %] [decimal](28,8) NULL,
+   [verk. Std. Monteur] [decimal](28,8) NULL,
+   [Gruppe Id] [varchar](10) NULL,
+   [Woche] [varchar](10) NULL,
+   [Gruppe Name] [varchar](50) NULL,
+   [Fabrikat operativ] [varchar](50) NULL,
+   [Fabrikat_GC_Marken_Order_Line] [varchar](100) NULL,
+   [Model] [varchar](50) NULL,
+   [Position] [varchar](50) NULL,
+   [Kunde_RG] [varchar](250) NULL,
+   [Source Table] [varchar](100) NULL,
+   [Positionsart] [varchar](20) NULL,
+   [Datum] [date] NULL,
+   [Jahr/Monat] [varchar](10) NULL,
+   [Aktueller Tag] [varchar](10) NULL,
+   [Monatserster] [varchar](10) NULL,
+   [Monatsletzter] [varchar](10) NULL,
+   [MUN_DATE] [varchar](10) NULL,
+   [Mitgliedsname] [varchar](10) NULL,
+   [Beginn Geschäftsjahr] [datetime] NULL,
+   [Monat_Jahr] [varchar](10) NULL,
+   [Anz. Rg.] [varchar](10) NULL,
+   [Anz. Rg. / Auftr.] [varchar](20) NULL
+)
+
+
+GO

schema/GC_DWH_LOCOSOFT/tables/offene_Auftraege_DG_Anz_Tage.sql

@@ -18,7 +18,8 @@ CREATE TABLE [dbo].[offene_Auftraege_DG_Anz_Tage] (
    [Lohn] [decimal](28,8) NULL,
    [Teile] [decimal](28,8) NULL,
    [Sonst.] [decimal](28,8) NULL,
-   [Invoice Date] [datetime] NULL
+   [Invoice Date] [datetime] NULL,
+   [Anzahl Tage] [int] NULL
 )
 
 

schema/GC_DWH_LOCOSOFT/tables/offene_Auftraege_Teile.sql

@@ -18,7 +18,8 @@ CREATE TABLE [dbo].[offene_Auftraege_Teile] (
    [Lohn] [decimal](28,8) NULL,
    [Teile] [decimal](28,8) NULL,
    [Sonst.] [decimal](28,8) NULL,
-   [Invoice Date] [datetime] NULL
+   [Invoice Date] [datetime] NULL,
+   [Position] [varchar](250) NULL
 )
 
 

schema/GC_DWH_LOCOSOFT/tables/offene_Auftraege_Ums_ben_AW.sql

@@ -19,7 +19,8 @@ CREATE TABLE [dbo].[offene_Auftraege_Ums_ben_AW] (
    [Teile] [decimal](28,8) NULL,
    [Sonst.] [decimal](28,8) NULL,
    [ben Std] [decimal](28,8) NULL,
-   [Invoice Date] [datetime] NULL
+   [Invoice Date] [datetime] NULL,
+   [Position] [varchar](250) NULL
 )
 
 

schema/GC_ETL_LOCOSOFT/views/load.TBL_SERVICE_GUV_O21.sql

@@ -2,7 +2,7 @@ SET QUOTED_IDENTIFIER ON
 GO
 SET ANSI_NULLS ON 
 GO
-CREATE VIEW load.TBL_SERVICE_GUV_O21 AS
+CREATE   VIEW [load].[TBL_SERVICE_GUV_O21] AS
 
 SELECT convert(varchar(50), [Acct Nr])                        AS [Acct Nr]
      , convert(varchar(100), [Ledger Accts Name])             AS [Ledger Accts Name]
@@ -30,7 +30,7 @@ SELECT convert(varchar(50), [Acct Nr])                        AS [Acct Nr]
      , convert(varchar(250), Kunde)                           AS Kunde
      , convert(varchar(20), Kundenart)                        AS Kundenart
      , convert(varchar(500), Order_Desc_100)                  AS Order_Desc_100
-     , convert(varchar(20), Auftragsposition)                 AS Auftragsposition
+     , convert(varchar(50), Auftragsposition)                 AS Auftragsposition
      , convert(varchar(20), Repair_Group_Desc)                AS Repair_Group_Desc
      , convert(varchar(20), [Rechnung/Gutschrift])            AS [Rechnung/Gutschrift]
      , convert(varchar(20), [FZG-Altersstaffel])              AS [FZG-Altersstaffel]
@@ -57,16 +57,19 @@ SELECT convert(varchar(50), [Acct Nr])                        AS [Acct Nr]
      , convert(decimal(28, 8), [NL Lohn %])                   AS [NL Lohn %]
      , convert(decimal(28, 8), [NL Teile %])                  AS [NL Teile %]
      , convert(decimal(28, 8), [Kul. Lohn %])                 AS [Kul. Lohn %]
+	 , convert(decimal(28, 8), [Kul. Teile %])                AS [Kul. Teile %]
      , convert(decimal(28, 8), [verk. Std. Monteur])          AS [verk. Std. Monteur]
      , convert(varchar(10), [Gruppe Id])                      AS [Gruppe Id]
      , convert(varchar(10), Woche)                            AS Woche
      , convert(varchar(50), [Gruppe Name])                    AS [Gruppe Name]
      , convert(varchar(50), [Fabrikat operativ])              AS [Fabrikat operativ]
      , convert(varchar(100), Fabrikat_GC_Marken_Order_Line)   AS Fabrikat_GC_Marken_Order_Line
+	 , convert(varchar(50), [Model])						  AS [Model]
      , convert(varchar(50), Position)                         AS Position
      , convert(varchar(250), Kunde_RG)                        AS Kunde_RG
      , convert(varchar(100), [Source Table])                  AS [Source Table]
-     , convert(datetime, Datum)                               AS Datum
+     , convert(varchar(20), [Positionsart])                   AS [Positionsart]
+     , convert(date, Datum)                               AS Datum
      , convert(varchar(10), [Jahr/Monat])                     AS [Jahr/Monat]
      , convert(varchar(10), [Aktueller Tag])                  AS [Aktueller Tag]
      , convert(varchar(10), Monatserster)                     AS Monatserster
@@ -76,7 +79,7 @@ SELECT convert(varchar(50), [Acct Nr])                        AS [Acct Nr]
      , convert(datetime, [Beginn Geschäftsjahr])              AS [Beginn Geschäftsjahr]
      , convert(varchar(10), Monat_Jahr)                       AS Monat_Jahr
      , convert(varchar(10), [Anz. Rg.])                       AS [Anz. Rg.]
-     , convert(varchar(10), [Anz. Rg. / Auftr.])              AS [Anz. Rg. / Auftr.]
+     , convert(varchar(20), [Anz. Rg. / Auftr.])              AS [Anz. Rg. / Auftr.]
 FROM transform.TBL_SERVICE_GUV_O21
 GO
 SET QUOTED_IDENTIFIER OFF 

schema/GC_ETL_LOCOSOFT/views/load.offene_Auftraege_DG_Anz_Tage.sql

@@ -2,7 +2,7 @@ SET QUOTED_IDENTIFIER ON
 GO
 SET ANSI_NULLS ON 
 GO
-CREATE view load.offene_Auftraege_DG_Anz_Tage AS
+CREATE view [load].[offene_Auftraege_DG_Anz_Tage] AS
 select convert(varchar(10), Hauptbetrieb_ID)     AS Hauptbetrieb_ID,
        convert(varchar(50), Hauptbetrieb_Name)   AS Hauptbetrieb_Name,
        convert(varchar(10), Standort_ID)         AS Standort_ID,
@@ -22,7 +22,8 @@ select convert(varchar(10), Hauptbetrieb_ID)     AS Hauptbetrieb_ID,
        convert(decimal(28, 8), Lohn)             AS Lohn,
        convert(decimal(28, 8), Teile)            AS Teile,
        convert(decimal(28, 8), Sonst_)           AS [Sonst.],
-       convert(datetime, Invoice_Date)           AS [Invoice Date]
+       convert(datetime, Invoice_Date)           AS [Invoice Date],
+	   convert(int, Anzahl_Tage_1)				 AS [Anzahl Tage]
 from transform.offene_Auftraege_DG_Anz_Tage
 GO
 SET QUOTED_IDENTIFIER OFF 

schema/GC_ETL_LOCOSOFT/views/load.offene_Auftraege_Teile.sql

@@ -2,7 +2,7 @@ SET QUOTED_IDENTIFIER ON
 GO
 SET ANSI_NULLS ON 
 GO
-CREATE view load.offene_Auftraege_Teile AS
+CREATE view [load].[offene_Auftraege_Teile] AS
 select convert(varchar(10), Hauptbetrieb_ID)    AS Hauptbetrieb_ID,
        convert(varchar(50), Hauptbetrieb_Name)  AS Hauptbetrieb_Name,
        convert(varchar(10), Standort_ID)        AS Standort_ID,
@@ -22,7 +22,8 @@ select convert(varchar(10), Hauptbetrieb_ID)    AS Hauptbetrieb_ID,
        convert(decimal(28, 8), Lohn)            AS Lohn,
        convert(decimal(28, 8), Teile)           AS Teile,
        convert(decimal(28, 8), Sonst_)          AS [Sonst.],
-       convert(datetime, Invoice_Date)          AS [Invoice Date]
+       convert(datetime, Invoice_Date)          AS [Invoice Date],
+	   convert(varchar(250), Position)          AS Position
 from transform.offene_Auftraege_Teile
 GO
 SET QUOTED_IDENTIFIER OFF 

schema/GC_ETL_LOCOSOFT/views/load.offene_Auftraege_Ums_ben_AW.sql

@@ -25,6 +25,7 @@ SELECT convert(varchar(10), [Hauptbetrieb_ID])     AS [Hauptbetrieb_ID]
      , convert(decimal(28, 8), [Sonst_])           AS [Sonst.]
      , convert(decimal(28, 8), [ben_Std])          AS [ben Std]
      , convert(datetime, [Invoice_Date])           AS [Invoice Date]
+	 , convert(varchar(250), Position)             AS Position
 FROM [transform].[offene_Auftraege_Ums_ben_AW]
 GO
 SET QUOTED_IDENTIFIER OFF 

schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.Aftersales_Rechnungen_Focus_Group.sql

@@ -10,7 +10,7 @@ SELECT T1.Jahr
      , T1.Parts_Make_Desc
      , T1.Menge_Focus AS Menge_Focus_Kunde
      , T2.Menge_Focus AS Menge_Focus_ETL
-FROM [GC_Heinen].test.Aftersales_Rechnungen_Focus_Group T1
+FROM [GC].test.Aftersales_Rechnungen_Focus_Group T1
          FULL OUTER JOIN test.Aftersales_Rechnungen_Focus_Group T2 ON
     T1.Jahr = T2.Jahr AND
     T1.Hauptbetrieb_ID = T2.Hauptbetrieb_ID AND

schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.Aftersales_Rechnungen_ben_AW_final.sql

@@ -9,7 +9,7 @@ SELECT [T1].[Jahr]
      , [T1].[Fabrikat]
      , [T1].[ben_Std] AS [ben_Std_Kunde]
      , [T2].[ben_Std] AS [ben_Std_ETL]
-FROM [GC_Heinen].[test].[Aftersales_Rechnungen_ben_AW_final] [T1]
+FROM [GC].[test].[Aftersales_Rechnungen_ben_AW_final] [T1]
 
          FULL OUTER JOIN [GC_ETL_LOCOSOFT].[test].[Aftersales_Rechnungen_ben_AW_final] [T2] ON
     [T1].[Jahr] = [T2].[Jahr] AND

schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.Aftersales_Rechnungen_verk_AW_final.sql

@@ -9,7 +9,7 @@ SELECT T1.Jahr
      , T1.Fabrikat
      , T1.verk_Std AS verk_Std_Kunde
      , T2.verk_Std AS verk_Std_ETL
-FROM GC_Heinen.test.Aftersales_Rechnungen_verk_AW_final T1
+FROM GC.test.Aftersales_Rechnungen_verk_AW_final T1
          FULL OUTER JOIN test.Aftersales_Rechnungen_verk_AW_final T2 ON
     T1.Jahr = T2.Jahr AND
     T1.Hauptbetrieb_ID = T2.Hauptbetrieb_ID AND

schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.Aftersales_S03.sql

@@ -19,7 +19,7 @@ SELECT coalesce(T1.Periode, T2.Periode) as Periode
      , T2.verk_Std  AS verk_Std_ETL
      , T1.DG        AS DG_Kunde
      , T2.DG        AS DG_ETL
-FROM GC_Heinen.test.Aftersales_S03 T1
+FROM GC.test.Aftersales_S03 T1
          FULL OUTER JOIN test.Aftersales_S03 T2 ON
     T1.Periode = T2.Periode AND
     T1.Serviceberater = T2.Serviceberater

schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.Belege_Bilanz_SKR.sql

@@ -10,7 +10,7 @@ SELECT T1.Jahr
      , T1.Ebene73
      , T1.Ist_Bilanz AS Ist_Bilanz_Kunde
      , T2.Ist_Bilanz AS Ist_Bilanz_ETL
-FROM GC_Heinen.test.Belege_Bilanz_SKR T1
+FROM GC.test.Belege_Bilanz_SKR T1
          FULL OUTER JOIN test.Belege_Bilanz_SKR T2 ON
     T1.Jahr = T1.Jahr AND
     T1.Rechtseinheit_ID = T2.Rechtseinheit_ID AND

schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.Belege_SKR_F02.sql

@@ -8,7 +8,7 @@ SELECT T1.Periode
      , T1.Ebene1
      , T1.Ist AS Ist_Kunde
      , T1.Ist AS Ist_ETL
-FROM GC_Heinen.test.Belege_SKR_F02 T1
+FROM GC.test.Belege_SKR_F02 T1
          FULL OUTER JOIN test.Belege_SKR_F02 T2 ON
     T1.Periode = T2.Periode AND
     T1.Kostenstelle = T2.Kostenstelle AND

schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.Belege_SKR_STK.sql

@@ -10,7 +10,7 @@ SELECT T1.Jahr
      , T1.Fabrikat
      , T1.Menge AS Menge_Kunde
      , T1.Menge AS Menge_ETL
-FROM GC_Heinen.test.Belege_SKR_STK T1
+FROM GC.test.Belege_SKR_STK T1
          FULL OUTER JOIN test.Belege_SKR_STK T2 ON
     T1.Jahr = T1.Jahr AND
     T1.Rechtseinheit_ID = T2.Rechtseinheit_ID AND

schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.Belege_SKR_STK_F02.sql

@@ -8,7 +8,7 @@ SELECT T1.Periode
      , T1.Fabrikat
      , T1.Ist AS Ist_Kunde
      , T2.Ist AS Ist_ETL
-FROM GC_Heinen.test.Belege_SKR_STK_F02 T1
+FROM GC.test.Belege_SKR_STK_F02 T1
          FULL OUTER JOIN test.Belege_SKR_STK_F02 T2 ON
     T1.Periode = T2.Periode AND
     T1.Kostenstelle = T2.Kostenstelle AND

schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.NW_GW_VK_V03.sql

@@ -15,7 +15,7 @@ SELECT T1.Periode
      , T2.Einsatz_FZG AS Einsatz_FZG_ETL
      , T2.Erlös_Prov_ AS Erlös_Prov__ETL
      , T2.Standtage   AS Standtage_ETL
-FROM GC_Heinen.test.NW_GW_VK_V03 T1
+FROM GC.test.NW_GW_VK_V03 T1
          FULL OUTER JOIN test.NW_GW_VK_V03 T2 ON
     T1.Periode = T2.Periode AND
     T1.Verkäufer = T2.Verkäufer

schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.OP_aus_LOC_Belege_gesamt_OP01.sql

@@ -7,7 +7,7 @@ SELECT T1.Standort_Name
      , T1.Kostenstelle
      , T1.offen AS offen_Kunde
      , T2.offen AS offen_ETL
-FROM GC_Heinen.test.OP_aus_LOC_Belege_gesamt_OP01 T1
+FROM GC.test.OP_aus_LOC_Belege_gesamt_OP01 T1
          FULL OUTER JOIN test.OP_aus_LOC_Belege_gesamt_OP01 T2 ON
     T1.Standort_Name = T2.Standort_Name AND
     T1.Kostenstelle = T2.Kostenstelle

schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.Zeit_gesamt_Z03.sql

@@ -23,7 +23,7 @@ SELECT T1.Periode
      , T2.Sollzeit    AS Sollzeit_ETL
      , T1.Prod_Faktor AS Prod_Faktor_Kunde
      , T2.Prod_Faktor AS Prod_Faktor_ETL
-from GC_Heinen.test.Zeit_gesamt_Z03 T1
+from GC.test.Zeit_gesamt_Z03 T1
          FULL OUTER JOIN test.Zeit_gesamt_Z03 T2 ON
     T1.Periode = T2.Periode AND
     T1.Standort_Name = T2.Standort_Name AND

schema/GC_ETL_LOCOSOFT/views/transform.Aftersales_Rechnungen_Focus_Group.sql

@@ -143,7 +143,9 @@ FROM [LOCOSOFT]."dbo"."invoices" [T1]
     AND ([T9]."model_code" = [T5]."model_code")
          LEFT JOIN [LOCOSOFT]."dbo"."labours" [T7] ON ([T7]."invoice_number" = [T1]."invoice_number")
     AND ([T7]."invoice_type" = [T1]."invoice_type")
-         LEFT JOIN "data"."GC_Fokus_Produktgruppen" [T8] ON ([T7]."labour_operation_id" = [T8]."Parts_Number")
+ --        LEFT JOIN "data"."GC_Fokus_Produktgruppen" [T8] ON ([T7]."labour_operation_id" = [T8]."Parts_Number")
+	INNER JOIN "data"."GC_Fokus_Produktgruppen" [T8] 
+		 ON (LTRIM([T7]."labour_operation_id") = LTRIM([T8]."Parts_Number"))
          LEFT JOIN [LOCOSOFT]."dbo"."charge_type_descriptions" [T6] ON ([T6]."type" = [T7]."charge_type")
     AND ([T6]."client_db" = [T7]."client_db")
          LEFT JOIN "transform_ims"."Serviceberater_Rechnung" [T2] ON [T1]."invtype_invnr" = [T2].[Invoice_Type_Invoice_Number]

schema/GC_ETL_LOCOSOFT/views/transform.LOC_BELEGE_DETAIL.sql

@@ -2,7 +2,7 @@ SET QUOTED_IDENTIFIER ON
 GO
 SET ANSI_NULLS ON 
 GO
-CREATE VIEW [transform].[LOC_BELEGE_DETAIL] AS
+CREATE   VIEW [transform].[LOC_BELEGE_DETAIL] AS
 SELECT [LOC_Belege].[Rechtseinheit] AS [Hauptbetrieb_imr]
      , [LOC_Belege].[Betrieb] AS [Standort_imr]
      , [GC_Department].[Hauptbetrieb_ID] AS [Rechtseinheit_ID]
@@ -106,7 +106,7 @@ FROM [transform_imr].[LOC_Belege] [LOC_Belege]
     AND [LOC_Belege].[Betrieb] = [GC_Department].[Standort]
          LEFT OUTER JOIN [data].[GC_Marken] [GC_Marken] ON [LOC_Belege].[Skr51 Make] = [GC_Marken].[Marke_FIBU]
     AND [LOC_Belege].[Rechtseinheit] = [GC_Marken].[Client_DB]
-WHERE [GC_Department].[Hauptbetrieb_ID] = '1'
+--WHERE [GC_Department].[Hauptbetrieb_ID] = '1'
 GO
 SET QUOTED_IDENTIFIER OFF 
 GO

schema/GC_ETL_LOCOSOFT/views/transform.TBL_SERVICE_GUV_O21.sql

@@ -13,16 +13,16 @@ SELECT ' ' AS [Acct Nr]
      , [Rg].[Invoice_Type_Invoice_Number] AS [RG-Typ-Nr]
      , [Rg].[Hauptbetrieb Id] AS [Rechtseinheit_ID]
      , [Rg].[Hauptbetrieb Name] AS [Rechtseinheit_Name]
-     , ' ' AS [Fabrikat_Order_By]
+     , ISNULL([GC_Marke].[Order_by], '99') AS [Fabrikat_Order_By]
      , [Rg].[Standort Id] AS [Betrieb_ID]
      , [Rg].[Standort Name] AS [Betrieb_Name]
      , [Rg].[Serviceberater] AS [Serviceberater]
      , [Rg].[Umsatzart] AS [Umsatzart]
      , [Rg].[Time Units] / 10 AS [verk. Stunden]
 --	  ,COUNT(Invoice_Type_Invoice_Number) OVER (PARTITION BY [Order Number]) AS "Anzahl"
-     , cast([ben_AW].[Summe_Duration_Minutes] / 60.0 AS decimal(26, 12)) AS [benutzte Zeit (Auftrag)]
---	  ,CAST(ben_AW.Summe_Duration_Minutes / 60.0 AS DECIMAL(26,12)) / COUNT(Invoice_Type_Invoice_Number) OVER (PARTITION BY [Order Number]) AS [benutzte Zeit (Auftrag)]
-     , 0 AS [DG]
+--   , cast([ben_AW].[Summe_Duration_Minutes] / 60.0 AS decimal(26, 12)) AS [benutzte Zeit (Auftrag)]
+	  ,CAST(ben_AW.Summe_Duration_Minutes / 60.0 AS DECIMAL(26,12)) / COUNT(Invoice_Type_Invoice_Number) OVER (PARTITION BY [Order Number]) AS [benutzte Zeit (Auftrag)]
+     , 1.0 / COUNT(Invoice_Type_Invoice_Number) OVER (PARTITION BY [Order Number]) AS [DG]
      , ' ' AS [Zuordnung_Funktion]
      , [Rg].[Zuordnung] AS [Zuordnung_Produktbuchungsgruppe]
      , [Rg].[Produktbuchungsgruppe] AS [Produktbuchungsgruppe]
@@ -55,12 +55,20 @@ SELECT ' ' AS [Acct Nr]
      , 0 AS [EW Mietw.]
      , [Rg].[Rebate Percent] AS [NL %]
      , [Rg].[Goodwill Percent] AS [Kulanz %]
-     , CASE
-           WHEN [Rg].[Source Table] = 'labours' AND [Rg].[NL Lohn] <> 0 THEN [Rg].[Rebate Percent]
+ --    , CASE
+ --          WHEN [Rg].[Source Table] = 'labours' AND [Rg].[NL Lohn] <> 0 THEN [Rg].[Rebate Percent]
+ --          ELSE NULL
+ --      END AS [NL Lohn %]
+	   , CASE
+           WHEN [Rg].[Source Table] = 'labours' AND [Rg].[NL Lohn] <> 0 THEN ([Rg].[NL Lohn] / ([Rg].[NL Lohn] + [Rg].[Lohn]) *100)
            ELSE NULL
        END AS [NL Lohn %]
-     , CASE
-           WHEN [Rg].[Source Table] = 'parts' AND [Rg].[NL Teile] <> 0 THEN [Rg].[Rebate Percent]
+ --    , CASE
+ --          WHEN [Rg].[Source Table] = 'parts' AND [Rg].[NL Teile] <> 0 THEN [Rg].[Rebate Percent]
+ --          ELSE NULL
+ --      END AS [NL Teile %]
+	    , CASE
+           WHEN [Rg].[Source Table] = 'parts' AND [Rg].[NL Teile] <> 0 THEN ([Rg].[NL Teile] / ([Rg].[NL Teile] + [Rg].[Teile]) *100)
            ELSE NULL
        END AS [NL Teile %]
      , CASE
@@ -76,10 +84,16 @@ SELECT ' ' AS [Acct Nr]
      , ' ' AS [Woche]
      , [Rg].[Standort Name] AS [Gruppe Name]
      , [Rg].[Fabrikat] AS [Fabrikat operativ]
-     , ' ' AS [Fabrikat_GC_Marken_Order_Line]
+     , ISNULL([GC_Marke].[Fabrikat], 'Fremd') AS [Fabrikat_GC_Marken_Order_Line]
+	 , [Rg].[Model] AS [Model]
      , [Rg].[Position] AS [Position]
      , [Rg].[Kunde] AS [Kunde_RG]
      , [Rg].[Source Table]
+	 , CASE 
+		WHEN [Rg].[Source Table] = 'labours' THEN 'Arbeit'
+		WHEN [Rg].[Source Table] = 'parts' THEN 'Teile'
+	   ELSE NULL
+	   END AS Positionsart
      , cast([Rg].[Invoice Date] AS date) AS [Datum]
      , format([Rg].[Invoice Date], 'yyyy/MM') AS [Jahr/Monat]
      , cast(getdate() AS date) AS [Aktueller Tag]
@@ -98,9 +112,14 @@ SELECT ' ' AS [Acct Nr]
      , datefromparts(year([Rg].[Invoice Date]), 1, 1) AS [Beginn Geschäftsjahr]
      , format([Rg].[Invoice Date], 'MMM', 'de') + './' + format([Rg].[Invoice Date], 'yyyy', 'de') AS [Monat_Jahr]
      , [AnzahlRechnungen].[Anz. Rg.] AS [Anz. Rg.]
-     , 'Anz. Rg.: ' + cast([AnzahlRechnungen].[Anz. Rg.] AS varchar(10)) AS [Anz. Rg. / Auftr.]
+--     , 'Anz. Rg.: ' + cast([AnzahlRechnungen].[Anz. Rg.] AS varchar(10)) AS [Anz. Rg. / Auftr.]
+, CONCAT(
+    'Anz. Rg.: ',
+    LTRIM(STR([AnzahlRechnungen].[Anz. Rg.], 20, 0))
+  ) AS [Anz. Rg. / Auftr.]
 FROM [transform_imr].[Aftersales_Rechnungen_operativ] [Rg]
          LEFT JOIN [transform_ims].[ben_AW_Order_Number] [ben_AW] ON [ben_AW].[Order_Number] = [Rg].[Order Number]
+		 LEFT JOIN [data].[GC_Marken] [GC_Marke] ON [GC_Marke].[Description] = [Rg].[Fabrikat]
          CROSS APPLY (SELECT count(DISTINCT [Rg2].[Invoice Number]) AS [Anz. Rg.]
                       FROM [transform_imr].[Aftersales_Rechnungen_operativ] [Rg2]
                       WHERE [Rg2].[Order Number] = [Rg].[Order Number]) AS [AnzahlRechnungen]

schema/GC_ETL_LOCOSOFT/views/transform.offene_Auftraege_DG_Anz_Tage.sql

@@ -30,6 +30,7 @@ SELECT "offene_Auftraege_DG_Anz_Tage"."Hauptbetrieb" AS [Hauptbetrieb_imr]
      , 0.0 AS "Teile"
      , 0.0 AS "Sonst_"
      , "offene_Auftraege_DG_Anz_Tage"."Order Date" AS "Invoice_Date"
+	 , "offene_Auftraege_DG_Anz_Tage"."Anzahl Tage_1" AS "Anzahl_Tage_1"
 FROM [transform_imr]."offene_Auftraege_DG_Anz_Tage" "offene_Auftraege_DG_Anz_Tage"
          LEFT OUTER JOIN "data"."GC_Department" "GC_Department" ON "offene_Auftraege_DG_Anz_Tage"."Hauptbetrieb" = "GC_Department"."Hauptbetrieb" AND "offene_Auftraege_DG_Anz_Tage"."Standort" = "GC_Department"."Standort"
          LEFT OUTER JOIN "data"."GC_Marken" "GC_Marken" ON "offene_Auftraege_DG_Anz_Tage"."Fabrikat" = "GC_Marken"."Description"

schema/GC_ETL_LOCOSOFT/views/transform.offene_Auftraege_Teile.sql

@@ -30,6 +30,16 @@ SELECT "offene_Auftraege_Teile"."Hauptbetrieb" AS [Hauptbetrieb_imr]
      , "offene_Auftraege_Teile"."Teile" AS "Teile"
      , 0.0 AS "Sonst_"
      , "offene_Auftraege_Teile"."Order Date" AS "Invoice_Date"
+	 , "offene_Auftraege_Teile"."Order Position" AS "Order Position"
+	 , "offene_Auftraege_Teile"."Part Number" AS "Part Number"
+	 , "offene_Auftraege_Teile"."Text Line" AS "Text Line"
+	 , LTRIM(RTRIM(
+      CAST("offene_Auftraege_Teile"."Order Position" AS VARCHAR(20))
+      + ' - '
+      + ISNULL(LTRIM(RTRIM("offene_Auftraege_Teile"."Part Number")), '')
+      + ' - '
+      + ISNULL(LTRIM(RTRIM("offene_Auftraege_Teile"."Text Line")), '')
+       )) AS "Position"
 FROM [transform_imr]."offene_Auftraege_Teile" "offene_Auftraege_Teile"
          LEFT OUTER JOIN "data"."GC_Department" "GC_Department" ON "offene_Auftraege_Teile"."Hauptbetrieb" = "GC_Department"."Hauptbetrieb" AND "offene_Auftraege_Teile"."Standort" = "GC_Department"."Standort"
          LEFT OUTER JOIN "data"."GC_Marken" "GC_Marken" ON "offene_Auftraege_Teile"."Fabrikat" = "GC_Marken"."Description"

schema/GC_ETL_LOCOSOFT/views/transform.offene_Auftraege_Ums_ben_AW.sql

@@ -39,6 +39,17 @@ SELECT "offene_Auftraege_Ums_ben_AW"."Hauptbetrieb" AS [Hauptbetrieb_imr]
      , 0 AS "Sonst_"
      , "offene_Auftraege_Ums_ben_AW"."ben. Std" AS "ben_Std"
      , "offene_Auftraege_Ums_ben_AW"."Order Date" AS "Invoice_Date"
+     , "offene_Auftraege_Ums_ben_AW"."labour_operation_id" AS "labour_operation_id"
+	 , "offene_Auftraege_Ums_ben_AW"."charge_type" AS "charge_type"
+	 , "offene_Auftraege_Ums_ben_AW"."Order Position_Labours" AS "Order Position_Labours"
+	 , "offene_Auftraege_Ums_ben_AW"."Text Line" AS "Text Line"
+	 , LTRIM(RTRIM(
+      CAST("offene_Auftraege_Ums_ben_AW"."Order Position_Labours" AS VARCHAR(20))
+      + ' - '
+      + ISNULL(LTRIM(RTRIM("offene_Auftraege_Ums_ben_AW"."labour_operation_id")), '')
+      + ' - '
+      + ISNULL(LTRIM(RTRIM("offene_Auftraege_Ums_ben_AW"."Text Line")), '')
+      )) AS "Position"
 FROM [transform_imr]."offene_Auftraege_Ums_ben_AW" "offene_Auftraege_Ums_ben_AW"
          LEFT OUTER JOIN "data"."GC_Department" "GC_Department" ON "offene_Auftraege_Ums_ben_AW"."Hauptbetrieb" = "GC_Department"."Hauptbetrieb" AND "offene_Auftraege_Ums_ben_AW"."Standort" = "GC_Department"."Standort"
          LEFT OUTER JOIN "data"."GC_Marken" "GC_Marken" ON "offene_Auftraege_Ums_ben_AW"."Fabrikat" = "GC_Marken"."Description"

schema/GC_ETL_LOCOSOFT/views/transform_imr.Aftersales_Rechnungen_operativ.sql

@@ -5478,7 +5478,7 @@ FROM (SELECT (left(((([T1]."invoice_type"))), 1)) + '_' + (left(((([T1]."invoice
           AND [T9]."client_db" = [T7]."client_db"
                LEFT JOIN [transform_ims].[Serviceberater_Rechnung] [T2] ON [T1]."invtype_invnr" = [T2]."Invoice_Type_Invoice_Number"
                LEFT JOIN [data].[GC_Department] [T6] ON convert(varchar, [T1]."subsidiary") = [T6]."Standort"
-          AND [T1]."client_db" = [T6]."Hauptbetrieb_ID"
+          AND [T1]."client_db" = [T6]."Hauptbetrieb"
                LEFT JOIN [data].[GC_Charge_Type] [T8] ON [T8]."type" = [T7]."charge_type"
           AND [T8]."client_db" = [T7]."client_db"
                LEFT JOIN [LOCOSOFT].[dbo].[orders] [T11] ON [T1]."client_db" = [T11]."client_db"

schema/GC_ETL_LOCOSOFT/views/transform_imr.kontenrahmen.sql

@@ -110,7 +110,7 @@ SELECT T1."KONTO_NR" AS "Konto Nr",
 	T1."KONTO_NR" AS "Acct Nr",
 	T1."KONTO_NR" + ' - ' + T1."KONTO_BEZEICHNUNG" AS "Konto",
 	(left(T1."KONTO_NR", 1)) AS "Susa"
-FROM OPENROWSET(BULK 'C:\GlobalCube_Locosoft\GCStruct_SKR51\Kontenrahmen\Kontenrahmen.csv', FORMATFILE = 'C:\GlobalCube_Locosoft\GCStruct_SKR51\Kontenrahmen\Kontenrahmen.csv.xml', FIRSTROW = 2) T1
+FROM OPENROWSET(BULK 'C:\GlobalCube\GCStruct_SKR51\Kontenrahmen\Kontenrahmen.csv', FORMATFILE = 'C:\GlobalCube\GCStruct_SKR51\Kontenrahmen\Kontenrahmen.csv.xml', FIRSTROW = 2) T1
 WHERE (((left(T1."KONTO_NR", 1))) <> '9')
 GO
 SET QUOTED_IDENTIFIER OFF 

schema/GC_ETL_LOCOSOFT/views/transform_imr.kontenrahmen_gc_struct_skr.sql

@@ -110,7 +110,7 @@ SELECT T1."KONTO_NR" AS "Konto Nr",
 	T1."KONTO_NR" AS "Acct Nr",
 	T1."KONTO_NR" + ' - ' + T1."KONTO_BEZEICHNUNG" AS "Konto",
 	(left(T1."KONTO_NR", 1)) AS "Susa"
-FROM OPENROWSET(BULK 'C:\GlobalCube_Locosoft\GCStruct_SKR51\Kontenrahmen\Kontenrahmen.csv', FORMATFILE = 'C:\GlobalCube_Locosoft\GCStruct_SKR51\Kontenrahmen\Kontenrahmen.csv.xml', FIRSTROW = 2) T1
+FROM OPENROWSET(BULK 'C:\GlobalCube\GCStruct_SKR51\Kontenrahmen\Kontenrahmen.csv', FORMATFILE = 'C:\GlobalCube\GCStruct_SKR51\Kontenrahmen\Kontenrahmen.csv.xml', FIRSTROW = 2) T1
 WHERE (((left(T1."KONTO_NR", 1))) <> '9')
 GO
 SET QUOTED_IDENTIFIER OFF 

schema/GC_ETL_LOCOSOFT/views/transform_imr.offene_auftraege_dg_anz_tage.sql

@@ -48,12 +48,12 @@ SELECT c51 AS "Order Number_ori",
 	c53 AS "Model",
 	1 AS "DG_1",
 	COUNT(c89) OVER (PARTITION BY c51) AS "DG_2",
-	1 / (COUNT(c89) OVER (PARTITION BY c51)) AS "DG",
+	1.0 / (COUNT(c89) OVER (PARTITION BY c51)) AS "DG",
 	c52 AS "Anzahl Tage_1",
 	(c52) / (COUNT(c89) OVER (PARTITION BY c51)) AS "Anzahl Tage"
 FROM (
 	SELECT T1."order_number" AS c51,
-		(day((getdate()) - T1."order_date")) AS c52,
+		1.0 * datediff(day,T1."order_date",getdate()) AS c52,
 		(substring((upper(T8."description")), 1, 3)) AS c53,
 		T8."description" AS c54,
 		T7."description" AS c55,
@@ -94,7 +94,7 @@ FROM (
 			ELSE ((substring((convert(VARCHAR(50), T1."order_taking_employee_no")), 1, 4)) + ' - ' + T4."name")
 			END AS c67,
 		T4."name" AS c68,
-		'0' + (convert(VARCHAR(50), T1."subsidiary")) AS c69,
+		'' + (convert(VARCHAR(50), T1."subsidiary")) AS c69,
 		CASE 
 			WHEN (('0' + (convert(VARCHAR(50), T1."subsidiary"))) IN ('015                                                                                                                                                                                                                                                            '))
 				THEN ('15')

schema/GC_ETL_LOCOSOFT/views/transform_imr.offene_auftraege_teile.sql

@@ -104,7 +104,7 @@ FROM (
 			ELSE ((substring((convert(VARCHAR(50), order_positions."order_taking_employee_no")), 1, 4)) + ' - ' + employees."name")
 			END AS c76,
 		employees."name" AS c77,
-		'0' + (convert(VARCHAR(50), order_positions."subsidiary")) AS c78,
+		'' + (convert(VARCHAR(50), order_positions."subsidiary")) AS c78,
 		CASE 
 			WHEN (('0' + (convert(VARCHAR(50), order_positions."subsidiary"))) IN ('015                                                                                                                                                                                                                                                            '))
 				THEN ('15')

schema/GC_ETL_LOCOSOFT/views/transform_imr.offene_auftraege_ums_ben_aw.sql

@@ -54,8 +54,12 @@ SELECT c55 AS "Order Number_ori",
 	c60 AS "Text Line",
 	c59 AS "Order Number_ben_AW",
 	c58 AS "Summe Duration Minutes_ben_AW",
-	c57 / (COUNT(c99) OVER (PARTITION BY c55)) AS "ben. Std",
-	c56 AS "Umsatz Lohn"
+	--1.0 * c57 / (COUNT(c99) OVER (PARTITION BY c55)) AS "ben. Std",
+	--CAST(1.0 * c57 / COUNT(c99) OVER (PARTITION BY c55) AS DECIMAL(18,6)) AS "ben. Std",
+	CAST(1.0 * c58/60 / COUNT(c99) OVER (PARTITION BY c55) AS DECIMAL(18,6)) AS "ben. Std",
+	c56 AS "Umsatz Lohn",
+	[labour_operation_id] AS [labour_operation_id],
+	[charge_type] AS [charge_type]
 FROM (
 	SELECT T1."order_number" AS c55,
 		T2."net_price_in_order" AS c56,
@@ -105,7 +109,7 @@ FROM (
 			ELSE ((substring((convert(VARCHAR(50), T1."order_taking_employee_no")), 1, 4)) + ' - ' + T4."name")
 			END AS c77,
 		T4."name" AS c78,
-		'0' + (convert(VARCHAR(50), T1."subsidiary")) AS c79,
+		'' + (convert(VARCHAR(50), T1."subsidiary")) AS c79,
 		CASE 
 			WHEN (('0' + (convert(VARCHAR(50), T1."subsidiary"))) IN ('015                                                                                                                                                                                                                                                            '))
 				THEN ('15')
@@ -131,7 +135,9 @@ FROM (
 		T2."is_invoiced" AS c98,
 		T1."subsidiary" AS c99,
 		T2."labour_type" AS c100,
-		T1."order_position" AS c101
+		T1."order_position" AS c101,
+		T2."labour_operation_id" AS [labour_operation_id],
+		T2."charge_type" AS [charge_type]
 	FROM (
 		(
 			(
@@ -159,6 +165,7 @@ FROM (
 				AND (T2."net_price_in_order" IS NOT NULL)
 				)
 			AND (T2."labour_type" <> 'F')
+			AND (T2."charge_type" <> '0')
 			)
 		-- order by c55 asc
 	) D1

schema/GC_ETL_LOCOSOFT/views/transform_ims.Kontenrahmen.sql

@@ -110,7 +110,7 @@ SELECT T1."KONTO_NR" AS "Konto Nr",
 	T1."KONTO_NR" AS "Acct Nr",
 	T1."KONTO_NR" + ' - ' + T1."KONTO_BEZEICHNUNG" AS "Konto",
 	(left(T1."KONTO_NR", 1)) AS "Susa"
-FROM OPENROWSET(BULK 'C:\GlobalCube_Locosoft\GCStruct_SKR51\Kontenrahmen\Kontenrahmen.csv', FORMATFILE = 'C:\GlobalCube_Locosoft\GCStruct_SKR51\Kontenrahmen\Kontenrahmen.csv.xml', FIRSTROW = 2) T1
+FROM OPENROWSET(BULK 'C:\GlobalCube\GCStruct_SKR51\Kontenrahmen\Kontenrahmen.csv', FORMATFILE = 'C:\GlobalCube\GCStruct_SKR51\Kontenrahmen\Kontenrahmen.csv.xml', FIRSTROW = 2) T1
 WHERE (((left(T1."KONTO_NR", 1))) <> '9')
 GO
 SET QUOTED_IDENTIFIER OFF 

schema/GC_ETL_LOCOSOFT/views/xtract.order_positions.sql

@@ -1,38 +0,0 @@
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-CREATE   VIEW [xtract].[order_positions] AS
-
-SELECT [client_db]
-     , [order_number]
-     , [order_position]
-     , [labour_type]
-     , [subsidiary]
---      , [is_invoiced]
---      , [invoice_type]
---      , [invoice_number]
-     , [order_date]
---      , [estimated_inbound_time]
---      , [estimated_outbound_time]
---      , [order_print_date]
-     , [order_taking_employee_no]
---      , [order_delivery_employee_no]
-     , [vehicle_number]
---      , [dealer_vehicle_type]
---      , [dealer_vehicle_number]
---      , [order_mileage]
-     , [order_customer]
---      , [paying_customer]
---      , [holder_number]
---      , [parts_rebate_group_sell]
---      , [clearing_delay_type]
-
-FROM [LOCOSOFT].[dbo].[order_positions]
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS OFF 
-GO
-
-GO

schema/LOCOSOFT/users/gaps.sql

@@ -1,5 +1,5 @@
 IF SUSER_ID('gaps') IS NULL
-				BEGIN CREATE LOGIN gaps WITH PASSWORD = 0x02004264FF86CEFCB5B6C8272E1D83BA925BDA302E429CC3116B666F99B45975240322CF5D5B7ED1A4FDE278DF15BC87EA11BE7586BB59B77391F3A9198845E593BFAB64F9E1 HASHED END
+				BEGIN CREATE LOGIN gaps WITH PASSWORD = 0x0200B564EAAC5C8AEE9E8F510C2972ADBB14D10AC058294AD865419CC821FDBA939E01679F516CD7B4D5D15C52E56DD2DBFD604C93FB8F81AD86F4087D378F26FB4236CAA468 HASHED END
 CREATE USER [gaps] FOR LOGIN [gaps] WITH DEFAULT_SCHEMA = [dbo]
 /*ALTER ROLE db_ddladmin ADD MEMBER gaps*/ exec sp_addrolemember 'db_ddladmin', 'gaps'
 /*ALTER ROLE db_datareader ADD MEMBER gaps*/ exec sp_addrolemember 'db_datareader', 'gaps'

schema/LOCOSOFT/views/data.Arbeitstage.sql

@@ -1,41 +0,0 @@
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-CREATE view data.Arbeitstage as
-    SELECT [bundeslaender_id],
-           [datum],
-           [wochentage_id],
-           [arbeitstag_mofr],
-           [zaehler_mofr],
-           [summe_mofr],
-           RANK() OVER (
-               PARTITION BY bundeslaender_id,
-               year(datum),
-               arbeitstag_mofr ORDER BY datum
-               ) AS [zaehler_jahr_mofr],
-           SUM([arbeitstag_mofr]) OVER (
-               PARTITION BY bundeslaender_id,
-               year(datum)
-               ) AS [summe_jahr_mofr],
-           [arbeitstag_mosa],
-           [zaehler_mosa],
-           [summe_mosa],
-           RANK() OVER (
-               PARTITION BY bundeslaender_id,
-               year(datum),
-               arbeitstag_mosa ORDER BY datum
-               ) AS [zaehler_jahr_mosa],
-           SUM([arbeitstag_mosa]) OVER (
-               PARTITION BY bundeslaender_id,
-               year(datum)
-               ) AS [summe_jahr_mosa],
-           [feiertage_id]
-    FROM [GC_STAGING_LOCOSOFT].[data].[Arbeitstage]
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS OFF 
-GO
-
-GO

schema/LOCOSOFT/views/data.GC_Config_Pivot.sql

@@ -1,14 +0,0 @@
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-CREATE view data.GC_Config_Pivot as
-    SELECT *
-    FROM GC_STAGING_LOCOSOFT.data.GC_Config_Pivot
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS OFF 
-GO
-
-GO