MS Jobs sichtbeelg

This commit is contained in:
Developer01 2025-04-25 14:57:24 +02:00
parent 7ef808d221
commit a420c1a618
3 changed files with 64 additions and 19 deletions

View File

@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern ' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
<Assembly: AssemblyVersion("2.9.0.0")> <Assembly: AssemblyVersion("2.9.1.0")>
<Assembly: AssemblyFileVersion("2.9.0.0")> <Assembly: AssemblyFileVersion("2.9.1.0")>

View File

@ -163,10 +163,11 @@ Public Class XRechnungViewDocument
ElseIf oArea = "POSITION" Then ElseIf oArea = "POSITION" Then
'Tabellendarstellung 'Tabellendarstellung
MyGDPicturePDF.DrawText(fontResName, 10, yPosition, "Pos#") MyGDPicturePDF.DrawText(fontResName, 10, yPosition, "Pos#")
MyGDPicturePDF.DrawText(fontResName, 20, yPosition, "Anz./Am.") MyGDPicturePDF.DrawText(fontResName, 19, yPosition, "Anz./am.")
MyGDPicturePDF.DrawText(fontResName, 38, yPosition, "Pos.-Text") MyGDPicturePDF.DrawText(fontResName, 35, yPosition, "Einh/unt")
MyGDPicturePDF.DrawText(fontResName, 155, yPosition, "Steuer/Tax") MyGDPicturePDF.DrawText(fontResName, 50, yPosition, "Pos.Text")
MyGDPicturePDF.DrawText(fontResName, 175, yPosition, "Betrag/Sum") MyGDPicturePDF.DrawText(fontResName, 164, yPosition, "Steuer/tax")
MyGDPicturePDF.DrawText(fontResName, 181, yPosition, "Betrag/sum")
yPosition += 5 yPosition += 5
'Tabellendarstellung Ende 'Tabellendarstellung Ende
End If End If
@ -191,7 +192,7 @@ Public Class XRechnungViewDocument
'MyGDPicturePDF.DrawTextBox(fontResName, 10, otextBoxYPos, 16, YCoo_TextBoxPlus5(otextBoxYPos), 'MyGDPicturePDF.DrawTextBox(fontResName, 10, otextBoxYPos, 16, YCoo_TextBoxPlus5(otextBoxYPos),
' TextAlignment.TextAlignmentFar, TextAlignment.TextAlignmentNear, ' TextAlignment.TextAlignmentFar, TextAlignment.TextAlignmentNear,
' oPosCount) ' oPosCount)
MyGDPicturePDF.DrawText(fontResName, 20, yPosition, oItemValue) MyGDPicturePDF.DrawText(fontResName, 19, yPosition, oItemValue)
'Tabellendarstellung Ende 'Tabellendarstellung Ende
oDisplay = False oDisplay = False
' yPosition -= 5 ' yPosition -= 5
@ -214,7 +215,6 @@ Public Class XRechnungViewDocument
If oItemSPECNAME = "INVOICE_POSITION_AMOUNT" Then If oItemSPECNAME = "INVOICE_POSITION_AMOUNT" Then
oPosCount += 1 oPosCount += 1
oYPlus = 0 oYPlus = 0
'oPosTerm = $"{oPosCount}. {oItemValue} * "
'Tabellendarstellung 'Tabellendarstellung
yPosition += 5 yPosition += 5
oPosTerm = "" oPosTerm = ""
@ -223,9 +223,14 @@ Public Class XRechnungViewDocument
'MyGDPicturePDF.DrawTextBox(fontResName, 10, otextBoxYPos, 16, YCoo_TextBoxPlus5(otextBoxYPos), 'MyGDPicturePDF.DrawTextBox(fontResName, 10, otextBoxYPos, 16, YCoo_TextBoxPlus5(otextBoxYPos),
' TextAlignment.TextAlignmentFar, TextAlignment.TextAlignmentNear, ' TextAlignment.TextAlignmentFar, TextAlignment.TextAlignmentNear,
' oPosCount) ' oPosCount)
MyGDPicturePDF.DrawText(fontResName, 20, yPosition, oItemValue) MyGDPicturePDF.DrawText(fontResName, 19, yPosition, oItemValue)
'Tabellendarstellung Ende 'Tabellendarstellung Ende
oDisplay = False oDisplay = False
ElseIf oItemSPECNAME = "INVOICE_POSITION_UNIT_TYPE" Then
oYPlus = 0
Dim oUnit = Return_UnitType(oItemValue)
MyGDPicturePDF.DrawText(fontResName, 35, yPosition, oUnit)
oDisplay = False
ElseIf oItemSPECNAME = "INVOICE_POSITION_ARTICLE" Then ElseIf oItemSPECNAME = "INVOICE_POSITION_ARTICLE" Then
'Tabellendarstellung 'Tabellendarstellung
oYPlus = 0 oYPlus = 0
@ -239,7 +244,7 @@ Public Class XRechnungViewDocument
For Each part As String In oParts For Each part As String In oParts
oYDyn += 5 oYDyn += 5
oYPlus += 5 oYPlus += 5
MyGDPicturePDF.DrawText(fontResName, 38, oYDyn, part) MyGDPicturePDF.DrawText(fontResName, 50, oYDyn, part)
Next Next
Next Next
'Tabellendarstellung Ende 'Tabellendarstellung Ende
@ -248,25 +253,25 @@ Public Class XRechnungViewDocument
ElseIf oItemSPECNAME = "INVOICE_POSITION_NOTE" Then ElseIf oItemSPECNAME = "INVOICE_POSITION_NOTE" Then
'Tabellendarstellung 'Tabellendarstellung
Dim cleanedText As String = RemoveNewlinesAndTabs(oItemValue) Dim cleanedText As String = RemoveNewlinesAndTabs(oItemValue)
Dim oParts As List(Of String) = StringFunctions.SplitText_Length(cleanedText, 68) Dim oParts As List(Of String) = StringFunctions.SplitText_Length(cleanedText, 70)
' Durchlaufen der einzelnen Teile in einer Schleife ' Durchlaufen der einzelnen Teile in einer Schleife
Dim oYDyn As Integer = yPosition Dim oYDyn As Integer = yPosition
Dim oPartsNL As List(Of String) = StringFunctions.SplitTextByNewLine(oItemValue) Dim oPartsNL As List(Of String) = StringFunctions.SplitTextByNewLine(oItemValue)
For Each olinepart As String In oPartsNL For Each olinepart As String In oPartsNL
Dim oPartsPN As List(Of String) = StringFunctions.SplitText_Length(olinepart, 67) Dim oPartsPN As List(Of String) = StringFunctions.SplitText_Length(olinepart, 70)
' Durchlaufen der einzelnen Teile in einer Schleife ' Durchlaufen der einzelnen Teile in einer Schleife
For Each part As String In oPartsPN For Each part As String In oPartsPN
oYDyn += 5 oYDyn += 5
oYPlus += 5 oYPlus += 5
MyGDPicturePDF.DrawText(fontResName, 38, oYDyn, part) MyGDPicturePDF.DrawText(fontResName, 50, oYDyn, part)
Next Next
Next Next
'Tabellendarstellung Ende
'oPosTerm += $" {oItemValue}" 'oPosTerm += $" {oItemValue}"
oDisplay = False oDisplay = False
ElseIf oItemSPECNAME = "INVOICE_TAXPOS_TAX_RATE" Or oItemSPECNAME = "INVOICE_TAXPOS_RATE" Then ElseIf oItemSPECNAME = "INVOICE_TAXPOS_TAX_RATE" Or oItemSPECNAME = "INVOICE_TAXPOS_RATE" Then
'Tabellendarstellung 'Tabellendarstellung
MyGDPicturePDF.DrawText(fontResName, 155, yPosition, $"{oItemValue} %") MyGDPicturePDF.DrawText(fontResName, 164, yPosition, $"{oItemValue} %")
'Tabellendarstellung ENDE 'Tabellendarstellung ENDE
' oPosTerm += $" - {oItemValue} %" ' oPosTerm += $" - {oItemValue} %"
oDisplay = False oDisplay = False
@ -274,10 +279,12 @@ Public Class XRechnungViewDocument
' oPosTerm += $" - {oItemValue} {oCurrencySymbol}" ' oPosTerm += $" - {oItemValue} {oCurrencySymbol}"
'Tabellendarstellung 'Tabellendarstellung
Dim oYPos = yPosition - 3.5 Dim oYPos = yPosition - 3.5
MyGDPicturePDF.DrawTextBox(fontResName, 175, oYPos, 193, YCoo_TextBoxPlus5(oYPos), Dim TAXTERM = $"{oItemValue} {oCurrencySymbol}"
MyGDPicturePDF.DrawTextBox(fontResName, 177, oYPos, 198, YCoo_TextBoxPlus5(oYPos),
TextAlignment.TextAlignmentFar, TextAlignment.TextAlignmentNear, TextAlignment.TextAlignmentFar, TextAlignment.TextAlignmentNear,
$"{oItemValue} {oCurrencySymbol}") TAXTERM)
' MyGDPicturePDF.DrawText(fontResName, 175, yPosition, $"{oItemValue} {oCurrencySymbol}") ' MyGDPicturePDF.DrawText(fontResName, 180, yPosition, $"{oItemValue} {oCurrencySymbol}")
'Tabellendarstellung Ende 'Tabellendarstellung Ende
End If End If
oItemValue = oPosTerm oItemValue = oPosTerm
@ -453,4 +460,42 @@ Public Class XRechnungViewDocument
Return oReturn Return oReturn
End Function End Function
Private Function Return_UnitType(pType As String) As String
Dim oReturn As String = "Stück/pc"
If pType = "C62" Then
oReturn = "Stück/pc"
ElseIf pType = "DAY" Then
oReturn = "Tag/day"
ElseIf pType = "HAR" Then
oReturn = "Hek/hec"
ElseIf pType = "HUR" Then
oReturn = "h"
ElseIf pType = "KGM" Then
oReturn = "kg"
ElseIf pType = "KTM" Then
oReturn = "km"
ElseIf pType = "KWH" Then
oReturn = pType
ElseIf pType = "LS" Then
oReturn = "pausch/flat"
ElseIf pType = "MIN" Then
oReturn = "minute"
ElseIf pType = "MTK" Then
oReturn = "QM/SM"
ElseIf pType = "Kubik/CM" Then
oReturn = "MTR"
ElseIf pType = "Meter" Then
oReturn = "minute"
ElseIf pType = "P1" Then
oReturn = "%"
ElseIf pType = "SET" Then
oReturn = "Set"
ElseIf pType = "TNE" Then
oReturn = "Tonne/ton"
ElseIf pType = "WEE" Then
oReturn = "Woche/week"
End If
Return oReturn
End Function
End Class End Class

View File

@ -35,7 +35,7 @@
<OptionExplicit>On</OptionExplicit> <OptionExplicit>On</OptionExplicit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<OptionCompare>Binary</OptionCompare> <OptionCompare>Text</OptionCompare>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<OptionStrict>Off</OptionStrict> <OptionStrict>Off</OptionStrict>