3
0

6 کامیت‌ها 1aa3847004 ... 2b14e6cd7b

نویسنده SHA1 پیام تاریخ
  Stange C11 2b14e6cd7b Test-Abfragen 1 هفته پیش
  Stange C11 b9982a08f3 Feld "Monteur und Stunden" bzw. "Monteur" für Service 1 هفته پیش
  Stange C11 ec50d814ac Service GUV ergänzt, Charge Types 1 ماه پیش
  Stange C11 c59150f37b Package angepasst 1 ماه پیش
  Stange C11 2fa46dc44f Anpassungen AH Stange 1 ماه پیش
  Stange C11 ad2d7adef0 data-Tabellen gelöscht und als Views auf GC 1 ماه پیش
85فایلهای تغییر یافته به همراه1055 افزوده شده و 410 حذف شده
  1. 0 0
      Package/IDLog.xml
  2. 0 0
      Package/log.xml
  3. 1 1
      Package/model.xml
  4. 1 1
      Package/session-log-backup.xml
  5. 0 0
      Package/session-log.xml
  6. 7 0
      exec/CREATE_DWH_komplett.sql
  7. 9 0
      exec/INSERT_Charge_Types.sql
  8. 5 0
      schema/GC/schemas.sql
  9. 20 0
      schema/GC/views/test.Aftersales_Rechnungen_Focus_Group.sql
  10. 19 0
      schema/GC/views/test.Aftersales_Rechnungen_ben_AW_final.sql
  11. 19 0
      schema/GC/views/test.Aftersales_Rechnungen_verk_AW_final.sql
  12. 61 0
      schema/GC/views/test.Aftersales_S03.sql
  13. 20 0
      schema/GC/views/test.Belege_Bilanz_SKR.sql
  14. 27 0
      schema/GC/views/test.Belege_SKR_F02.sql
  15. 20 0
      schema/GC/views/test.Belege_SKR_STK.sql
  16. 23 0
      schema/GC/views/test.Belege_SKR_STK_F02.sql
  17. 23 0
      schema/GC/views/test.NW_GW_VK_V03.sql
  18. 37 0
      schema/GC/views/test.OP_aus_LOC_Belege_gesamt_OP01.sql
  19. 126 0
      schema/GC/views/test.Zeit_gesamt_Z03.sql
  20. 48 0
      schema/GC/views/test.offene_Auftraege_gesamt_S08.sql
  21. 1 0
      schema/GC_DWH_LOCOSOFT/tables/Aftersales_Rechnungen_ben_AW_final.sql
  22. 82 0
      schema/GC_DWH_LOCOSOFT/tables/TBL_SERVICE_GUV_O21.sql
  23. 2 1
      schema/GC_DWH_LOCOSOFT/tables/offene_Auftraege_DG_Anz_Tage.sql
  24. 2 1
      schema/GC_DWH_LOCOSOFT/tables/offene_Auftraege_Teile.sql
  25. 3 1
      schema/GC_DWH_LOCOSOFT/tables/offene_Auftraege_Ums_ben_AW.sql
  26. 1 1
      schema/GC_DWH_LOCOSOFT/users/gaps.sql
  27. 0 15
      schema/GC_ETL_LOCOSOFT/tables/data.Arbeitstage.sql
  28. 0 9
      schema/GC_ETL_LOCOSOFT/tables/data.GC_Charge_Type.sql
  29. 0 9
      schema/GC_ETL_LOCOSOFT/tables/data.GC_Config.sql
  30. 0 18
      schema/GC_ETL_LOCOSOFT/tables/data.GC_Department.sql
  31. 0 11
      schema/GC_ETL_LOCOSOFT/tables/data.GC_Fokus_Produktgruppen.sql
  32. 0 13
      schema/GC_ETL_LOCOSOFT/tables/data.GC_Marken.sql
  33. 0 19
      schema/GC_ETL_LOCOSOFT/tables/data.GC_Mitarbeiter.sql
  34. 0 11
      schema/GC_ETL_LOCOSOFT/tables/data.GC_Produktbuchungsgruppen.sql
  35. 0 111
      schema/GC_ETL_LOCOSOFT/tables/data.Kontenrahmen_GC_Struct_SKR.sql
  36. 0 8
      schema/GC_ETL_LOCOSOFT/tables/data.Kontenrahmen_SKR_Vorlage.sql
  37. 0 20
      schema/GC_ETL_LOCOSOFT/tables/data.SKR_Konten_Stk_manuell.sql
  38. 0 20
      schema/GC_ETL_LOCOSOFT/tables/data.SKR_Statistik_Stk_manuell.sql
  39. 23 0
      schema/GC_ETL_LOCOSOFT/views/data.Arbeitstage.sql
  40. 17 0
      schema/GC_ETL_LOCOSOFT/views/data.GC_Charge_Type.sql
  41. 4 3
      schema/GC_ETL_LOCOSOFT/views/data.GC_Config.sql
  42. 24 0
      schema/GC_ETL_LOCOSOFT/views/data.GC_Department.sql
  43. 19 0
      schema/GC_ETL_LOCOSOFT/views/data.GC_Fokus_Produktgruppen.sql
  44. 19 0
      schema/GC_ETL_LOCOSOFT/views/data.GC_Marken.sql
  45. 28 0
      schema/GC_ETL_LOCOSOFT/views/data.GC_Mitarbeiter.sql
  46. 19 0
      schema/GC_ETL_LOCOSOFT/views/data.GC_Produktbuchungsgruppen.sql
  47. 120 0
      schema/GC_ETL_LOCOSOFT/views/data.Kontenrahmen_GC_Struct_SKR.sql
  48. 19 0
      schema/GC_ETL_LOCOSOFT/views/data.Kontenrahmen_SKR_Vorlage.sql
  49. 29 0
      schema/GC_ETL_LOCOSOFT/views/data.SKR_Konten_Stk_manuell.sql
  50. 29 0
      schema/GC_ETL_LOCOSOFT/views/data.SKR_Statistik_Stk_manuell.sql
  51. 1 0
      schema/GC_ETL_LOCOSOFT/views/load.Aftersales_Rechnungen_ben_AW_final.sql
  52. 8 4
      schema/GC_ETL_LOCOSOFT/views/load.TBL_SERVICE_GUV_O21.sql
  53. 3 2
      schema/GC_ETL_LOCOSOFT/views/load.offene_Auftraege_DG_Anz_Tage.sql
  54. 3 2
      schema/GC_ETL_LOCOSOFT/views/load.offene_Auftraege_Teile.sql
  55. 2 0
      schema/GC_ETL_LOCOSOFT/views/load.offene_Auftraege_Ums_ben_AW.sql
  56. 1 1
      schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.Aftersales_Rechnungen_Focus_Group.sql
  57. 1 1
      schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.Aftersales_Rechnungen_ben_AW_final.sql
  58. 1 1
      schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.Aftersales_Rechnungen_verk_AW_final.sql
  59. 1 1
      schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.Aftersales_S03.sql
  60. 1 1
      schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.Belege_Bilanz_SKR.sql
  61. 1 1
      schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.Belege_SKR_F02.sql
  62. 1 1
      schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.Belege_SKR_STK.sql
  63. 1 1
      schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.Belege_SKR_STK_F02.sql
  64. 1 1
      schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.NW_GW_VK_V03.sql
  65. 1 1
      schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.OP_aus_LOC_Belege_gesamt_OP01.sql
  66. 1 1
      schema/GC_ETL_LOCOSOFT/views/test_systemvergleich.Zeit_gesamt_Z03.sql
  67. 3 1
      schema/GC_ETL_LOCOSOFT/views/transform.Aftersales_Rechnungen_Focus_Group.sql
  68. 1 0
      schema/GC_ETL_LOCOSOFT/views/transform.Aftersales_Rechnungen_ben_AW_final.sql
  69. 2 2
      schema/GC_ETL_LOCOSOFT/views/transform.LOC_BELEGE_DETAIL.sql
  70. 30 10
      schema/GC_ETL_LOCOSOFT/views/transform.TBL_SERVICE_GUV_O21.sql
  71. 1 0
      schema/GC_ETL_LOCOSOFT/views/transform.offene_Auftraege_DG_Anz_Tage.sql
  72. 10 0
      schema/GC_ETL_LOCOSOFT/views/transform.offene_Auftraege_Teile.sql
  73. 12 0
      schema/GC_ETL_LOCOSOFT/views/transform.offene_Auftraege_Ums_ben_AW.sql
  74. 3 3
      schema/GC_ETL_LOCOSOFT/views/transform_imr.Aftersales_Rechnungen_ben_AW_final.sql
  75. 1 1
      schema/GC_ETL_LOCOSOFT/views/transform_imr.Aftersales_Rechnungen_operativ.sql
  76. 1 1
      schema/GC_ETL_LOCOSOFT/views/transform_imr.kontenrahmen.sql
  77. 1 1
      schema/GC_ETL_LOCOSOFT/views/transform_imr.kontenrahmen_gc_struct_skr.sql
  78. 3 3
      schema/GC_ETL_LOCOSOFT/views/transform_imr.offene_auftraege_dg_anz_tage.sql
  79. 1 1
      schema/GC_ETL_LOCOSOFT/views/transform_imr.offene_auftraege_teile.sql
  80. 14 7
      schema/GC_ETL_LOCOSOFT/views/transform_imr.offene_auftraege_ums_ben_aw.sql
  81. 1 1
      schema/GC_ETL_LOCOSOFT/views/transform_ims.Kontenrahmen.sql
  82. 35 7
      schema/GC_ETL_LOCOSOFT/views/transform_ims.ben_AW_Order_Number.sql
  83. 0 38
      schema/GC_ETL_LOCOSOFT/views/xtract.order_positions.sql
  84. 1 1
      schema/LOCOSOFT/users/gaps.sql
  85. 0 41
      schema/LOCOSOFT/views/data.Arbeitstage.sql

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
Package/IDLog.xml


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
Package/log.xml


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 1 - 1
Package/model.xml


+ 1 - 1
Package/session-log-backup.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<bmtactionlog project="C:\GlobalCube_LOCOSOFT\System\LOCOSOFT\Package\GC_FM.cpf" templatedir="../templates/bmt/Cr1Model" timestamp="20260426124825846" user="Global Cube" version="11.1.2.15"><transaction event="StartSession" saved="false" seq="1" timestamp="20260426124825846" uniqueId="D6570728D6570728" user="Global Cube"/><transaction saved="false" seq="2" timestamp="20260426124838947" uniqueId="DD3517A2DD3517A2"><action seq="1" type="SetActiveLocale"><inputparams><param seq="1" type="i18nstring"><value>de</value></param></inputparams><domchanges/><result success="t"><outputparams/></result></action></transaction></bmtactionlog>
+<bmtactionlog project="C:\GlobalCube\ETL_DWH\LOCOSOFT\Package\GC_FM.cpf" templatedir="../templates/bmt/Cr1Model" timestamp="20260505150515068" user="Global Cube" version="11.1.7.9"><transaction event="StartSession" saved="false" seq="1" timestamp="20260505150515068" uniqueId="CFCDE64DCFCDE64D" user="Global Cube"/><transaction saved="false" seq="2" timestamp="20260505150516032" uniqueId="EA2D235FEA2D235F"><action seq="1" type="SetActiveLocale"><inputparams><param seq="1" type="i18nstring"><value>de</value></param></inputparams><domchanges/><result success="t"><outputparams/></result></action></transaction></bmtactionlog>

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
Package/session-log.xml


+ 7 - 0
exec/CREATE_DWH_komplett.sql

@@ -203,3 +203,10 @@ SELECT *
 INTO [dbo].[current_date_Prognose_operativ]
 FROM [GC_ETL_LOCOSOFT].[load].[current_date_Prognose_operativ]
 GO
+
+DROP TABLE IF EXISTS [dbo].[TBL_SERVICE_GUV_O21]
+GO
+SELECT *
+INTO [dbo].[TBL_SERVICE_GUV_O21]
+FROM [GC_ETL_LOCOSOFT].[load].[TBL_SERVICE_GUV_O21]
+GO

+ 9 - 0
exec/INSERT_Charge_Types.sql

@@ -0,0 +1,9 @@
+USE [GC]
+GO
+
+INSERT INTO [data].[GC_Charge_Type]
+SELECT [type]
+     , [description]
+     , [client_db]
+     , '' AS [Zuordnung]
+FROM [LOCOSOFT].[dbo].[charge_type_descriptions]

+ 5 - 0
schema/GC/schemas.sql

@@ -13,5 +13,10 @@ if not exists(select s.schema_id from sys.schemas s where s.name = 'transform')
 	and exists(select p.principal_id from sys.database_principals p where p.name = 'dbo') begin
 	exec sp_executesql N'create schema [transform] authorization [dbo]'
 end
+
+if not exists(select s.schema_id from sys.schemas s where s.name = 'test') 
+	and exists(select p.principal_id from sys.database_principals p where p.name = 'dbo') begin
+	exec sp_executesql N'create schema [test] authorization [dbo]'
+end
 GO
 

+ 20 - 0
schema/GC/views/test.Aftersales_Rechnungen_Focus_Group.sql

@@ -0,0 +1,20 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+CREATE VIEW [test].[Aftersales_Rechnungen_Focus_Group] AS
+SELECT year([Invoice Date]) AS [Jahr]
+     , [Hauptbetrieb] AS [Hauptbetrieb_ID]
+     , [Standort] AS [Standort_ID]
+     , [Focus Group] AS [Parts_Focus_Group]
+     , [Parts Number] AS [Parts_Make_Desc]
+     , sum([Menge Focus]) AS [Menge_Focus]
+FROM [transform].[Aftersales_Rechnungen_Focus_Group]
+GROUP BY year([Invoice Date]), [Hauptbetrieb], [Standort], [Focus Group], [Parts Number]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 19 - 0
schema/GC/views/test.Aftersales_Rechnungen_ben_AW_final.sql

@@ -0,0 +1,19 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+CREATE VIEW [test].[Aftersales_Rechnungen_ben_AW_final] AS
+SELECT year([Invoice_Date]) AS [Jahr]
+     , [Hauptbetrieb_ID]
+     , [Standort_ID]
+     , [Fabrikat]
+     , convert(decimal(10,2), sum([ben__Std_])) AS [ben_Std]
+FROM [transform].[Aftersales_Rechnungen_ben_AW_final]
+GROUP BY year([Invoice_Date]), [Hauptbetrieb_ID], [Standort_ID], [Fabrikat]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 19 - 0
schema/GC/views/test.Aftersales_Rechnungen_verk_AW_final.sql

@@ -0,0 +1,19 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+CREATE VIEW [test].[Aftersales_Rechnungen_verk_AW_final] AS
+SELECT year([Invoice_Date]) AS [Jahr]
+     , [Hauptbetrieb_ID]
+     , [Standort_ID]
+     , [Fabrikat]
+     , convert(decimal(10,2), sum([verk__Std_])) AS [verk_Std]
+FROM [transform].[Aftersales_Rechnungen_verk_AW_final]
+GROUP BY year([Invoice_Date]), [Hauptbetrieb_ID], [Standort_ID], [Fabrikat]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 61 - 0
schema/GC/views/test.Aftersales_S03.sql

@@ -0,0 +1,61 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+CREATE VIEW [test].[Aftersales_S03] AS
+SELECT format([Invoice_Date], 'yyyy-MM') AS [Periode]
+     , replace(replace([Serviceberater], '  ', ' '), '  ', ' ') AS [Serviceberater]
+     , sum([Lohn]) AS [Lohn]
+     , sum([Teile]) AS [Teile]
+     , sum([Fremdl]) AS [Fremdl]
+     , sum([Mietwagen]) AS [Mietwagen]
+     , sum([ben_Std]) AS [ben_Std]
+     , sum([verk_Std]) AS [verk_Std]
+     , sum([DG]) AS [DG]
+FROM (SELECT [Invoice_Date]
+           , [Hauptbetrieb_ID]
+           , [Standort_ID]
+           , [Serviceberater]
+           , [Lohn_Umsatz] + [NL_Lohn] AS [Lohn]
+           , [Teile_Umsatz] + [NL_Teile] AS [Teile]
+           , [Fremdl_] AS [Fremdl]
+           , [Mietw_] AS [Mietwagen]
+           , 0.0 AS [ben_Std]
+           , 0.0 AS [verk_Std]
+           , [DG] AS [DG]
+      FROM [transform].[Aftersales_Rechnungen_neu]
+      UNION ALL
+      SELECT [Invoice_Date]
+           , [Hauptbetrieb_ID]
+           , [Standort_ID]
+           , [Serviceberater]
+           , 0.0 AS [Lohn]
+           , 0.0 AS [Teile]
+           , 0.0 AS [Fremdl]
+           , 0.0 AS [Mietwagen]
+           , convert(decimal(10, 2), [ben__Std_]) AS [ben_Std]
+           , 0.0 AS [verk_Std]
+           , 0.0 AS [DG]
+      FROM [transform].[Aftersales_Rechnungen_ben_AW_final]
+      UNION ALL
+      SELECT [Invoice_Date]
+           , [Hauptbetrieb_ID]
+           , [Standort_ID]
+           , [Serviceberater]
+           , 0.0 AS [Lohn]
+           , 0.0 AS [Teile]
+           , 0.0 AS [Fremdl]
+           , 0.0 AS [Mietwagen]
+           , 0.0 AS [ben_Std]
+           , convert(decimal(10, 2), [verk__Std_]) AS [verk_Std]
+           , 0.0 AS [DG]
+      FROM [transform].[Aftersales_Rechnungen_verk_AW_final]) [V1]
+WHERE [Invoice_Date] >= datefromparts(year(getdate()), 1, 1)
+GROUP BY format([Invoice_Date], 'yyyy-MM'), [Serviceberater]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 20 - 0
schema/GC/views/test.Belege_Bilanz_SKR.sql

@@ -0,0 +1,20 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+CREATE VIEW [test].[Belege_Bilanz_SKR] AS
+SELECT year([Invoice_Date]) AS [Jahr]
+     , [Rechtseinheit_ID]
+     , [Ebene71]
+     , [Ebene72]
+	 , [Ebene73]
+     , sum([Ist]) AS [Ist_Bilanz]
+FROM [transform].[Belege_Bilanz_SKR]
+GROUP BY year([Invoice_Date]), [Rechtseinheit_ID], [Ebene71], [Ebene72], [Ebene73]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 27 - 0
schema/GC/views/test.Belege_SKR_F02.sql

@@ -0,0 +1,27 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+CREATE VIEW [test].[Belege_SKR_F02] AS
+SELECT [Periode]
+     , [Kostenstelle]
+     , [Ebene1]
+     , sum([Ist]) AS [Ist]
+FROM (SELECT format([Invoice_Date], 'yyyy-MM') AS [Periode]
+           , [Kostenstelle]
+           , CASE
+                 WHEN [Ebene1] = 'Kosten' THEN [Ebene2]
+                 WHEN [Ebene1] = 'Anschaffungskosten' THEN 'VAK'
+                 ELSE [Ebene1]
+             END AS [Ebene1]
+           , [Ist]
+      FROM [transform].[Belege_SKR]
+      WHERE [Invoice_Date] >= datefromparts(year(getdate()), 1, 1)) [V1]
+GROUP BY [Periode], [Kostenstelle], [Ebene1]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 20 - 0
schema/GC/views/test.Belege_SKR_STK.sql

@@ -0,0 +1,20 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+CREATE   VIEW [test].[Belege_SKR_STK] AS
+SELECT year([Invoice_Date]) AS [Jahr]
+     , [Rechtseinheit_ID]
+     , [Betrieb_ID]
+     , [Acct_Nr]
+     , [Fabrikat]
+     , convert(decimal(10, 0), round(sum([Menge]), 0)) AS [Menge]
+FROM [transform].[Belege_SKR_STK]
+GROUP BY year([Invoice_Date]), [Rechtseinheit_ID], [Betrieb_ID], [Acct_Nr], [Fabrikat]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 23 - 0
schema/GC/views/test.Belege_SKR_STK_F02.sql

@@ -0,0 +1,23 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+CREATE VIEW [test].[Belege_SKR_STK_F02] AS
+SELECT [Periode]
+     , [Kostenstelle]
+     , [Fabrikat]
+     , sum([Ist]) AS [Ist]
+FROM (SELECT format([Invoice_Date], 'yyyy-MM') AS [Periode]
+           , [Kostenstelle]
+           , iif([Kostenstelle] = 'Neuwagen', [Fabrikat], '') AS [Fabrikat]
+           , [Ist]
+      FROM [transform].[Belege_SKR_STK]
+      WHERE [Invoice_Date] >= datefromparts(year(getdate()), 1, 1)) [V1]
+GROUP BY [Periode], [Kostenstelle], [Fabrikat]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 23 - 0
schema/GC/views/test.NW_GW_VK_V03.sql

@@ -0,0 +1,23 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+CREATE VIEW [test].[NW_GW_VK_V03] AS
+SELECT format([Invoice_Date], 'yyyy-MM') AS [Periode]
+     , [Verkäufer]
+     , sum(try_convert(decimal(28, 8), replace([Menge], ',', '.'))) AS [Menge]
+     , sum([Gesamterlöse]) AS [Erlös_FZG]
+     , sum([Einsatz_Gesamt]) AS [Einsatz_FZG]
+     , sum([Erlös_Prov_]) AS [Erlös_Prov_]
+     , avg(try_convert(decimal(28, 8), [Standtage])) AS [Standtage]
+
+FROM [transform].[NW_GW_VK]
+WHERE [Invoice_Date] >= datefromparts(year(getdate()), 1, 1)
+GROUP BY format([Invoice_Date], 'yyyy-MM'), [Verkäufer]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 37 - 0
schema/GC/views/test.OP_aus_LOC_Belege_gesamt_OP01.sql

@@ -0,0 +1,37 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+CREATE VIEW [test].[OP_aus_LOC_Belege_gesamt_OP01] AS
+
+SELECT [Standort_Name]
+     , [Kostenstelle]
+     , sum([offen]) AS [offen]
+FROM (SELECT [Standort_Name]
+           , [Kostenstelle]
+           , convert(decimal(28, 8), [offen_]) AS [offen]
+      FROM [transform].[OP_aus_LOC_Belege_8520]
+      UNION ALL
+      SELECT [Standort_Name]
+           , [Kostenstelle]
+           , convert(decimal(28, 8), [offen]) AS [offen]
+      FROM [transform].[OP_aus_LOC_Belege_Deb_Saldo]
+      UNION ALL
+      SELECT [Standort_Name]
+           , [Kostenstelle]
+           , convert(decimal(28, 8), [offen]) AS [offen]
+      FROM [transform].[OP_aus_LOC_Belege_nur_8520]
+      WHERE [offen] <> ''
+      UNION ALL
+      SELECT [Standort_Name]
+           , [Kostenstelle]
+           , convert(decimal(28, 8), [offen]) AS [offen]
+      FROM [transform].[OP_aus_LOC_Belege_ohne_8520]) [V1]
+GROUP BY [Standort_Name], [Kostenstelle]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 126 - 0
schema/GC/views/test.Zeit_gesamt_Z03.sql

@@ -0,0 +1,126 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+CREATE VIEW [test].[Zeit_gesamt_Z03] AS
+SELECT format([Invoice_Date], 'yyyy-MM') AS [Periode]
+     , [Standort_Name]
+     , [Monteur_Gruppe_2]
+     , [Monteur]
+     , sum([Anw]) AS [Anw]
+     , sum([prod]) AS [prod]
+     , sum([verr_Zeit]) AS [verr_Zeit]
+     , sum([ben_Zeit]) AS [ben_Zeit]
+     , sum([Umsatz_Lohn]) AS [Umsatz_Lohn]
+     , sum([Abw]) AS [Abw]
+     , sum([Sollzeit]) AS [Sollzeit]
+     , max([Prod_Faktor]) AS [Prod_Faktor]
+FROM (SELECT [Invoice_Date]
+           , [Standort_Name]
+           , [Monteur_Gruppe_2]
+           , [Monteur]
+           , 0.0 AS [Anw]
+           , 0.0 AS [prod]
+           , 0.0 AS [verr_Zeit]
+           , 0.0 AS [ben_Zeit]
+           , 0.0 AS [Umsatz_Lohn]
+           , [Abw_] AS [Abw]
+           , 0.0 AS [Sollzeit]
+           , [productivity_factor] AS [Prod_Faktor]
+      FROM [transform].[Zeit_Abwesenheit_neu]
+      UNION ALL
+      SELECT [Invoice_Date]
+           , [Standort_Name]
+           , [Monteur_Gruppe_2]
+           , [Monteur]
+           , 0.0 AS [Anw]
+           , 0.0 AS [prod]
+           , 0.0 AS [verr_Zeit]
+           , convert(decimal(10, 1), round([ben__Zeit], 1)) AS [ben_Zeit]
+           , 0.0 AS [Umsatz_Lohn]
+           , 0.0 AS [Abw]
+           , 0.0 AS [Sollzeit]
+           , [productivity_factor] AS [Prod_Faktor]
+      FROM [transform].[Zeit_ben_Std_LG]
+      UNION ALL
+      SELECT [Invoice Date]
+           , [Standort_Name]
+           , [Monteur_Gruppe_2]
+           , [Monteur]
+           , 0.0 AS [Anw]
+           , 0.0 AS [prod]
+           , 0.0 AS [verr_Zeit]
+           , 0.0 AS [ben_Zeit]
+           , 0.0 AS [Umsatz_Lohn]
+           , 0.0 AS [Abw]
+           , [Soll-Zeit] AS [Sollzeit]
+           , 0.0 AS [Prod_Faktor]
+      FROM [transform].[Zeit_Sollzeit]
+      UNION ALL
+      SELECT [Invoice_Date]
+           , [Standort_Name]
+           , [Monteur_Gruppe_2]
+           , [Monteur]
+           , [Anw_] AS [Anw]
+           , [prod_] AS [prod]
+           , 0.0 AS [verr_Zeit]
+           , 0.0 AS [ben_Zeit]
+           , 0.0 AS [Umsatz_Lohn]
+           , 0.0 AS [Abw]
+           , 0.0 AS [Sollzeit]
+           , 0.0 AS [Prod_Faktor]
+      FROM [transform].[Zeit_Stempelungen_neu]
+      UNION ALL
+      SELECT [Invoice_Date]
+           , [Standort_Name]
+           , [Monteur_Gruppe_2]
+           , [Monteur]
+           , [Anw_] AS [Anw]
+           , 0.0 AS [prod]
+           , 0.0 AS [verr_Zeit]
+           , 0.0 AS [ben_Zeit]
+           , 0.0 AS [Umsatz_Lohn]
+           , 0.0 AS [Abw]
+           , 0.0 AS [Sollzeit]
+           , 0.0 AS [Prod_Faktor]
+      FROM [transform].[Zeit_Stempelungen_Pausen]
+      UNION ALL
+      SELECT[Invoice_Date]
+           , [Standort_Name]
+           , [Monteur_Gruppe_2]
+           , [Monteur]
+           , 0.0 AS [Anw]
+           , [prod_] AS [prod]
+           , 0.0 AS [verr_Zeit]
+           , 0.0 AS [ben_Zeit]
+           , 0.0 AS [Umsatz_Lohn]
+           , 0.0 AS [Abw]
+           , 0.0 AS [Sollzeit]
+           , 0.0 AS [Prod_Faktor]
+      FROM [transform].[Zeit_Stempelungen_Pausen_produktiv]
+      UNION ALL
+      SELECT [Invoice_Date]
+           , [Standort_Name]
+           , [Monteur_Gruppe_2]
+           , [Monteur]
+           , 0.0 AS [Anw]
+           , 0.0 AS [prod]
+           , convert(decimal(10, 1), round([verr__Zeit], 1)) AS [verr_Zeit]
+           , 0.0 AS [ben_Zeit]
+           , [Umsatz_Lohn] AS [Umsatz_Lohn]
+           , 0.0 AS [Abw]
+           , 0.0 AS [Sollzeit]
+           , [productivity_factor] AS [Prod_Faktor]
+      FROM [transform].[Zeit_verk_Std]) [V1]
+
+WHERE [Invoice_Date] >= datefromparts(year(getdate()), 1, 1)
+  AND [Monteur_Gruppe_2] NOT IN ('', 'ausgetr. MA')
+  AND [Monteur_Gruppe_2] IS NOT NULL
+GROUP BY format([Invoice_Date], 'yyyy-MM'), [Standort_Name], [Monteur_Gruppe_2], [Monteur]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 48 - 0
schema/GC/views/test.offene_Auftraege_gesamt_S08.sql

@@ -0,0 +1,48 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+CREATE VIEW [test].[offene_Auftraege_gesamt_S08] AS
+SELECT [Serviceberater]
+     , sum([Tage_offen]) AS [Tage_offen]
+     , sum([DG]) AS [DG]
+     , sum([Teile]) AS [Teile]
+     , sum([Lohn]) AS [Lohn]
+     , sum([ben_Std]) AS [ben_Std]
+FROM (SELECT [Invoice_Date]
+           , [Serviceberater]
+           , [Tage_offen]
+           , [DG]
+           , 0.0 AS [Teile]
+           , 0.0 AS [Lohn]
+           , 0.0 AS [ben_Std]
+      FROM [transform].[offene_Auftraege_DG_Anz_Tage]
+      UNION ALL
+
+      SELECT [Invoice_Date]
+           , [Serviceberater]
+           , 0.0 AS [Tage_offen]
+           , 0.0 AS [DG]
+           , [Teile]
+           , 0.0 AS [Lohn]
+           , 0.0 AS [ben_Std]
+      FROM [transform].[offene_Auftraege_Teile]
+      UNION ALL
+
+      SELECT [Invoice_Date]
+           , [Serviceberater]
+           , 0.0 AS [Tage_offen]
+           , 0.0 AS [DG]
+           , 0.0 AS [Teile]
+           , [Lohn]
+           , [ben_Std]
+      FROM [transform].[offene_Auftraege_Ums_ben_AW]) [V1]
+
+GROUP BY [Serviceberater]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 1 - 0
schema/GC_DWH_LOCOSOFT/tables/Aftersales_Rechnungen_ben_AW_final.sql

@@ -5,6 +5,7 @@ CREATE TABLE [dbo].[Aftersales_Rechnungen_ben_AW_final] (
    [Standort_Name] [varchar](50) NULL,
    [Employee_Function] [varchar](20) NULL,
    [Serviceberater] [varchar](200) NULL,
+   [Monteur] [varchar](150) NULL,
    [Order Number] [varchar](500) NULL,
    [Invoice_Desc_100] [varchar](500) NULL,
    [Fabrikat] [varchar](100) NULL,

+ 82 - 0
schema/GC_DWH_LOCOSOFT/tables/TBL_SERVICE_GUV_O21.sql

@@ -0,0 +1,82 @@
+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,
+   [Monteur] [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

+ 2 - 1
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
 )
 
 

+ 2 - 1
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
 )
 
 

+ 3 - 1
schema/GC_DWH_LOCOSOFT/tables/offene_Auftraege_Ums_ben_AW.sql

@@ -4,6 +4,7 @@ CREATE TABLE [dbo].[offene_Auftraege_Ums_ben_AW] (
    [Standort_ID] [varchar](10) NULL,
    [Standort_Name] [varchar](50) NULL,
    [Serviceberater] [varchar](150) NULL,
+   [Monteur] [varchar](150) NULL,
    [Order Number] [varchar](500) NULL,
    [Fabrikat] [varchar](100) NULL,
    [Fabrikat_Order_By] [int] NULL,
@@ -19,7 +20,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
 )
 
 

+ 1 - 1
schema/GC_DWH_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_datareader ADD MEMBER gaps*/ exec sp_addrolemember 'db_datareader', 'gaps'
 GO

+ 0 - 15
schema/GC_ETL_LOCOSOFT/tables/data.Arbeitstage.sql

@@ -1,15 +0,0 @@
-CREATE TABLE [data].[Arbeitstage] (
-   [bundeslaender_id] [nvarchar](255) NULL,
-   [datum] [datetime] NULL,
-   [wochentage_id] [nvarchar](255) NULL,
-   [arbeitstag_mofr] [int] NULL,
-   [zaehler_mofr] [int] NULL,
-   [summe_mofr] [int] NULL,
-   [arbeitstag_mosa] [int] NULL,
-   [zaehler_mosa] [int] NULL,
-   [summe_mosa] [int] NULL,
-   [feiertage_id] [int] NULL
-)
-
-
-GO

+ 0 - 9
schema/GC_ETL_LOCOSOFT/tables/data.GC_Charge_Type.sql

@@ -1,9 +0,0 @@
-CREATE TABLE [data].[GC_Charge_Type] (
-   [type] [int] NULL,
-   [description] [varchar](255) NULL,
-   [client_db] [varchar](20) NULL,
-   [Zuordnung] [varchar](255) NULL
-)
-
-
-GO

+ 0 - 9
schema/GC_ETL_LOCOSOFT/tables/data.GC_Config.sql

@@ -1,9 +0,0 @@
-CREATE TABLE [data].[GC_Config] (
-   [Variable] [varchar](50) NOT NULL,
-   [Wert] [varchar](50) NOT NULL
-
-   ,CONSTRAINT [PK_GC_Config] PRIMARY KEY CLUSTERED ([Variable])
-)
-
-
-GO

+ 0 - 18
schema/GC_ETL_LOCOSOFT/tables/data.GC_Department.sql

@@ -1,18 +0,0 @@
-CREATE TABLE [data].[GC_Department] (
-   [Hauptbetrieb] [varchar](20) NOT NULL,
-   [Standort] [varchar](20) NOT NULL,
-   [Hauptbetrieb_ID] [varchar](10) NULL,
-   [Hauptbetrieb_Name] [varchar](50) NULL,
-   [Standort_ID] [varchar](10) NULL,
-   [Standort_Name] [varchar](50) NULL,
-   [Marke_ID] [varchar](10) NULL,
-   [Marke_Name] [varchar](50) NULL,
-   [Gruppe_ID] [varchar](10) NULL,
-   [Gruppe_Name] [varchar](50) NULL,
-   [Site] [varchar](10) NULL
-
-   ,CONSTRAINT [PK_GC_Department] PRIMARY KEY CLUSTERED ([Hauptbetrieb], [Standort])
-)
-
-
-GO

+ 0 - 11
schema/GC_ETL_LOCOSOFT/tables/data.GC_Fokus_Produktgruppen.sql

@@ -1,11 +0,0 @@
-CREATE TABLE [data].[GC_Fokus_Produktgruppen] (
-   [Client_DB] [varchar](20) NULL,
-   [Focus_Group] [varchar](50) NULL,
-   [Parts_Number] [varchar](50) NULL,
-   [GMPD_Group] [varchar](20) NULL,
-   [Marke_ID] [decimal](18,8) NULL,
-   [Marke] [varchar](20) NULL
-)
-
-
-GO

+ 0 - 13
schema/GC_ETL_LOCOSOFT/tables/data.GC_Marken.sql

@@ -1,13 +0,0 @@
-CREATE TABLE [data].[GC_Marken] (
-   [Client_DB] [varchar](50) NOT NULL,
-   [Make] [varchar](20) NOT NULL,
-   [Description] [varchar](100) NULL,
-   [Fabrikat] [varchar](100) NULL,
-   [Order_By] [int] NOT NULL,
-   [Marke_FIBU] [varchar](100) NULL
-
-   ,CONSTRAINT [PK_GC_Marken] PRIMARY KEY CLUSTERED ([Client_DB], [Make])
-)
-
-
-GO

+ 0 - 19
schema/GC_ETL_LOCOSOFT/tables/data.GC_Mitarbeiter.sql

@@ -1,19 +0,0 @@
-CREATE TABLE [data].[GC_Mitarbeiter] (
-   [Client_DB] [varchar](20) NOT NULL,
-   [Employee_ID] [varchar](20) NOT NULL,
-   [Name] [varchar](100) NOT NULL,
-   [Department] [varchar](20) NOT NULL,
-   [Zuordnung_Funktion] [varchar](50) NULL,
-   [Zuordnung_Produktiv] [varchar](50) NULL,
-   [Monteur_Ebene_1] [varchar](50) NULL,
-   [Monteur_Ebene_2] [varchar](50) NULL,
-   [Monteur_Ebene_3] [varchar](20) NULL,
-   [Zuordnung_Department_Name] [varchar](50) NULL,
-   [productivity_factor] [decimal](3,1) NULL,
-   [leave_date] [datetime] NULL
-
-   ,CONSTRAINT [PK_GC_Mitarbeiter] PRIMARY KEY CLUSTERED ([Client_DB], [Employee_ID], [Department])
-)
-
-
-GO

+ 0 - 11
schema/GC_ETL_LOCOSOFT/tables/data.GC_Produktbuchungsgruppen.sql

@@ -1,11 +0,0 @@
-CREATE TABLE [data].[GC_Produktbuchungsgruppen] (
-   [Client_DB] [varchar](50) NULL,
-   [Produktbuchungsgruppe] [varchar](100) NOT NULL,
-   [Zuordnung] [varchar](50) NULL,
-   [Beschreibung] [varchar](50) NULL
-
-   ,CONSTRAINT [PK_GC_Produktbuchungsgruppen] PRIMARY KEY CLUSTERED ([Produktbuchungsgruppe])
-)
-
-
-GO

+ 0 - 111
schema/GC_ETL_LOCOSOFT/tables/data.Kontenrahmen_GC_Struct_SKR.sql

@@ -1,111 +0,0 @@
-CREATE TABLE [data].[Kontenrahmen_GC_Struct_SKR] (
-   [Konto Nr] [varchar](100) NULL,
-   [Konto Bezeichnung] [varchar](100) NULL,
-   [Konto Art_ori] [varchar](100) NULL,
-   [Kostenstelle] [varchar](100) NULL,
-   [Stk] [varchar](100) NULL,
-   [Konto 1] [varchar](100) NULL,
-   [Konto 2] [varchar](100) NULL,
-   [Konto 3] [varchar](100) NULL,
-   [Konto 4] [varchar](100) NULL,
-   [Konto 5] [varchar](100) NULL,
-   [Ebene1] [varchar](100) NULL,
-   [Ebene2] [varchar](100) NULL,
-   [Ebene3] [varchar](100) NULL,
-   [Ebene4] [varchar](100) NULL,
-   [Ebene5] [varchar](100) NULL,
-   [Ebene6] [varchar](100) NULL,
-   [Ebene7] [varchar](100) NULL,
-   [Ebene8] [varchar](100) NULL,
-   [Ebene9] [varchar](100) NULL,
-   [Ebene10] [varchar](100) NULL,
-   [Ebene11] [varchar](100) NULL,
-   [Ebene12] [varchar](100) NULL,
-   [Ebene13] [varchar](100) NULL,
-   [Ebene14] [varchar](100) NULL,
-   [Ebene15] [varchar](100) NULL,
-   [Ebene16] [varchar](100) NULL,
-   [Ebene17] [varchar](100) NULL,
-   [Ebene18] [varchar](100) NULL,
-   [Ebene19] [varchar](100) NULL,
-   [Ebene20] [varchar](100) NULL,
-   [Ebene21] [varchar](100) NULL,
-   [Ebene22] [varchar](100) NULL,
-   [Ebene23] [varchar](100) NULL,
-   [Ebene24] [varchar](100) NULL,
-   [Ebene25] [varchar](100) NULL,
-   [Ebene26] [varchar](100) NULL,
-   [Ebene27] [varchar](100) NULL,
-   [Ebene28] [varchar](100) NULL,
-   [Ebene29] [varchar](100) NULL,
-   [Ebene30] [varchar](100) NULL,
-   [Ebene31] [varchar](100) NULL,
-   [Ebene32] [varchar](100) NULL,
-   [Ebene33] [varchar](100) NULL,
-   [Ebene34] [varchar](100) NULL,
-   [Ebene35] [varchar](100) NULL,
-   [Ebene36] [varchar](100) NULL,
-   [Ebene37] [varchar](100) NULL,
-   [Ebene38] [varchar](100) NULL,
-   [Ebene39] [varchar](100) NULL,
-   [Ebene40] [varchar](100) NULL,
-   [Ebene41] [varchar](100) NULL,
-   [Ebene42] [varchar](100) NULL,
-   [Ebene43] [varchar](100) NULL,
-   [Ebene44] [varchar](100) NULL,
-   [Ebene45] [varchar](100) NULL,
-   [Ebene46] [varchar](100) NULL,
-   [Ebene47] [varchar](100) NULL,
-   [Ebene48] [varchar](100) NULL,
-   [Ebene49] [varchar](100) NULL,
-   [Ebene50] [varchar](100) NULL,
-   [Ebene51] [varchar](100) NULL,
-   [Ebene52] [varchar](100) NULL,
-   [Ebene53] [varchar](100) NULL,
-   [Ebene54] [varchar](100) NULL,
-   [Ebene55] [varchar](100) NULL,
-   [Ebene56] [varchar](100) NULL,
-   [Ebene57] [varchar](100) NULL,
-   [Ebene58] [varchar](100) NULL,
-   [Ebene59] [varchar](100) NULL,
-   [Ebene60] [varchar](100) NULL,
-   [Ebene61] [varchar](100) NULL,
-   [Ebene62] [varchar](100) NULL,
-   [Ebene63] [varchar](100) NULL,
-   [Ebene64] [varchar](100) NULL,
-   [Ebene65] [varchar](100) NULL,
-   [Ebene66] [varchar](100) NULL,
-   [Ebene67] [varchar](100) NULL,
-   [Ebene68] [varchar](100) NULL,
-   [Ebene69] [varchar](100) NULL,
-   [Ebene70] [varchar](100) NULL,
-   [Ebene71] [varchar](100) NULL,
-   [Ebene72] [varchar](100) NULL,
-   [Ebene73] [varchar](100) NULL,
-   [Ebene74] [varchar](100) NULL,
-   [Ebene75] [varchar](100) NULL,
-   [Ebene76] [varchar](100) NULL,
-   [Ebene77] [varchar](100) NULL,
-   [Ebene78] [varchar](100) NULL,
-   [Ebene79] [varchar](100) NULL,
-   [Ebene80] [varchar](100) NULL,
-   [Ebene81] [varchar](100) NULL,
-   [Ebene82] [varchar](100) NULL,
-   [Ebene83] [varchar](100) NULL,
-   [Ebene84] [varchar](100) NULL,
-   [Ebene85] [varchar](100) NULL,
-   [Ebene86] [varchar](100) NULL,
-   [Ebene87] [varchar](100) NULL,
-   [Ebene88] [varchar](100) NULL,
-   [Ebene89] [varchar](100) NULL,
-   [Ebene90] [varchar](100) NULL,
-   [Anzahl Stellen_Konto_Nr] [varchar](100) NULL,
-   [Konto Art] [varchar](100) NULL,
-   [GuV_Bilanz] [varchar](100) NULL,
-   [Acct Nr] [varchar](100) NULL,
-   [Konto] [varchar](100) NULL,
-   [Susa] [varchar](100) NULL
-)
-
-
-GO

+ 0 - 8
schema/GC_ETL_LOCOSOFT/tables/data.Kontenrahmen_SKR_Vorlage.sql

@@ -1,8 +0,0 @@
-CREATE TABLE [data].[Kontenrahmen_SKR_Vorlage] (
-   [Konto_Nr] [varchar](50) NOT NULL,
-   [Konto_Bezeichnung] [varchar](max) NOT NULL,
-   [Konto_Art] [varchar](50) NOT NULL
-)
-
-
-GO

+ 0 - 20
schema/GC_ETL_LOCOSOFT/tables/data.SKR_Konten_Stk_manuell.sql

@@ -1,20 +0,0 @@
-CREATE TABLE [data].[SKR_Konten_Stk_manuell] (
-   [Ebene1] [varchar](100) NULL,
-   [Ebene2] [varchar](100) NULL,
-   [Ebene3] [varchar](100) NULL,
-   [Ebene4] [varchar](100) NULL,
-   [Ebene5] [varchar](100) NULL,
-   [Ebene6] [varchar](100) NULL,
-   [Ebene7] [varchar](100) NULL,
-   [Ebene8] [varchar](100) NULL,
-   [Ebene9] [varchar](100) NULL,
-   [Ebene10] [varchar](100) NULL,
-   [Acct Nr] [varchar](100) NULL,
-   [Konto Bezeichnung] [varchar](100) NULL,
-   [Konto] [varchar](100) NULL,
-   [Guv Bilanz] [varchar](100) NULL,
-   [Susa] [varchar](100) NULL
-)
-
-
-GO

+ 0 - 20
schema/GC_ETL_LOCOSOFT/tables/data.SKR_Statistik_Stk_manuell.sql

@@ -1,20 +0,0 @@
-CREATE TABLE [data].[SKR_Statistik_Stk_manuell] (
-   [Ebene1] [varchar](100) NULL,
-   [Ebene2] [varchar](100) NULL,
-   [Ebene3] [varchar](100) NULL,
-   [Ebene4] [varchar](100) NULL,
-   [Ebene5] [varchar](100) NULL,
-   [Ebene6] [varchar](100) NULL,
-   [Ebene7] [varchar](100) NULL,
-   [Ebene8] [varchar](100) NULL,
-   [Ebene9] [varchar](100) NULL,
-   [Ebene10] [varchar](100) NULL,
-   [Acct Nr] [varchar](100) NULL,
-   [Konto Bezeichnung] [varchar](100) NULL,
-   [Konto] [varchar](100) NULL,
-   [Guv Bilanz] [varchar](100) NULL,
-   [Susa] [varchar](100) NULL
-)
-
-
-GO

+ 23 - 0
schema/GC_ETL_LOCOSOFT/views/data.Arbeitstage.sql

@@ -0,0 +1,23 @@
+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]
+      ,[arbeitstag_mosa]
+      ,[zaehler_mosa]
+      ,[summe_mosa]
+      ,[feiertage_id]
+  FROM [GC].[data].[Arbeitstage]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 17 - 0
schema/GC_ETL_LOCOSOFT/views/data.GC_Charge_Type.sql

@@ -0,0 +1,17 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+create view data.[GC_Charge_Type] AS
+SELECT [type]
+      ,[description]
+      ,[client_db]
+      ,[Zuordnung]
+  FROM [GC].[data].[GC_Charge_Type]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 4 - 3
schema/LOCOSOFT/views/data.GC_Config_Pivot.sql → schema/GC_ETL_LOCOSOFT/views/data.GC_Config.sql

@@ -2,9 +2,10 @@ 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
+create view data.[GC_Config] AS
+SELECT  [Variable]
+      ,[Wert]
+  FROM [GC].[data].[GC_Config]
 GO
 SET QUOTED_IDENTIFIER OFF 
 GO

+ 24 - 0
schema/GC_ETL_LOCOSOFT/views/data.GC_Department.sql

@@ -0,0 +1,24 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+create view data.[GC_Department] AS
+SELECT [Hauptbetrieb]
+      ,[Standort]
+      ,[Hauptbetrieb_ID]
+      ,[Hauptbetrieb_Name]
+      ,[Standort_ID]
+      ,[Standort_Name]
+      ,[Marke_ID]
+      ,[Marke_Name]
+      ,[Gruppe_ID]
+      ,[Gruppe_Name]
+      ,[Site]
+  FROM [GC].[data].[GC_Department]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 19 - 0
schema/GC_ETL_LOCOSOFT/views/data.GC_Fokus_Produktgruppen.sql

@@ -0,0 +1,19 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+create view data.[GC_Fokus_Produktgruppen] AS
+SELECT [Client_DB]
+      ,[Focus_Group]
+      ,[Parts_Number]
+      ,[GMPD_Group]
+      ,[Marke_ID]
+      ,[Marke]
+  FROM [GC].[data].[GC_Fokus_Produktgruppen]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 19 - 0
schema/GC_ETL_LOCOSOFT/views/data.GC_Marken.sql

@@ -0,0 +1,19 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+create view data.[GC_Marken] AS
+SELECT  [Client_DB]
+      ,[Make]
+      ,[Description]
+      ,[Fabrikat]
+      ,[Order_By]
+      ,[Marke_FIBU]
+  FROM [GC].[data].[GC_Marken]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 28 - 0
schema/GC_ETL_LOCOSOFT/views/data.GC_Mitarbeiter.sql

@@ -0,0 +1,28 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+create view data.[GC_Mitarbeiter] AS
+
+
+
+SELECT [Client_DB]
+      ,[Employee_ID]
+      ,[Name]
+      ,[Department]
+      ,[Zuordnung_Funktion]
+      ,[Zuordnung_Produktiv]
+      ,[Monteur_Ebene_1]
+      ,[Monteur_Ebene_2]
+      ,[Monteur_Ebene_3]
+      ,[Zuordnung_Department_Name]
+      ,[productivity_factor]
+      ,[leave_date]
+  FROM [GC].[data].[GC_Mitarbeiter]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 19 - 0
schema/GC_ETL_LOCOSOFT/views/data.GC_Produktbuchungsgruppen.sql

@@ -0,0 +1,19 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+create view data.[GC_Produktbuchungsgruppen] AS
+
+
+SELECT [Client_DB]
+      ,[Produktbuchungsgruppe]
+      ,[Zuordnung]
+      ,[Beschreibung]
+  FROM [GC].[data].[GC_Produktbuchungsgruppen]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 120 - 0
schema/GC_ETL_LOCOSOFT/views/data.Kontenrahmen_GC_Struct_SKR.sql

@@ -0,0 +1,120 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+create view data.[Kontenrahmen_GC_Struct_SKR] AS
+
+SELECT [Konto Nr]
+      ,[Konto Bezeichnung]
+      ,[Konto Art_ori]
+      ,[Kostenstelle]
+      ,[Stk]
+      ,[Konto 1]
+      ,[Konto 2]
+      ,[Konto 3]
+      ,[Konto 4]
+      ,[Konto 5]
+      ,[Ebene1]
+      ,[Ebene2]
+      ,[Ebene3]
+      ,[Ebene4]
+      ,[Ebene5]
+      ,[Ebene6]
+      ,[Ebene7]
+      ,[Ebene8]
+      ,[Ebene9]
+      ,[Ebene10]
+      ,[Ebene11]
+      ,[Ebene12]
+      ,[Ebene13]
+      ,[Ebene14]
+      ,[Ebene15]
+      ,[Ebene16]
+      ,[Ebene17]
+      ,[Ebene18]
+      ,[Ebene19]
+      ,[Ebene20]
+      ,[Ebene21]
+      ,[Ebene22]
+      ,[Ebene23]
+      ,[Ebene24]
+      ,[Ebene25]
+      ,[Ebene26]
+      ,[Ebene27]
+      ,[Ebene28]
+      ,[Ebene29]
+      ,[Ebene30]
+      ,[Ebene31]
+      ,[Ebene32]
+      ,[Ebene33]
+      ,[Ebene34]
+      ,[Ebene35]
+      ,[Ebene36]
+      ,[Ebene37]
+      ,[Ebene38]
+      ,[Ebene39]
+      ,[Ebene40]
+      ,[Ebene41]
+      ,[Ebene42]
+      ,[Ebene43]
+      ,[Ebene44]
+      ,[Ebene45]
+      ,[Ebene46]
+      ,[Ebene47]
+      ,[Ebene48]
+      ,[Ebene49]
+      ,[Ebene50]
+      ,[Ebene51]
+      ,[Ebene52]
+      ,[Ebene53]
+      ,[Ebene54]
+      ,[Ebene55]
+      ,[Ebene56]
+      ,[Ebene57]
+      ,[Ebene58]
+      ,[Ebene59]
+      ,[Ebene60]
+      ,[Ebene61]
+      ,[Ebene62]
+      ,[Ebene63]
+      ,[Ebene64]
+      ,[Ebene65]
+      ,[Ebene66]
+      ,[Ebene67]
+      ,[Ebene68]
+      ,[Ebene69]
+      ,[Ebene70]
+      ,[Ebene71]
+      ,[Ebene72]
+      ,[Ebene73]
+      ,[Ebene74]
+      ,[Ebene75]
+      ,[Ebene76]
+      ,[Ebene77]
+      ,[Ebene78]
+      ,[Ebene79]
+      ,[Ebene80]
+      ,[Ebene81]
+      ,[Ebene82]
+      ,[Ebene83]
+      ,[Ebene84]
+      ,[Ebene85]
+      ,[Ebene86]
+      ,[Ebene87]
+      ,[Ebene88]
+      ,[Ebene89]
+      ,[Ebene90]
+      ,[Anzahl Stellen_Konto_Nr]
+      ,[Konto Art]
+      ,[GuV_Bilanz]
+      ,[Acct Nr]
+      ,[Konto]
+      ,[Susa]
+  FROM [GC].[locosoft].[Kontenrahmen_GC_Struct_SKR]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 19 - 0
schema/GC_ETL_LOCOSOFT/views/data.Kontenrahmen_SKR_Vorlage.sql

@@ -0,0 +1,19 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+create view data.[Kontenrahmen_SKR_Vorlage] AS
+
+
+
+SELECT [Konto_Nr]
+      ,[Konto_Bezeichnung]
+      ,[Konto_Art]
+  FROM [GC].[data].[Kontenrahmen_SKR_Vorlage]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 29 - 0
schema/GC_ETL_LOCOSOFT/views/data.SKR_Konten_Stk_manuell.sql

@@ -0,0 +1,29 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+create view data.[SKR_Konten_Stk_manuell] AS
+
+SELECT [Ebene1]
+      ,[Ebene2]
+      ,[Ebene3]
+      ,[Ebene4]
+      ,[Ebene5]
+      ,[Ebene6]
+      ,[Ebene7]
+      ,[Ebene8]
+      ,[Ebene9]
+      ,[Ebene10]
+      ,[Acct Nr]
+      ,[Konto Bezeichnung]
+      ,[Konto]
+      ,[Guv Bilanz]
+      ,[Susa]
+  FROM [GC].[locosoft].[SKR_Konten_Stk_manuell]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 29 - 0
schema/GC_ETL_LOCOSOFT/views/data.SKR_Statistik_Stk_manuell.sql

@@ -0,0 +1,29 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+create view data.[SKR_Statistik_Stk_manuell] AS
+
+SELECT [Ebene1]
+      ,[Ebene2]
+      ,[Ebene3]
+      ,[Ebene4]
+      ,[Ebene5]
+      ,[Ebene6]
+      ,[Ebene7]
+      ,[Ebene8]
+      ,[Ebene9]
+      ,[Ebene10]
+      ,[Acct Nr]
+      ,[Konto Bezeichnung]
+      ,[Konto]
+      ,[Guv Bilanz]
+      ,[Susa]
+  FROM [GC].[locosoft].[SKR_Statistik_Stk_manuell]
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 1 - 0
schema/GC_ETL_LOCOSOFT/views/load.Aftersales_Rechnungen_ben_AW_final.sql

@@ -9,6 +9,7 @@ SELECT convert(varchar(10), [Hauptbetrieb_ID])               AS [Hauptbetrieb_ID
      , convert(varchar(50), [Standort_Name])                 AS [Standort_Name]
      , convert(varchar(20), [Employee_Function])             AS [Employee_Function]
      , convert(varchar(200), [Serviceberater])               AS [Serviceberater]
+	 , convert(varchar(150), [Monteur])                      AS [Monteur]
      , convert(varchar(500), [Order_Number])                 AS [Order Number]
      , convert(varchar(500), [Invoice_Desc_100])             AS [Invoice_Desc_100]
      , convert(varchar(100), [Fabrikat])                     AS [Fabrikat]

+ 8 - 4
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]
@@ -18,6 +18,7 @@ SELECT convert(varchar(50), [Acct Nr])                        AS [Acct Nr]
      , convert(varchar(10), Betrieb_ID)                       AS Betrieb_ID
      , convert(varchar(50), Betrieb_Name)                     AS Betrieb_Name
      , convert(varchar(200), Serviceberater)                  AS Serviceberater
+	 , convert(varchar(200), Monteur_und_Stunden)             AS Monteur
      , convert(varchar(10), Umsatzart)                        AS Umsatzart
      , convert(decimal(28, 8), [verk. Stunden])               AS [verk. Stunden]
      , convert(decimal(28, 8), [benutzte Zeit (Auftrag)])     AS [benutzte Zeit (Auftrag)]
@@ -30,7 +31,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 +58,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 +80,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 

+ 3 - 2
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 

+ 3 - 2
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 

+ 2 - 0
schema/GC_ETL_LOCOSOFT/views/load.offene_Auftraege_Ums_ben_AW.sql

@@ -9,6 +9,7 @@ SELECT convert(varchar(10), [Hauptbetrieb_ID])     AS [Hauptbetrieb_ID]
      , convert(varchar(10), [Standort_ID])         AS [Standort_ID]
      , convert(varchar(50), [Standort_Name])       AS [Standort_Name]
      , convert(varchar(150), [Serviceberater])     AS [Serviceberater]
+	 , convert(varchar(150), [Monteur])            AS [Monteur]
      , convert(varchar(500), [Order_Number])       AS [Order Number]
      , convert(varchar(100), [Fabrikat])           AS [Fabrikat]
      , convert(int, [Fabrikat_Order_By])           AS [Fabrikat_Order_By]
@@ -25,6 +26,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 

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 3 - 1
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]

+ 1 - 0
schema/GC_ETL_LOCOSOFT/views/transform.Aftersales_Rechnungen_ben_AW_final.sql

@@ -12,6 +12,7 @@ select T2.[Hauptbetrieb] as Hauptbetrieb_imr,
        "GC_Department"."Standort_Name"                                                       AS "Standort_Name",
        'Serviceberater'                                                                      AS "Employee_Function",
        "T2"."Serviceberater"                                                                 AS "Serviceberater",
+	   "T2"."Monteur_und_Stunden" AS Monteur,
        "T2"."Order Number" + ' - ' + CONVERT(VARCHAR(10), "T2"."Invoice Date", 121)          AS "Order_Number",
        ''                                                                                    AS "Invoice_Desc_100",
        T2.Fabrikat as Fabrikat_imr,

+ 2 - 2
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

+ 30 - 10
schema/GC_ETL_LOCOSOFT/views/transform.TBL_SERVICE_GUV_O21.sql

@@ -13,16 +13,17 @@ 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)]
+	  ,ben_AW.ben_Std_Auftrag / 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]
+	 , ben_AW.Monteur_und_Stunden
      , ' ' AS [Zuordnung_Funktion]
      , [Rg].[Zuordnung] AS [Zuordnung_Produktbuchungsgruppe]
      , [Rg].[Produktbuchungsgruppe] AS [Produktbuchungsgruppe]
@@ -55,12 +56,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 +85,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 +113,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]

+ 1 - 0
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"

+ 10 - 0
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"

+ 12 - 0
schema/GC_ETL_LOCOSOFT/views/transform.offene_Auftraege_Ums_ben_AW.sql

@@ -11,6 +11,7 @@ SELECT "offene_Auftraege_Ums_ben_AW"."Hauptbetrieb" AS [Hauptbetrieb_imr]
      , "GC_Department"."Standort_ID" AS "Standort_ID"
      , "GC_Department"."Standort_Name" AS "Standort_Name"
      , "offene_Auftraege_Ums_ben_AW"."Serviceberater" AS "Serviceberater"
+	 , "offene_Auftraege_Ums_ben_AW"."Monteur_und_Stunden" AS "Monteur"
      , "offene_Auftraege_Ums_ben_AW"."Order Number" AS "Order_Number"
      , "offene_Auftraege_Ums_ben_AW"."Fabrikat" AS [Fabrikat_imr]
      , CASE
@@ -39,6 +40,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"

+ 3 - 3
schema/GC_ETL_LOCOSOFT/views/transform_imr.Aftersales_Rechnungen_ben_AW_final.sql

@@ -32,7 +32,7 @@ SELECT "Invoice Type"
      , "Order Number"
      , "Order Number_Rg_Ausg"
      , "Kundenart"
-     , "Summe Duration Minutes"
+     , "Monteur_und_Stunden"
      , "Order Number_ben_AW"
      , 1.0 AS "Anzahl_Datensätze_1"
      , count("Order Number_ben_AW") OVER (PARTITION BY "Order Number") AS "Anzahl_Datensätze_2"
@@ -60,9 +60,9 @@ FROM (SELECT (
             )
     END
     ) AS "Order Number"
-           , (0.0 + [ben_AW_Order_Number]."Summe_Duration_Minutes") / 60.0 AS [c38]
+           , [ben_AW_Order_Number]."ben_Std_Auftrag" AS [c38]
            , [ben_AW_Order_Number]."order_number" AS "Order Number_ben_AW"
-           , [ben_AW_Order_Number]."Summe_Duration_Minutes" AS "Summe Duration Minutes"
+           , [ben_AW_Order_Number]."Monteur_und_Stunden" AS "Monteur_und_Stunden"
            , (left(((([employees]."employee_number"))), 4)) + ' - ' + [employees]."name" AS "Kundenart"
            , CASE
                  WHEN ((- 1 * datediff(DAY, (getdate()), (convert(datetime, [invoices]."invoice_date")))) <= 4)

+ 1 - 1
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"

+ 1 - 1
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 

+ 1 - 1
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 

+ 3 - 3
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')

+ 1 - 1
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')

+ 14 - 7
schema/GC_ETL_LOCOSOFT/views/transform_imr.offene_auftraege_ums_ben_aw.sql

@@ -53,14 +53,18 @@ SELECT c55 AS "Order Number_ori",
 	c56 AS "Net Price In Order",
 	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"
+	c58 AS "Monteur_und_Stunden",
+	--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 * c57/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,
-		T9."Summe_Duration_Minutes" / 60 AS c57,
-		T9."Summe_Duration_Minutes" AS c58,
+		T9.ben_Std_Auftrag AS c57,
+		T9.Monteur_und_Stunden AS c58,
 		T9."order_number" AS c59,
 		T2."text_line" AS c60,
 		T2."order_position" AS c61,
@@ -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

+ 1 - 1
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 

+ 35 - 7
schema/GC_ETL_LOCOSOFT/views/transform_ims.ben_AW_Order_Number.sql

@@ -2,13 +2,41 @@ SET QUOTED_IDENTIFIER ON
 GO
 SET ANSI_NULLS ON 
 GO
-CREATE   VIEW [transform_ims].[ben_AW_Order_Number]
-AS
-SELECT times."order_number" AS "Order_Number",
-	SUM(times."duration_minutes") AS "Summe_Duration_Minutes"
-FROM LOCOSOFT."dbo"."times" times
-WHERE (times."order_number" <> 0)
-GROUP BY (times."order_number")
+CREATE   VIEW [transform_ims].[ben_AW_Order_Number] AS
+WITH
+    [Mitarbeiter_Summe] AS
+        (SELECT [client_db]
+              , [order_number]
+              , [employee_number]
+              , sum([duration_minutes]) / 60.0 AS [ben_Std_Auftrag_Monteur]
+         FROM [LOCOSOFT].[dbo].[times]
+         WHERE ([order_number] <> 0)
+         GROUP BY [client_db], [order_number], [employee_number])
+  , [ben_Std_Monteur_Text] AS
+        (SELECT [M].[client_db]
+              , [M].[order_number]
+              , [M].[employee_number]
+              , [E].[name]
+              , [M].[ben_Std_Auftrag_Monteur]
+              , [E].[name] + ' (' + replace(convert(varchar, convert(decimal(18, 2), round([M].[ben_Std_Auftrag_Monteur], 2))), '.', ',') + ' h)' AS [Monteur_und_Stunden]
+         FROM [Mitarbeiter_Summe] [M]
+                  INNER JOIN [LOCOSOFT].[dbo].[employees] [E] ON [E].[client_db] = [M].[client_db]
+             AND [E].[employee_number] = [M].[employee_number]
+             AND [E].[is_latest_record] = 1)
+
+  , [ben_Std_Auftrag]
+        AS (SELECT [client_db]
+                 , [order_number]
+                 , sum([ben_Std_Auftrag_Monteur]) AS [ben_Std_Auftrag]
+                 , string_agg([Monteur_und_Stunden], ' / ') WITHIN GROUP (ORDER BY [ben_Std_Auftrag_Monteur] DESC) AS [Monteur_und_Stunden]
+            FROM [ben_Std_Monteur_Text]
+            GROUP BY [Client_DB], [order_number])
+
+SELECT [Client_DB]
+     , [Order_Number]
+     , [ben_Std_Auftrag]
+     , left([Monteur_und_Stunden], 100) AS [Monteur_und_Stunden]
+FROM [ben_Std_Auftrag]
 GO
 SET QUOTED_IDENTIFIER OFF 
 GO

+ 0 - 38
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

+ 1 - 1
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'

+ 0 - 41
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

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است