edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mailversand, Abrechnung, Kundenblatt, MDMEinarbeitung, etc.

Browse Source
This commit is contained in:
d.breimaier
2025-10-08 09:28:13 +02:00
parent 8d1829625e
commit 3a02ac894a
14 changed files with 242 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb
View File

@@ -500,6 +500,7 @@ Public Class cIDS
MDMEinarb.ds_total += cnt - 1
MDMEinarb.ds_count += counTrans
MDMEinarb.import_date = Now()
MDMEinarb.importfilename = fi.Name
If MDMEinarb.ds_total = MDMEinarb.ds_count Then
MDMEinarb.completed = True

2
VERAG_PROG_ALLGEMEIN/Classes/cMDMEInarbeitung.vb
View File

@@ -12,6 +12,7 @@ Public Class cMDMEinarbeitung
Property completed As Boolean = False
Property completed_date As Object = Nothing
Property import_date As Object = Nothing
Property importfilename As Object = Nothing
Public hasEntry = False
@@ -46,6 +47,7 @@ Public Class cMDMEinarbeitung
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("completed", completed))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("completed_date", completed_date))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("import_date", import_date))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("importfilename", importfilename))
Return list
End Function

56
VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb
View File

@@ -1,11 +1,11 @@

Imports com.sun.xml.internal.rngom
Imports iTextSharp.text.pdf
Imports iTextSharp.text.pdf.parser
Imports System.IO
Imports System.Windows.Forms
Public Class cMDMFunctionsAllgemein
Public Shared ploseAlteLogikSchnittstelle As Boolean = False
@@ -993,14 +993,43 @@ Public Class cMDMFunctionsAllgemein
If dsID > 0 Then
'Me.Cursor = Cursors.WaitCursor
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dsID)
Dim PathList As New List(Of String)
Dim zielPfadZusammenfassung As String
Dim merged As Boolean = False
If DS.DATA_LIST.coll_daId > 0 Then
For Each L As cDatenarchiv_Collection In DS.DATA_LIST.LIST
If L.coll_pfad <> "" Then PathList.Add(L.coll_pfad)
Next
Else
Dim PathTemp As String = DS.GET_TOP1_PATH
If PathTemp <> "" Then PathList.Add(PathTemp)
End If
If PathList.Count > 1 Then
zielPfadZusammenfassung = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Merged_" & DS.da_KundenNr & ".pdf", ".pdf",, False, "Zusammenfassung")
Dim fm_new As New VERAG_PROG_ALLGEMEIN.cFormularManager
fm_new.mergePDFs(PathList, zielPfadZusammenfassung)
merged = True
End If
Dim Path As String = IIf(zielPfadZusammenfassung <> "" AndAlso merged, zielPfadZusammenfassung, If(PathList.Any(), PathList.First(), ""))
If nummierung > 0 Then
'wenn PDF nicht beschreibbar, dann mittels Stamp!
If PDFisProtected Then
If Path = "" Then Return Path
Dim tempPathNew = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(DS.da_name & "_modified", ".pdf", True, False, "USTVA")
Dim pdfReader As iTextSharp.text.pdf.PdfReader = New iTextSharp.text.pdf.PdfReader(DS.GET_TOP1_PATH)
Dim pdfReader As iTextSharp.text.pdf.PdfReader = New iTextSharp.text.pdf.PdfReader(Path)
PdfReader.unethicalreading = True
Dim fs = New FileStream(tempPathNew, FileMode.Create, FileAccess.Write, FileShare.None)
@@ -1013,7 +1042,7 @@ Public Class cMDMFunctionsAllgemein
canvas.BeginText()
'The origin (0,0) is at the bottom-left corner of the page and represent coordinates in points!!!!!
Dim _height = pdfReader.GetPageSizeWithRotation(page).GetTop(25) 'oberer Rand
Dim _height = pdfReader.GetPageSizeWithRotation(page).GetTop(20) 'oberer Rand
Dim _width = pdfReader.GetPageSizeWithRotation(page).GetRight(0) / 2 'Mitte
'Workaround!
@@ -1035,8 +1064,9 @@ Public Class cMDMFunctionsAllgemein
Else
If Path = "" Then Return Path
Dim pdfReader As iTextSharp.text.pdf.PdfReader = New iTextSharp.text.pdf.PdfReader(DS.GET_TOP1_PATH)
Dim pdfReader As iTextSharp.text.pdf.PdfReader = New iTextSharp.text.pdf.PdfReader(Path)
Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager
Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
@@ -1047,7 +1077,7 @@ Public Class cMDMFunctionsAllgemein
pdfReader.Close()
Dim PdfTmp = fm.fillPDFVorhandenesLokalesPDF_Path(DS.GET_TOP1_PATH, listTowrite, , , , ,)
Dim PdfTmp = fm.fillPDFVorhandenesLokalesPDF_Path(IIf(zielPfadZusammenfassung <> "" AndAlso merged, zielPfadZusammenfassung, PathList.First), listTowrite, , , , ,)
Return PdfTmp
End If
@@ -1055,7 +1085,7 @@ Public Class cMDMFunctionsAllgemein
Else
Return DS.GET_TOP1_PATH
Return Path
End If
@@ -1083,25 +1113,25 @@ Public Class cMDMFunctionsAllgemein
LEFT JOIN [tblUStVLeistender] as leist
ON ([tblUStVPositionen].[UStVPo_LeistenderId] > 0
AND leist.[UStV_LeistenderId] = [tblUStVPositionen].[UStVPo_LeistenderId])
OR ([tblUStVPositionen].[UStVPo_LeistenderId] <= 0
AND leist.[UStV_Leistender] = [tblUStVPositionen].[UStVPo_Leistender])
OR ([tblUStVPositionen].[UStVPo_LeistenderId] <= 0
AND leist.[UStV_Leistender]= [tblUStVPositionen].[UStVPo_Leistender])
where UStVAn_ID=" & USTV_ANTRAG.UStVAn_ID & sqlWHere & " ORDER BY UStVPo_ID"
Dim dtNew As DataTable = sql.loadDgvBySql(StringSQL, "FMZOLL")
Dim dtNew As DataTable = sql.loadDgvBySql(StringSQL, " FMZOLL")
If dtNew IsNot Nothing AndAlso dtNew.Rows.Count > 0 Then
If type = "excel" Then
If type = " excel" Then
Dim sumVAT As Double = 0
For Each row In dtNew.Rows
If Not IsDBNull(row("Amount of tax refund")) AndAlso IsNumeric(row("Amount of tax refund")) Then sumVAT += CDbl(row("Amount of tax refund"))
If Not IsDBNull(row("Amount of tax refund")) AndAlso IsNumeric(row("Amount of tax refund")) Then row("Amount of tax refund") = CDbl(row("Amount of tax refund"))
If Not IsDBNull(row("Name of supplier")) AndAlso row("Name of supplier") <> "" AndAlso Not IsDBNull(row("VAT")) AndAlso row("VAT") <> "" Then
If Not IsDBNull(row(" Amount of tax refund")) AndAlso IsNumeric(row(" Amount of tax refund")) Then sumVAT += CDbl(row(" Amount of tax refund"))
If Not IsDBNull(row(" Amount of tax refund")) AndAlso IsNumeric(row(" Amount of tax refund")) Then row(" Amount of tax refund") = CDbl(row(" Amount of tax refund"))
If Not IsDBNull(row(" Name of supplier")) AndAlso row(" Name of supplier") <> "" AndAlso Not IsDBNull(row("VAT")) AndAlso row("VAT") <> "" Then
row("Name of supplier") = row("Name of supplier").ToString.Replace(" " & row("VAT").ToString.Substring(0, 2), "")
End If
Next

16
VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb
View File

@@ -25,9 +25,10 @@ Public Class cRMC
Property rmc_daId As Object = Nothing
Property rmc_archiviertDatum As Object
Property rmc_archiv As Boolean = False
Property rmc_fibuNr As Boolean = False
Property rmc_fibuNr As Object = False
Property rmc_sammelReNr As Object = Nothing
Property UStVAn_ID As Object = Nothing
Property rmc_daId_InvAtt As Object = Nothing
Public hasEntry = False
@@ -42,6 +43,14 @@ Public Class cRMC
Me.rmc_reNr = rmc_reNr
LOAD()
End Sub
Sub New(rmc_kdNr, rmc_reNr, rmc_reDatum)
Me.rmc_kdNr = rmc_kdNr
Me.rmc_reNr = rmc_reNr
Me.rmc_reDatum = rmc_reDatum
LOAD()
End Sub
Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
'list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_id", rmc_id))
@@ -68,6 +77,7 @@ Public Class cRMC
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_sammelReNr", rmc_sammelReNr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_betragMWST", rmc_betragMWST))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_ID", UStVAn_ID))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_daId_InvAtt", rmc_daId_InvAtt))
Return list
@@ -166,11 +176,11 @@ Public Class cRMC
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand(" SELECT rmc_reDatum,rmc_kdNr,[rmc_reNr],sum([rmc_betragNetto])[rmc_betragNetto],sum([rmc_betragMWST])[rmc_betragMWST] ,sum([rmc_betragBrutto] )[rmc_betragBrutto], [rmc_waehrung], sum([rmc_euroBrutto])[rmc_euroBrutto], rmc_daId FROM [tblRMCImport]
Using cmd As New SqlCommand(" SELECT rmc_reDatum,rmc_kdNr,[rmc_reNr],sum([rmc_betragNetto])[rmc_betragNetto],sum([rmc_betragMWST])[rmc_betragMWST] ,sum([rmc_betragBrutto] )[rmc_betragBrutto], [rmc_waehrung], sum([rmc_euroBrutto])[rmc_euroBrutto], rmc_daId, isnull(rmc_daId_InvAtt,0) as rmc_daId_InvAtt FROM [tblRMCImport]
INNER JOIN Adressen as adr on rmc_kdNr=adr.[WölflKundenNr]
where cast(rmc_reDatum as date) between @von and @bis and AdressenNr=@AdressenNr
AND rmc_landKZ ='" & LandKZ & "'" & IIf(Not Archiv, " And rmc_archiv = 0 ", "") & "
group by rmc_reDatum,rmc_kdNr,[rmc_reNr],[rmc_waehrung], rmc_daId
group by rmc_reDatum,rmc_kdNr,[rmc_reNr],[rmc_waehrung], rmc_daId, isnull(rmc_daId_InvAtt,0)
having sum([rmc_betragMWST])<>0
order by rmc_reDatum", conn)

6
VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb
View File

@@ -1089,10 +1089,6 @@ Public Class cUTA
Case "20"
'lngÜbertragungsposition = 6616
lngRecordCount = lngRecordCount + 1
lngÜbertragungsposition = lngÜbertragungsposition + 1
Dim clfBody As New cUTA.UTABody(lngÜbertragungsnummer, lngÜbertragungsposition, dtmErstellDatumUhrzeit)
@@ -1342,7 +1338,7 @@ Public Class cUTA
MDMEinarb.ds_count += savedTrans
MDMEinarb.import_date = Now()
If MDMEinarb.ds_count = MDMEinarb.ds_total Then
If MDMEinarb.ds_count = MDMEinarb.ds_total - 2 Then 'header and trailer wegzählen!
MDMEinarb.completed = True
MDMEinarb.completed_date = Now()
End If