From ceb688fc3f72f747c5e58d099aac13b19b52ff4c Mon Sep 17 00:00:00 2001 From: Developer01 Date: Wed, 19 Nov 2025 16:41:36 +0100 Subject: [PATCH] Jobs Sichtbeleg Anpassung --- Jobs/Jobs.vbproj | 21 +++++------ Jobs/My Project/AssemblyInfo.vb | 4 +-- Jobs/ZUGFeRD/XRechnungViewDocument.vb | 50 +++++++-------------------- 3 files changed, 24 insertions(+), 51 deletions(-) diff --git a/Jobs/Jobs.vbproj b/Jobs/Jobs.vbproj index 3e5519c4..3fe8cbd1 100644 --- a/Jobs/Jobs.vbproj +++ b/Jobs/Jobs.vbproj @@ -67,18 +67,6 @@ - - {6ea0c51f-c2b1-4462-8198-3de0b32b74f8} - Base - - - {44982f9b-6116-44e2-85d0-f39650b1ef99} - Config - - - {eaf0ea75-5fa7-485d-89c7-b2d843b03a96} - Database - {ab6f09bf-e794-4f6a-94bb-c97c0ba84d64} Interfaces @@ -125,6 +113,15 @@ ..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll + + ..\Base\bin\Debug\DigitalData.Modules.Base.dll + + + ..\Config\bin\Debug\DigitalData.Modules.Config.dll + + + ..\Database\bin\Debug\DigitalData.Modules.Database.dll + ..\Logging\bin\Debug\DigitalData.Modules.Logging.dll diff --git a/Jobs/My Project/AssemblyInfo.vb b/Jobs/My Project/AssemblyInfo.vb index b89fb4e8..e853141d 100644 --- a/Jobs/My Project/AssemblyInfo.vb +++ b/Jobs/My Project/AssemblyInfo.vb @@ -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: - - + + diff --git a/Jobs/ZUGFeRD/XRechnungViewDocument.vb b/Jobs/ZUGFeRD/XRechnungViewDocument.vb index 7534d630..7d417297 100644 --- a/Jobs/ZUGFeRD/XRechnungViewDocument.vb +++ b/Jobs/ZUGFeRD/XRechnungViewDocument.vb @@ -19,8 +19,6 @@ Public Class XRechnungViewDocument Private fontResName As String Private fontResNameBold As String Private fontResNameItalic As String - - Public Sub New(LogConfig As LogConfig, MSSQL As MSSQLServer, GDPictureLicenseKey As String) _logConfig = LogConfig _logger = LogConfig.GetLogger() @@ -301,7 +299,7 @@ Public Class XRechnungViewDocument 'Dim otextBoxYPos As Integer If oArea = "POSITION" Or oArea = "ALLOWANCE" Then If oItemSPECNAME <> Former_oItemSPECNAME And Former_oItemSPECNAME <> "" Then - If oItemSPECNAME = "INVOICE_POSITION_ARTICLE" And oItemSPECNAME = "INVOICE_POSITION_ARTICLE_DESCRIPTION" Then + If oItemSPECNAME = "INVOICE_POSITION_ARTICLE_DESCRIPTION" And Former_oItemSPECNAME = "INVOICE_POSITION_ARTICLE" Then oDescriptionFollowup = True Else Former_oItemSPECNAME = oItemSPECNAME @@ -311,9 +309,10 @@ Public Class XRechnungViewDocument End If If {"INVOICE_POSITION_AMOUNT", "POSITION_ALLOWANCE_ACTUAL_AMOUNT", "RECEIPT_ALLOWANCE_ACTUAL_AMOUNT"}.Contains(oItemSPECNAME) Then oPosCount += 1 - oYPlus = 0 - oYDyn = 0 - yPosition += 5 + If Not oDescriptionFollowup Then + oYPlus = 0 + oYDyn = 0 + End If oPosTerm = "" MyGDPicturePDF.DrawText(fontResName, 10, yPosition, oPosCount) If oItemSPECNAME = "INVOICE_POSITION_AMOUNT" Then @@ -330,7 +329,7 @@ Public Class XRechnungViewDocument End If Dim oPartsNL As List(Of String) = StringFunctions.SplitTextByNewLine(oItemValue) For Each olinepart As String In oPartsNL - Dim oParts As List(Of String) = StringFunctions.SplitText_Length(olinepart, 66) + Dim oParts As List(Of String) = StringFunctions.SplitText_Length(olinepart, 64) ' Durchlaufen der einzelnen Teile in einer Schleife For Each part As String In oParts MyGDPicturePDF.DrawText(fontResName, 19, oYDyn, part) @@ -348,21 +347,22 @@ Public Class XRechnungViewDocument oDisplay = False ElseIf {"POSITION_ALLOWANCE_REASON", "RECEIPT_ALLOWANCE_REASON", "INVOICE_POSITION_ARTICLE", "INVOICE_POSITION_ARTICLE_DESCRIPTION"}.Contains(oItemSPECNAME) Then 'Tabellendarstellung - oYPlus = 0 + If Not oDescriptionFollowup Then + oYPlus = 0 + End If + If oYDyn = 0 Then + oYDyn = yPosition + End If Dim oX = 50 If oItemSPECNAME.Contains("ALLOWANCE") Then oX = 20 End If oPosDesc = "" oPosDesc = oItemValue - If oYDyn = 0 Then - oYDyn = yPosition - End If - Dim oPartsNL As List(Of String) = StringFunctions.SplitTextByNewLine(oItemValue) For Each olinepart As String In oPartsNL - Dim oParts As List(Of String) = StringFunctions.SplitText_Length(olinepart, 66) + Dim oParts As List(Of String) = StringFunctions.SplitText_Length(olinepart, 64) ' Durchlaufen der einzelnen Teile in einer Schleife For Each part As String In oParts MyGDPicturePDF.DrawText(fontResName, oX, oYDyn, part) @@ -370,8 +370,6 @@ Public Class XRechnungViewDocument oYPlus += 5 Next Next - - oDisplay = False ElseIf oItemSPECNAME = "INVOICE_POSITION_NOTE" Then 'Tabellendarstellung @@ -392,26 +390,6 @@ Public Class XRechnungViewDocument Next Next - 'oPosTerm += $" {oItemValue}" - oDisplay = False - ElseIf oItemSPECNAME = "INVOICE_POSITION_ARTICLE_DESCRIPTION" Then - 'Tabellendarstellung - Dim cleanedText As String = RemoveNewlinesAndTabs(oItemValue) - Dim oParts As List(Of String) = StringFunctions.SplitText_Length(cleanedText, 70) - ' Durchlaufen der einzelnen Teile in einer Schleife - If oYDyn = 0 Then - oYDyn = yPosition - End If - Dim oPartsNL As List(Of String) = StringFunctions.SplitTextByNewLine(oItemValue) - For Each olinepart As String In oPartsNL - Dim oPartsPN As List(Of String) = StringFunctions.SplitText_Length(olinepart, 70) - ' Durchlaufen der einzelnen Teile in einer Schleife - For Each part As String In oPartsPN - MyGDPicturePDF.DrawText(fontResName, 50, oYDyn, part) - oYDyn += 5 - oYPlus += 5 - Next - Next 'oPosTerm += $" {oItemValue}" oDisplay = False ElseIf {"INVOICE_TAXPOS_TAX_RATE", "INVOICE_TAXPOS_RATE", "POSITION_ALLOWANCE_CALCULATION_PERCENT", "RECEIPT_ALLOWANCE_CALCULATION_PERCENT", "RECEIPT_ALLOWANCE_VAT_RATE"}.Contains(oItemSPECNAME) Then @@ -500,8 +478,6 @@ Public Class XRechnungViewDocument Else If oItemSPECNAME = "INVOICE_POSITION_TAX_AMOUNT" And oYPlus > 0 Then yPosition += oYPlus - ElseIf oItemSPECNAME = "RECEIPT_ALLOWANCE_CHARGE_INDICATOR" Then - yPosition -= 5 Else