AppStd/Modules
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modules.Interface + Modules.Jobs: ITEM_TYPE = 4 / Description enthält jetzt BT-Feld-Info / Kommentare / Abfrage BT-Felder

Browse Source
This commit is contained in:
PitzM
2025-07-07 10:49:15 +02:00
parent 262805d112
commit e8ebc30225
4 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Interfaces/ZUGFeRDInterface.vb
View File

@@ -248,7 +248,7 @@ Public Class ZUGFeRDInterface
Throw ex
Catch ex As Exception
_logger.Warn("Error while validating ZUGFeRD file with GDPicture")
_logger.Warn("Error while validating eInvoice file with GDPicture")
_logger.Error(ex)
Throw ex
End Try
@@ -277,7 +277,7 @@ Public Class ZUGFeRDInterface
Throw ex
Catch ex As Exception
_logger.Warn("Error while validating ZUGFeRD file with GDPicture")
_logger.Warn("Error while validating eInvoice file with GDPicture")
_logger.Error(ex)
Throw ex
End Try
@@ -442,7 +442,7 @@ Public Class ZUGFeRDInterface
Catch ex As Exception
_logger.Error(ex)
Dim oMessage = "Datei ist eine ungültige ZUGFeRD Datei oder das Format wird nicht unterstüzt, oder das Format ist deaktiviert."
Dim oMessage = "Datei ist eine ungültige eInvoice Datei oder das Format wird nicht unterstüzt, oder das Format ist deaktiviert."
Throw New ZUGFeRDExecption(ErrorType.NoValidZugferd, oMessage)
End Try
End Function

2
Interfaces/ZUGFeRDInterface/Enums/Item_Types.vb
View File

@@ -3,6 +3,6 @@
DateType '1
MoneyType '2
FileType '3
ListType '4
ListType '4 - vgl. Währung
End Enum

18
Interfaces/ZUGFeRDInterface/PropertyValues.vb
View File

@@ -130,7 +130,7 @@ Public Class PropertyValues
End If
If IsNothing(oPropertyValue) OrElse String.IsNullOrEmpty(oPropertyValue) Then
If oColumn.Key.IsRequired Then
_logger.Warn($"{MessageId} # oPropertyValue for column [{oTableColumn}] is empty or not found but is required. Continuing with Empty String.")
_logger.Warn($"{MessageId} - oPropertyValue for column [{oTableColumn}] is empty or not found but is required. Continuing with Empty String.")
Dim oMissingProperty = New MissingProperty() With {
.EN16931_ID = oEN16931Value,
.Description = oPropertyDescription,
@@ -138,7 +138,7 @@ Public Class PropertyValues
}
oResult.MissingProperties.Add(oMissingProperty)
Else
_logger.Debug($"{MessageId} # oPropertyValue for column [{oTableColumn}] is empty or not found. Continuing with Empty String.")
_logger.Debug($"{MessageId} - oPropertyValue for column [{oTableColumn}] is empty or not found. Continuing with Empty String.")
End If
oPropertyValue = String.Empty
@@ -183,11 +183,12 @@ Public Class PropertyValues
Dim oIsRequired = oItem.Value.IsRequired
Dim oDescription = oItem.Value.Description
Dim oItemType = oItem.Value.ItemType
Dim oEN16931_ID = oItem.Value.EN16931_ID
Try
oPropertyValueList = GetPropValue(pDocument, oItem.Key)
Catch ex As Exception
_logger.Warn("{2} # Unknown error occurred while fetching specification [{0}] in group [{1}]:", oTableColumn, oItem.Value.GroupScope, MessageId)
_logger.Warn("{2} - Unknown error occurred while fetching specification [{0}] in group [{1}]:", oTableColumn, oItem.Value.GroupScope, MessageId)
_logger.Warn("ERROR-MESSAGE [{0}]", ex.Message)
_logger.Error(ex)
oPropertyValueList = New List(Of Object)
@@ -219,7 +220,7 @@ Public Class PropertyValues
If IsNothing(oPropertyValue) OrElse String.IsNullOrEmpty(oPropertyValue) Then
If oItem.Value.IsRequired Then
_logger.Warn("{0} # Specification [{1}] is empty, but marked as required! Skipping.", MessageId, oTableColumn)
_logger.Warn("Specification [{1}] is empty, but marked as required! Skipping.", oTableColumn)
Dim oMissingProperty = New MissingProperty With
{
.Description = oPropertyDescription,
@@ -228,14 +229,14 @@ Public Class PropertyValues
oResult.MissingProperties.Add(oMissingProperty)
Continue For
Else
_logger.Debug("{0} # oPropertyValue for specification [{1}] is empty or not found. Skipping.", MessageId, oTableColumn)
_logger.Debug("oPropertyValue for specification [{1}] is empty or not found. Skipping.", oTableColumn)
Continue For
End If
End If
' Statt dem Zahlenwert des Enums, wollen wir die Währunsgbezeichnung
If oTableColumn = "INVOICE_CURRENCY" Then
' Statt dem Zahlenwert des Enums, wollen wir die Währungsbezeichnung
If oTableColumn = "INVOICE_CURRENCY" Or oItemType = 4 Then
oPropertyValue = oPropertyValue.ToString()
End If
@@ -247,7 +248,8 @@ Public Class PropertyValues
.TableColumn = oTableColumn,
.IsRequired = oIsRequired,
.XMLPath = oPropertyPath,
.ItemType = oItemType
.ItemType = oItemType,
.EN16931_ID = oEN16931_ID
})
Next