Modules.Interfaces: Version 2.0.1.0

Interfaces/My Project/AssemblyInfo.vb

@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("Modules.Interfaces")>
 <Assembly: AssemblyCopyright("Copyright © 2024")>
-<Assembly: AssemblyTrademark("1.12.1.0")>
+<Assembly: AssemblyTrademark("2.0.1.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.0.0.0")>
-<Assembly: AssemblyFileVersion("2.0.0.0")>
+<Assembly: AssemblyVersion("2.0.1.0")>
+<Assembly: AssemblyFileVersion("2.0.1.0")>

Interfaces/ZUGFeRDInterface.vb

@@ -1,13 +1,8 @@
-Imports System.Collections.Generic
-Imports System.IO
-Imports System.Reflection.Emit
+Imports System.IO
 Imports System.Xml
 Imports System.Xml.Serialization
-Imports System.Xml.XPath
-Imports System.Xml.Xsl
 Imports DigitalData.Modules.Interfaces.Exceptions
 Imports DigitalData.Modules.Interfaces.ZUGFeRD
-Imports DigitalData.Modules.Interfaces.ZUGFeRDInterface
 Imports DigitalData.Modules.Logging
 Imports GdPicture14
 
@@ -24,6 +19,11 @@ Public Class ZUGFeRDInterface
     Public Const ZUGFERD_SPEC_10 = "ZUGFERD_10"
     Public Const ZUGFERD_SPEC_2x = "ZUGFERD_2x"
 
+    Public Const XMLSCHEMA_ZUGFERD_10 = "Version1_0"
+    Public Const XMLSCHEMA_ZUGFERD_20 = "Version2_0"
+    Public Const XMLSCHEMA_ZUGFERD_211 = "Version2_1_1"
+    Public Const XMLSCHEMA_ZUGFERD_22 = "Version2_2_FacturX"
+
     Private ReadOnly ValidFilenames As New List(Of String) From {
         PDFEmbeds.ZUGFERD_XML_FILENAME.ToUpper,
         PDFEmbeds.FACTUR_X_XML_FILENAME_DE.ToUpper,
@@ -57,6 +57,7 @@ Public Class ZUGFeRDInterface
         Public Property XElementObject As XElement
         Public Property SchemaObject As Object
         Public Property Specification As String
+        Public Property UsedXMLSchema As String
         Public Property ValidationErrors As New List(Of ZugferdValidationError)
     End Class
 
@@ -279,6 +280,7 @@ Public Class ZUGFeRDInterface
     Private Class AllowedType
         Public SchemaType As Type
         Public Specification As String
+        Public XMLSchema As String
     End Class
 
     Public Function ValidateZUGFeRDDocument(pResult As ZugferdResult) As ZugferdResult
@@ -291,13 +293,15 @@ Public Class ZUGFeRDInterface
 
             Dim oObject As Object = Nothing
             Dim oSpecification As String = Nothing
+            Dim oUsedXMLSchema As String = Nothing
 
             Dim oAllowedTypes As New List(Of AllowedType)
 
             If _Options.AllowZugferd_1_0_Schema Then
                 oAllowedTypes.Add(New AllowedType With {
                     .SchemaType = GetType(Version1_0.CrossIndustryDocumentType),
-                    .Specification = ZUGFERD_SPEC_10
+                    .Specification = ZUGFERD_SPEC_10,
+                    .XMLSchema = XMLSCHEMA_ZUGFERD_10
                 })
             End If
 
@@ -305,15 +309,18 @@ Public Class ZUGFeRDInterface
                 oAllowedTypes.AddRange(New List(Of AllowedType) From {
                     New AllowedType With {
                         .SchemaType = GetType(Version2_0.CrossIndustryInvoiceType),
-                        .Specification = ZUGFERD_SPEC_2x
+                        .Specification = ZUGFERD_SPEC_2x,
+                        .XMLSchema = XMLSCHEMA_ZUGFERD_20
                     },
                     New AllowedType With {
                         .SchemaType = GetType(Version2_1_1.CrossIndustryInvoiceType),
-                        .Specification = ZUGFERD_SPEC_2x
+                        .Specification = ZUGFERD_SPEC_2x,
+                        .XMLSchema = XMLSCHEMA_ZUGFERD_211
                     },
                     New AllowedType With {
                         .SchemaType = GetType(Version2_2_FacturX.CrossIndustryInvoiceType),
-                        .Specification = ZUGFERD_SPEC_2x
+                        .Specification = ZUGFERD_SPEC_2x,
+                        .XMLSchema = XMLSCHEMA_ZUGFERD_22
                     }
                 })
             End If
@@ -327,6 +334,7 @@ Public Class ZUGFeRDInterface
                     oReader = pResult.XElementObject.CreateReader()
                     oObject = oSerializer.Deserialize(oReader)
                     oSpecification = oType.Specification
+                    oUsedXMLSchema = oType.XMLSchema
 
                     _logger.Debug("Serializing with type [{0}] succeeded", oTypeName)
                     Exit For
@@ -345,6 +353,7 @@ Public Class ZUGFeRDInterface
             End If
 
             pResult.Specification = oSpecification
+            pResult.UsedXMLSchema = oUsedXMLSchema
             pResult.SchemaObject = oObject
 
             Return pResult

Jobs/My Project/AssemblyInfo.vb

@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("Modules.Jobs")>
 <Assembly: AssemblyCopyright("Copyright © 2024")>
-<Assembly: AssemblyTrademark("2.5.8.0")>
+<Assembly: AssemblyTrademark("2.5.9.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
 ' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 ' übernehmen, indem Sie "*" eingeben:
 
-<Assembly: AssemblyVersion("2.5.8.0")>
-<Assembly: AssemblyFileVersion("2.5.8.0")>
+<Assembly: AssemblyVersion("2.5.9.0")>
+<Assembly: AssemblyFileVersion("2.5.9.0")>

Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb

@@ -548,7 +548,7 @@ Public Class ImportZUGFeRDFiles
         'Next
 
         ' DataTable vorbereiten
-        Dim oDataTable As DataTable = FillDataTable(pMessageId, oCheckResult, oDocument.Specification)
+        Dim oDataTable As DataTable = FillDataTable(pMessageId, oCheckResult, oDocument.Specification, oDocument.UsedXMLSchema)
 
         ' ColumnList initialisieren
         Dim oColumnNames As List(Of String) = New List(Of String) From {
@@ -578,7 +578,7 @@ Public Class ImportZUGFeRDFiles
 
     End Function
 
-    Private Function FillDataTable(pMessageId As String, pCheckResult As PropertyValues.CheckPropertyValuesResult, pSpecification As String) As DataTable
+    Private Function FillDataTable(pMessageId As String, pCheckResult As PropertyValues.CheckPropertyValuesResult, pSpecification As String, pUsedXMLSchema As String) As DataTable
 
         Dim oDataTable As DataTable = New DataTable()
         oDataTable.Columns.Add(New DataColumn("REFERENCE_GUID", GetType(String)))
@@ -600,6 +600,17 @@ Public Class ImportZUGFeRDFiles
         _logger.Debug("Mapping Property [ZUGFERD_SPECIFICATION] with value [{0}]", pSpecification)
         oDataTable.Rows.Add(oFirstRow)
 
+        ' Zweite Zeile enthält das verwendete XML Schema
+        Dim oSecondRow As DataRow = oDataTable.NewRow()
+        oSecondRow("REFERENCE_GUID") = pMessageId
+        oSecondRow("ITEM_DESCRIPTION") = "ZUGFeRDXMLSchema"
+        oSecondRow("ITEM_VALUE") = pUsedXMLSchema
+        oSecondRow("GROUP_COUNTER") = 0
+        oSecondRow("SPEC_NAME") = "ZUGFERD_XML_SCHEMA"
+        oSecondRow("IS_REQUIRED") = False
+
+        _logger.Debug("Mapping Property [ZUGFERD_XML_SCHEMA] with value [{0}]", pUsedXMLSchema)
+        oDataTable.Rows.Add(oSecondRow)
 
         For Each oProperty In pCheckResult.ValidProperties