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

Mailsender, Plose, StartOptions

Browse Source
This commit is contained in:
d.breimaier
2025-01-09 09:05:26 +01:00
parent 5449e27abe
commit 0046d354a5
6 changed files with 741 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MDM_Worker/cPLOSE.vb
View File

@@ -70,9 +70,6 @@ Public Class cPLOSE
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plose_id", plose_Id, , True, True))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plose_RechnungsDatum", plose_RechnungsDatum)) ' VARCHAR(3) NULL,
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plose_RechnungsJahr", plose_RechnungsJahr)) ' VARCHAR(3) NULL,
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plose_SupplierRechnungsDatum", plose_SupplierRechnungsDatum)) ' VARCHAR(3) NULL,
@@ -433,7 +430,7 @@ Public Class cPLOSE
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT plInv_SupplierRechnungsDatum,plInv_SupplierRechnungsNr, plInv_Lieferant,plInv_Nettobetrag,plInv_MWSTBetrag, plInv_Bruttobetrag, 'EUR' as plInv_WaehrungAbbuchung , case when plInv_LieferantCode = 'PSS' then 0 else 9 end as plInv_LieferantCode from tblPLOSE_Inv_Data
Using cmd As New SqlCommand("SELECT plInv_SupplierRechnungsDatum,plInv_SupplierRechnungsNr, plInv_Lieferant,plInv_Nettobetrag,plInv_MWSTBetrag, plInv_Bruttobetrag, isnull(plInv_Currency,'EUR') as plInv_WaehrungAbbuchung , case when plInv_LieferantCode = 'PSS' then 0 else 9 end as plInv_LieferantCode, plInv_daId from tblPLOSE_Inv_Data
INNER JOIN Adressen on PLOSEKundenNr=plInv_PLOSEKundennummer
where cast(plInv_SupplierRechnungsDatum as date) between @von and @bis and AdressenNr=@AdressenNr and
plInv_SupplierCountry ='" & Land & "'and plInv_MWSTBetrag <> 0 AND (plInv_LieferantCode = 'PSS' OR plInv_LieferantCode = 'UNI') AND plInv_SupplierRechnungsNr not like '%-SFC-%'" & 'wie Lieferantencode = 90
@@ -459,6 +456,7 @@ Public Class cPLOSE
cPLOSE_USTV_ANT.plose_MWSTBetragWaehrungAbbuchung = dr.Item("plInv_MWSTBetrag")
cPLOSE_USTV_ANT.plose_BruttobetragWaehrungAbbuchung = dr.Item("plInv_Bruttobetrag")
cPLOSE_USTV_ANT.plose_WaehrungAbbuchung = dr.Item("plInv_WaehrungAbbuchung")
cPLOSE_USTV_ANT.plose_daId = dr.Item("plInv_daId")
LIST.Add(cPLOSE_USTV_ANT)
@@ -651,11 +649,10 @@ Public Class cPLOSE_USTV_ANTR
Property plose_MWSTBetragWaehrungAbbuchung As Object = Nothing ' Decimal (12, 2) NULL,
Property plose_BruttobetragWaehrungAbbuchung As Object = Nothing ' Decimal (12, 2) NULL,
Property plose_WaehrungAbbuchung As Object = Nothing ' VARCHAR(3) NULL,
Property plose_NettobetragTransaktion As Object = Nothing ' Decimal (12, 2) NULL,
Property plose_MWSTBetrag As Object = Nothing ' Decimal (12, 2) NULL,
Property plose_BruttobetragTransaktion As Object = Nothing ' Decimal (12, 2) NULL,
Property plose_daId As Object = Nothing
Public Shared Sub reOrderList(ByRef LIST As List(Of cPLOSE_USTV_ANTR))

10
MailSender/MAILSender.vb
View File

@@ -58,7 +58,7 @@ Module Mail
' PARAM = "NCTSLIST_TOBB"
' PARAM = "NCTSLIST_TOBB"
'------------------------------------------------------------------------------------
'PARAM = "VW_DHL"
'PARAM = "UID_OPS_SYSKA_ABGLEICH"
If PARAM = "" Then
System.Console.WriteLine("OPTION nicht erkannt!")
@@ -833,7 +833,7 @@ Module Mail
If Subject = "" Then
Subject = "Auswertungen Zollanmeldungen ZF Friedrichshafen AG "
Else
Subject = replaceBodyVariable(Body, von, bis)
Subject = replaceBodyVariable(Subject, von, bis)
End If
@@ -1591,7 +1591,7 @@ Module Mail
"<br><br><br>Automatisch generiertes E-Mail. Bitte Antworten Sie nicht an dieses E-Mail." &
"<br><br>VERAG SPEDITION AG"
Else
Body = Subject = replaceBodyVariable(Body)
Body = replaceBodyVariable(Body)
End If
If Subject = "" Then
@@ -1663,7 +1663,7 @@ Module Mail
"<br><br><br>Automatically generated e-mail. Please do not reply to this e-mail." &
"<br><br>VERAG SPEDITION AG"
Else
Body = Subject = replaceBodyVariable(Body)
Body = replaceBodyVariable(Body)
Body = Body.Replace("%report%", Report)
End If
@@ -2660,7 +2660,7 @@ Module Mail
For Each i In firmenlist
Dim top = 100
Dim sql As New SQL
Dim sqlstrKunden = " select * from ( SELECT [KundenNr] as KundenNr, (isnull(Adressen.UstIdKz,'') + isnull(Adressen.UstIdNr,'')) as UIDNrKunden, isnull(c_ustidnr,'') as UIDNrKundenDeb, [i_firm_refid] as MandantFIBU, FiBuSchnittstelleNr as MandantAVISO FROM [VERAG].[dbo].[Kunden]
Dim sqlstrKunden = " select * from ( SELECT [KundenNr] as KundenNr,[Name 1], (isnull(Adressen.UstIdKz,'') + isnull(Adressen.UstIdNr,'')) as UIDNrKunden, isnull(c_ustidnr,'') as UIDNrKundenDeb, [i_firm_refid] as MandantFIBU, FiBuSchnittstelleNr as MandantAVISO FROM [VERAG].[dbo].[Kunden]
inner join Adressen on Adressen.AdressenNr = Kunden.KundenNr
inner join Buchhaltung.[FIBU2].[dbo].[fibu_konto] on Kunden.KundenNrZentrale = i_konto
where isnull(KundenNrZentrale,0) <> 0 and Auswahl = 'A' And isnull(FiBuSchnittstelleNr,0) = " & i.Value & " ANd [i_firm_refid] = " & i.Value & " ) as temp where UIDNrKunden <> UIDNrKundenDeb"

2
cNCTSPartnerWorker/cTR_NCTS.vb
View File

@@ -118,7 +118,7 @@ Public Class cTR_NCTS
'--> EUR
If BRG.nctsSA_AbgabenBetragFremdWaehrung IsNot Nothing Then
If If(BRG.nctsSA_Waerung, "") <> "EUR" Then
Dim betragEUR = VERAG_PROG_ALLGEMEIN.cEZB_Waehrungskurse.EXCHANGE(BRG.nctsSA_AbgabenBetragFremdWaehrung, BRG.nctsSA_Waerung, NCTS.ncts_Trans_DatumZeit)
Dim betragEUR = VERAG_PROG_ALLGEMEIN.cEZB_Waehrungskurse.EXCHANGE_EURTOCUR(BRG.nctsSA_AbgabenBetragFremdWaehrung, BRG.nctsSA_Waerung, NCTS.ncts_Trans_DatumZeit)
BRG.nctsSA_AbgabenBetrag = If(betragEUR > 0, betragEUR, BRG.nctsSA_AbgabenBetragFremdWaehrung)
Else
BRG.nctsSA_AbgabenBetrag = BRG.nctsSA_AbgabenBetragFremdWaehrung

38
initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb
View File

@@ -379,8 +379,6 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
If Not System.IO.Directory.Exists(zielpfad & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") Then System.IO.Directory.CreateDirectory(zielpfad & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
'File in Datenarchiv sichern:
'd.breimaier: 2024-06-05 aktuell nur die RMC-Dateien! (später, wenn CSV vollständig, dann alle PDFs importieren!
'd.breimaier: 2024-06-17 laut Christian Schuster von Comcore (EDV-BEtr. von RMC) nicht möglich CSV mit easytrip und sofico Datensätzen zu ergängen!
@@ -533,8 +531,44 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
Catch ex As System.Exception
End Try
ElseIf fi.Name.ToString.StartsWith("AP") AndAlso fi.Name.ToLower.Contains("epn") Then 'nur einzelpostennachweise
Dim customerNo As Integer
Dim invoiceNo As String = ""
Dim dateNo = ""
Dim outputDate = ""
Dim documenttype As String = ""
If fi.Name.Length >= 37 Then
customerNo = fi.Name.Substring(2, 6)
invoiceNo = fi.Name.Substring(9, 8)
dateNo = fi.Name.Substring(18, 10)
documenttype = fi.Name.Substring(33, 3)
Dim parsedDate As DateTime = DateTime.ParseExact(dateNo, "yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture)
outputDate = parsedDate.ToString("dd.MM.yyyy")
End If
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "UTA", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(d))
DS.uploadDataToDATENSERVER(d,,,,,, True)
Dim document As New cUTA.UTADocuments
document.DocumentName = fi.Name
document.daId = DS.da_id
document.DocumentTyp = documenttype
document.RechnungsNr = invoiceNo
document.KundenNr = customerNo
document.Datum = outputDate
document.Zeitstempel = Now()
If document.SAVE() Then cntDatenEingelesen += 1
End If
End If
End If

1255
initATLASAufschubkonten/frmStartOptions.Designer.vb generated
View File

File diff suppressed because it is too large Load Diff

64
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -5339,13 +5339,14 @@ Public Class frmStartOptions
showPic(ok, PictureBox25)
End Sub
Private Sub LinkLabel64_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel64.LinkClicked, LinkLabel67.LinkClicked
Private Sub LinkLabel64_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel64.LinkClicked, LinkLabel67.LinkClicked, LinkLabel69.LinkClicked
Dim iso2Laneder = ""
Select Case sender.Name
Case "LinkLabel64" : iso2Laneder = "select distinct (Lieferland) FROM [VERAG].[dbo].[tblUTAImportNew] where Lieferland_ISO2 is null"
Case "LinkLabel67" : iso2Laneder = "select distinct (LandNr) FROM [VERAG].[dbo].[tbl_IDS_Länder] where Lieferland_ISO2 is null"
Case "LinkLabel69" : iso2Laneder = "select distinct (LandNr) FROM [VERAG].[dbo].[tblSteuernummern] where LandKZ is null"
End Select
@@ -5357,6 +5358,7 @@ Public Class frmStartOptions
Select Case sender.Name
Case "LinkLabel64" : SQL.doSQL("Update [VERAG].[dbo].[tblUTAImportNew] set Lieferland_ISO2 = '" & VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2LandFromISO3Land(r.Item("Lieferland")) & "' where Lieferland = '" & r.Item("Lieferland") & "'", "FMZOLL")
Case "LinkLabel67" : SQL.doSQL("Update [VERAG].[dbo].[tbl_IDS_Länder] set Lieferland_ISO2 = '" & VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2LandFromLandNr(r.Item("LandNr")) & "' where LandNr = '" & r.Item("LandNr") & "'", "FMZOLL")
Case "LinkLabel69" : SQL.doSQL("Update [VERAG].[dbo].[tblSteuernummern] set LandKZ = '" & VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2LandFromLandNr(r.Item("LandNr")) & "' where LandNr = '" & r.Item("LandNr") & "'", "FMZOLL")
End Select
@@ -5368,13 +5370,8 @@ Public Class frmStartOptions
End Sub
Private Sub Button24_Click(sender As Object, e As EventArgs) Handles Button24.Click
End Sub
Private Sub LinkLabel65_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel65.LinkClicked
Me.Visible = False
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
@@ -5417,7 +5414,7 @@ Public Class frmStartOptions
End Sub
Private Sub LinkLabel67_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel67.LinkClicked
Private Sub LinkLabel67_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel68.LinkClicked
Me.Cursor = Cursors.WaitCursor
Try
Dim erg = VERAG_PROG_ALLGEMEIN.cTariffKN8_Interface.UPDATE_KN8()
@@ -5432,4 +5429,57 @@ Public Class frmStartOptions
Private Sub Button26_Click(sender As Object, e As EventArgs) Handles Button26.Click
VERAG_PROG_ALLGEMEIN.cATEZ_ncts_api.get_ie015_xml_by_mrn("24TR34340000000145")
End Sub
Private Sub LinkLabel70_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel70.LinkClicked
Dim fehlendeRechungsdaten As String = "select upper(Invoicenumber) as Invoicenumber, CustomerCode, cast(YearMonthDay as Date) as YearMonthDay FROM [VERAG].[dbo].[tblIDSInvoicesNew] where TransactionVolume is null and AmminclVAT is null and TotalNetAmount is null and VATAmount is null"
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim dtRechnnungsdaten As DataTable = SQL.loadDgvBySql(fehlendeRechungsdaten, "FMZOLL")
If dtRechnnungsdaten.Rows.Count > 0 Then
For Each r As DataRow In dtRechnnungsdaten.Rows
SQL.doSQL("
UPDATE
inv
SET
inv.TransactionVolume = t.calcTrans,
inv.AmminclVAT = t.calcInclvat,
inv.TotalNetAmount = t.totalNet,
inv.VATAmount = t.net
FROM
[VERAG].[dbo].[tblIDSInvoicesNew] AS inv
INNER JOIN
(
SELECT
Paymentsummarynumber,CustomerCode, YearMonthDay,
sum([TransactionVolume]) as calcTrans, sum([AmminclVAT]) as calcInclvat, sum([TotalNetAmount]) as totalNet, sum([VATAmount]) as net
FROM [VERAG].[dbo].[tblIDSTransactionsNew]
WHERE
Paymentsummarynumber = '" & r.Item("Invoicenumber") & "' and CustomerCode = '" & r.Item("CustomerCode") & "' and YearMonthDay = '" & r.Item("YearMonthDay") & "'
GROUP BY
Paymentsummarynumber,CustomerCode, YearMonthDay
) t
ON
t.Paymentsummarynumber = inv.Invoicenumber
WHERE
inv.Invoicenumber = '" & r.Item("Invoicenumber") & "' and inv.CustomerCode = '" & r.Item("CustomerCode") & "' and inv.YearMonthDay = '" & r.Item("YearMonthDay") & "' ", "FMZOLL")
Next
MsgBox("alle Rechnungsdaten gesetzt!")
Else
MsgBox("keine fehlenden Rechnunngsdaten vorhanden!")
End If
End Sub
End Class