From 2c806442245f5c4f176b12ca497925d93676a77e Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Thu, 24 Jun 2021 23:06:47 +0200 Subject: [PATCH] neu --- DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb | 7 +- DAKOSY_Worker/cZOLL_IMPORT.vb | 30 +- MDM_Worker/cPLOSE.vb | 111 +++- MailSender/MAILSender.vb | 362 ++++++----- MailSender/Resources/MDM_ZOLL_Verguetung.xlsx | Bin 11326 -> 11516 bytes TELOTEK_Worker_lib/cTelokec.vb | 5 +- UID/Dienstplan/cFeiertage.vb | 84 ++- UID/Dienstplan/frmDienstplanVariabel.vb | 27 +- UID/Mitarbeiter/usrCntlMitarbeiter.vb | 2 +- UID/My Project/Resources.Designer.vb | 30 +- UID/My Project/Resources.resx | 16 +- UID/Programme/usrCntlProgramme.Designer.vb | 13 + UID/cProgramFunctions.vb | 33 +- UID/cSqlDb.vb | 34 + .../VERAG_Interface/cVERAG_out_ncts.vb | 381 +++++++++-- initATLASAufschubkonten/cMAVIWorker.vb | 6 +- .../frmDYNachrichtenVerarbeitung.vb | 592 +++++++++--------- .../frmMDMNachrichtenVerarbeitung.vb | 63 +- .../frmStartOptions.Designer.vb | 446 ++++++++----- initATLASAufschubkonten/frmStartOptions.resx | 288 ++++----- initATLASAufschubkonten/frmStartOptions.vb | 413 +++++++++++- .../frmTCNachrichtenVerarbeitung.vb | 116 ++-- 22 files changed, 2133 insertions(+), 926 deletions(-) diff --git a/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb b/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb index 68aa7e8..d849ddb 100644 --- a/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb +++ b/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb @@ -965,6 +965,9 @@ Public Class cDakosyEZA End Function + + + Shared Function getFiliale(ByVal bezugsNr, ByRef filialeBez) As String If If(bezugsNr, "").ToString.Length > 4 Then Select Case bezugsNr.ToString.Substring(0, 4) @@ -1096,12 +1099,13 @@ Public Class cDakosyEZA 'Empfänger If ADR.ezaAd_AdressTyp = "CN" Then Dim AD = getAdresseFromEORI(ADR.ezaAd_TeilnehmerEORI, ADR.ezaAd_TeilnehmerNLNR, SQL) + If AD IsNot Nothing Then SPEDITIONSBUCH.EmpfängerKundenNr = AD.AdressenNr SPEDITIONSBUCH.Empfänger = AD.Ordnungsbegriff 'Oranier Küchentechnik GmbH; Haiger End If If If(SPEDITIONSBUCH.Empfänger, "").Trim = String.Empty Then - SPEDITIONSBUCH.Empfänger = (If(ADR.ezaAd_NameFirma1, "") & " " & If(ADR.ezaAd_NameFirma1, "") & " " & If(ADR.ezaAd_NameFirma1, "")).trim + SPEDITIONSBUCH.Empfänger = (If(ADR.ezaAd_NameFirma1, "") & " " & If(ADR.ezaAd_NameFirma1, "") & " " & If(ADR.ezaAd_NameFirma1, "")).trim SPEDITIONSBUCH.Empfänger &= ", " & If(ADR.ezaAd_LandCode, "") SPEDITIONSBUCH.Empfänger &= " " & If(ADR.ezaAd_PLZ, "") SPEDITIONSBUCH.Empfänger &= " " & If(ADR.ezaAd_Ort, "") @@ -1113,7 +1117,6 @@ Public Class cDakosyEZA 'If If(SPEDITIONSBUCH.Empfänger, "").Trim = String.Empty Then SPEDITIONSBUCH.Empfänger &= " " & If(ADR.ezaAd_TeilnehmerEORI, "") If If(SPEDITIONSBUCH.Empfänger, "").Trim.Replace(",", "") = String.Empty Then SPEDITIONSBUCH.Empfänger = "" - End If Next diff --git a/DAKOSY_Worker/cZOLL_IMPORT.vb b/DAKOSY_Worker/cZOLL_IMPORT.vb index 46f2a1b..dcfe6c4 100644 --- a/DAKOSY_Worker/cZOLL_IMPORT.vb +++ b/DAKOSY_Worker/cZOLL_IMPORT.vb @@ -644,24 +644,24 @@ Public Class cZOLL_IMPORT End If If SPEDITIONSBUCH.AbsenderKundenNr Is Nothing OrElse SPEDITIONSBUCH.AbsenderKundenNr <= 0 Then - If SENDUNG.tblSnd_AbsenderKdNr > 0 Then - SPEDITIONSBUCH.AbsenderKundenNr = SENDUNG.tblSnd_AbsenderKdNr - End If - If SPEDITIONSBUCH.Absender Is Nothing OrElse SPEDITIONSBUCH.Absender = "" Then SPEDITIONSBUCH.Absender = SENDUNG.tblSnd_Absender - End If - If SPEDITIONSBUCH.EmpfängerKundenNr Is Nothing OrElse SPEDITIONSBUCH.EmpfängerKundenNr <= 0 Then - If SENDUNG.tblSnd_EmpfaengerKdNr > 0 Then SPEDITIONSBUCH.EmpfängerKundenNr = SENDUNG.tblSnd_EmpfaengerKdNr - If SPEDITIONSBUCH.Empfänger Is Nothing OrElse SPEDITIONSBUCH.Empfänger = "" Then SPEDITIONSBUCH.Empfänger = SENDUNG.tblSnd_Empfaenger - End If - - If SPEDITIONSBUCH.VermittlerKundenNr Is Nothing OrElse SPEDITIONSBUCH.VermittlerKundenNr <= 0 Then - - If SENDUNG.tblSnd_AuftraggeberKdNr > 0 Then SPEDITIONSBUCH.VermittlerKundenNr = SENDUNG.tblSnd_AuftraggeberKdNr ': MsgBox(SENDUNG.tblSnd_AuftraggeberKdNr) - If SPEDITIONSBUCH.Vermittler Is Nothing OrElse SPEDITIONSBUCH.Vermittler = "" Then SPEDITIONSBUCH.Vermittler = SENDUNG.tblSnd_Auftraggeber + If SENDUNG.tblSnd_AbsenderKdNr > 0 Then + SPEDITIONSBUCH.AbsenderKundenNr = SENDUNG.tblSnd_AbsenderKdNr End If + If SPEDITIONSBUCH.Absender Is Nothing OrElse SPEDITIONSBUCH.Absender = "" Then SPEDITIONSBUCH.Absender = SENDUNG.tblSnd_Absender End If - SPEDITIONSBUCH.AtlasBezNrEZA = EZA_Nr + If SPEDITIONSBUCH.EmpfängerKundenNr Is Nothing OrElse SPEDITIONSBUCH.EmpfängerKundenNr <= 0 Then + If SENDUNG.tblSnd_EmpfaengerKdNr > 0 Then SPEDITIONSBUCH.EmpfängerKundenNr = SENDUNG.tblSnd_EmpfaengerKdNr + If SPEDITIONSBUCH.Empfänger Is Nothing OrElse SPEDITIONSBUCH.Empfänger = "" Then SPEDITIONSBUCH.Empfänger = SENDUNG.tblSnd_Empfaenger + End If + + If SPEDITIONSBUCH.VermittlerKundenNr Is Nothing OrElse SPEDITIONSBUCH.VermittlerKundenNr <= 0 Then + + If SENDUNG.tblSnd_AuftraggeberKdNr > 0 Then SPEDITIONSBUCH.VermittlerKundenNr = SENDUNG.tblSnd_AuftraggeberKdNr ': MsgBox(SENDUNG.tblSnd_AuftraggeberKdNr) + If SPEDITIONSBUCH.Vermittler Is Nothing OrElse SPEDITIONSBUCH.Vermittler = "" Then SPEDITIONSBUCH.Vermittler = SENDUNG.tblSnd_Auftraggeber + End If + End If + SPEDITIONSBUCH.AtlasBezNrEZA = EZA_Nr SPEDITIONSBUCH.AtlasBezNrNCTS = NCTS_Nr If PosAnzahl > 0 Then diff --git a/MDM_Worker/cPLOSE.vb b/MDM_Worker/cPLOSE.vb index cfd02b4..b2b3d7a 100644 --- a/MDM_Worker/cPLOSE.vb +++ b/MDM_Worker/cPLOSE.vb @@ -8,6 +8,9 @@ Imports System.Data.SqlClient Property plose_RechnungsDatum As Object = Nothing ' VARCHAR(3) NULL, Property plose_RechnungsNr As Object = Nothing ' VARCHAR(3) NULL, + Property plose_RechnungsJahr As Object = Nothing ' VARCHAR(3) NULL, + Property plose_Lieferant As Object = Nothing ' VARCHAR(3) NULL, + Property plose_LieferantCode As Object = Nothing ' VARCHAR(3) NULL, Property plose_Dateiname As Object = Nothing ' VARCHAR(3) NULL, Property plose_Einlesedatum As Date = Now ' VARCHAR(3) NULL, Property plose_Datensatztyp As Object = Nothing ' VARCHAR(3) NULL, @@ -69,7 +72,10 @@ Imports System.Data.SqlClient 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_RechnungsNr", plose_RechnungsNr)) ' VARCHAR(3) NULL, + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plose_Lieferant", plose_Lieferant)) ' VARCHAR(3) NULL, + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plose_LieferantCode", plose_LieferantCode)) ' VARCHAR(3) NULL, list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plose_Dateiname", plose_Dateiname)) ' VARCHAR(3) NULL, list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plose_Einlesedatum", plose_Einlesedatum)) ' VARCHAR(3) NULL, list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plose_Datensatztyp", plose_Datensatztyp)) ' VARCHAR(3) NULL, @@ -170,6 +176,16 @@ Imports System.Data.SqlClient End Try End Sub + Shared Sub UPDATE_Lieferant(plose_Lieferant As Date, plose_RechnungsNr As Integer, plose_POLSEKundennummer As Integer) + Try + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + SQL.doSQL("UPDATE tblPLOSE_Details SET plose_Lieferant='" & plose_Lieferant & "' WHERE plose_RechnungsNr='" & plose_RechnungsNr & "' AND plose_POLSEKundennummer='" & plose_POLSEKundennummer & "' ", "FMZOLL") + + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + End Sub + Public Function getUpdateCmd() As String Try @@ -215,8 +231,99 @@ Imports System.Data.SqlClient Public Function DELETE() As Boolean 'obj As Object, tablename As String, where As String) As Boolean Dim sqlstr = " DELETE FROM [tblPLOSE_Details] WITH(updlock,serializable) WHERE plose_id=" & Me.plose_Id Return SQL.doSQL(sqlstr, "FMZOLL") - End Function + End Function + + Public Shared Function GET_Antraege(von As Date, bis As Date, KundenNr As Integer, Optional Archiv As Object = Nothing) As List(Of cPLOSE_USTV_ANTR) + Try + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + Dim LIST As New List(Of cPLOSE_USTV_ANTR) + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("SELECT [plose_RechnungsDatum],[plose_RechnungsNr],[plose_Lieferant],[plose_LieferantCode],sum([plose_NettobetragWaehrungAbbuchung])[plose_NettobetragWaehrungAbbuchung],sum([plose_MWSTBetragWaehrungAbbuchung])[plose_MWSTBetragWaehrungAbbuchung] ,sum([plose_BruttobetragWaehrungAbbuchung] )[plose_BruttobetragWaehrungAbbuchung], [plose_WaehrungAbbuchung] + ,sum([plose_NettobetragTransaktion])[plose_NettobetragTransaktion],sum([plose_MWSTBetrag])[plose_MWSTBetrag] ,sum([plose_BruttobetragTransaktion] )[plose_BruttobetragTransaktion] + FROM [tblPLOSE_Details] INNER JOIN Adressen on PLOSEKundenNr=plose_POLSEKundennummer + where cast(plose_RechnungsDatum as date) between @von and @bis and AdressenNr=@AdressenNr + " & If(Archiv IsNot Nothing, " AND plose_Archiv=@Archiv ", "") & " + group by [plose_RechnungsDatum],[plose_RechnungsNr],[plose_LieferantCode],[plose_Lieferant],[plose_WaehrungAbbuchung] + having sum(plose_MWSTBetrag)>0 + ", conn) + + cmd.Parameters.AddWithValue("@von", von) + cmd.Parameters.AddWithValue("@bis", bis) + cmd.Parameters.AddWithValue("@AdressenNr", KundenNr) + If Archiv IsNot Nothing Then cmd.Parameters.AddWithValue("@Archiv", If(Archiv, 1, 0)) + + Dim dr = cmd.ExecuteReader() + While dr.Read + + Dim cPLOSE_USTV_ANT As New cPLOSE_USTV_ANTR + cPLOSE_USTV_ANT.plose_RechnungsDatum = dr.Item("plose_RechnungsDatum") + cPLOSE_USTV_ANT.plose_RechnungsNr = dr.Item("plose_RechnungsNr") + cPLOSE_USTV_ANT.plose_Lieferant = dr.Item("plose_Lieferant") + cPLOSE_USTV_ANT.plose_LieferantCode = dr.Item("plose_LieferantCode") + cPLOSE_USTV_ANT.plose_NettobetragTransaktion = dr.Item("plose_NettobetragTransaktion") + cPLOSE_USTV_ANT.plose_MWSTBetrag = dr.Item("plose_MWSTBetrag") + cPLOSE_USTV_ANT.plose_BruttobetragTransaktion = dr.Item("plose_BruttobetragTransaktion") + cPLOSE_USTV_ANT.plose_NettobetragWaehrungAbbuchung = dr.Item("plose_NettobetragWaehrungAbbuchung") + cPLOSE_USTV_ANT.plose_MWSTBetragWaehrungAbbuchung = dr.Item("plose_MWSTBetragWaehrungAbbuchung") + cPLOSE_USTV_ANT.plose_BruttobetragWaehrungAbbuchung = dr.Item("plose_BruttobetragWaehrungAbbuchung") + cPLOSE_USTV_ANT.plose_WaehrungAbbuchung = dr.Item("plose_WaehrungAbbuchung") + + LIST.Add(cPLOSE_USTV_ANT) + + End While + dr.Close() + + End Using + End Using + Return LIST + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return Nothing + + End Function + Public Shared Function UPDATE_ARCHIV(von As Date, bis As Date, KundenNr As Integer) As Boolean + Try + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - End Class + Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("von", von)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("bis", bis)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KundenNr", KundenNr)) + + + Return SQL.doSQLVarList(" + + UPDATE [tblPLOSE_Details] + set plose_Archiv=1, [plose_ArchiviertDatum]=GETDATE() + FROM [tblPLOSE_Details] INNER JOIN Adressen on PLOSEKundenNr=plose_POLSEKundennummer + WHERE cast(plose_RechnungsDatum as date) between @von and @bis and AdressenNr=@KundenNr + + ", "FMZOLL",, list) + + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return "" + End Function + +End Class +Public Class cPLOSE_USTV_ANTR + Property plose_RechnungsDatum As Object = Nothing ' VARCHAR(3) NULL, + Property plose_RechnungsNr As Object = Nothing ' VARCHAR(3) NULL, + Property plose_Lieferant As Object = Nothing ' VARCHAR(3) NULL, + Property plose_LieferantCode As Object = Nothing ' VARCHAR(3) NULL, + Property plose_NettobetragWaehrungAbbuchung As Object = Nothing ' Decimal (12, 2) NULL, + 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, + +End Class \ No newline at end of file diff --git a/MailSender/MAILSender.vb b/MailSender/MAILSender.vb index 67eaa95..7013765 100644 --- a/MailSender/MAILSender.vb +++ b/MailSender/MAILSender.vb @@ -10,10 +10,11 @@ Module Mail Dim options As String = sPath & "OPTIONS.txt" '" & Now.ToString("ddMMyyyyHHmmss") & ".csv" Dim last_sent As String = sPath & "last_sent.txt" '" & Now.ToString("ddMMyyyyHHmmss") & ".csv" Dim betragOpTr = 1000 + Dim supportPWD = "$up0Rt2809!" Sub Main() Try VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL - + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False Dim PARAM = "" Dim parameter() As String = Environment.GetCommandLineArgs().ToArray If (parameter.Count - 1) >= 1 Then 'Höher als 1 weil der index 0 der Pfad zum programm ist @@ -31,6 +32,23 @@ Module Mail ' End If ' Dim o As String = getOption() + + + + + + '------------------------------------------------------------------------------------ + ' PARAM = "NCTSLIST_TOBB" + ' PARAM = "NCTSLIST_TOBB" + '------------------------------------------------------------------------------------ + + + + + + + + If PARAM = "" Then System.Console.WriteLine("OPTION nicht erkannt!") Exit Sub @@ -38,130 +56,142 @@ Module Mail Dim cnt = 0 ' MsgBox(DoesProcessExists("MailSender")) While DoesProcessExists("MailSender") Or cnt > 20 - System.Console.WriteLine("MailSender wurde nicht beendet, warten ...") - Threading.Thread.Sleep(1000) - cnt += 1 - End While - If cnt >= 20 Then - System.Console.WriteLine("MailSender konnte nicht gestartet werden, da eine Insatanz noch läuft...") - Else - ' PARAM = "BRG_AUSWERTUNG_STANDARD" + System.Console.WriteLine("MailSender wurde nicht beendet, warten ...") + Threading.Thread.Sleep(1000) + cnt += 1 + End While + If cnt >= 20 Then + System.Console.WriteLine("MailSender konnte nicht gestartet werden, da eine Insatanz noch läuft...") + Else - 'Select Case firma - ' Case "ATILLA" - ' Msg.Subject = "Kunden TR - Offene Rechnungen - ATILLA" - ' ' Msg.To.Add("mestan@verag.ag") - ' Msg.To.Add("verimex@verimex360.com") - ' Msg.Bcc.Add("al@verag.ag") - ' Case "IMEX" - ' Msg.Subject = "Kunden TR - Offene Rechnungen - IMEX" - ' Msg.Bcc.Add("al@verag.ag") - ' Msg.To.Add("mario.hoefer@imex-group.at") - ' Msg.CC.Add("viktoria.leirich@imex-group.at") - ' Msg.CC.Add("verimex@verimex360.com") - ' Case "VERAG" - ' Msg.Subject = "Kunden TR - Offene Rechnungen" - ' Msg.To.Add("mestan@verag.ag") - ' Msg.CC.Add("verimex@verimex360.com") - ' Msg.Bcc.Add("al@verag.ag") + 'Select Case firma + ' Case "ATILLA" + ' Msg.Subject = "Kunden TR - Offene Rechnungen - ATILLA" + ' ' Msg.To.Add("mestan@verag.ag") - ' End Select - Select Case PARAM - Case "KD_OP5000" - System.Console.WriteLine("OPTION erkannt: KD_TR_OP5000 _ Erstellt eine Liste türkischer Kunden und versendet diese AL.") - If SendEmail_OP5000("VERAG", "", {"al@verag.ag"}, {}, {}, "VERAG - Offene Posten") Then - System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") - End If - Case "KD_TR_OP5000" - System.Console.WriteLine("OPTION erkannt: KD_TR_OP5000 _ Erstellt eine Liste türkischer Kunden und versendet diese an Mestan und Bahadir.") - If SendEmail_OP5000("VERAG", "'TR'", {"mestan@verag.ag"}, {"verimex@verimex360.com"}, {"al@verag.ag"}, "Kunden TR - Offene Rechnungen") Then - System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") - End If - Case "KD_TR_OP5000_ATILLA" - System.Console.WriteLine("OPTION erkannt: KD_TR_OP5000_ATILLA _ Erstellt eine Liste türkischer Kunden von ATILLA.") - If SendEmail_OP5000("ATILLA", "'TR'", {"verimex@verimex360.com"}, {}, {"al@verag.ag"}, "Kunden TR - Offene Rechnungen - ATILLA") Then - System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") - End If - Case "KD_TR_OP5000_IMEX" - System.Console.WriteLine("OPTION erkannt: KD_TR_OP5000_IMEX _ Erstellt eine Liste türkischer Kunden von IMEX.") - If SendEmail_OP5000("IMEX", "'TR'", {"mario.hoefer@imex-group.at"}, {"viktoria.leirich@imex-group.at", "verimex@verimex360.com"}, {"al@verag.ag"}, "Kunden TR - Offene Rechnungen - IMEX") Then - System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") - End If - Case "BRG_AUSWERTUNG_STANDARD" - System.Console.WriteLine("OPTION erkannt: BRG_AUSWERTUNG_STANDARD _ Erstellt die Auswertung der Bürgschaften.") - System.Console.WriteLine("Einlesen der Bürgschaftsdaten aus ATLAS und E-ZOLL...") - einlesenBRG() - System.Console.WriteLine("Einlesen abgeschlossen...") - System.Console.WriteLine("Auswertung gestartet...") - If SendEmail_BRG_Auswertung(IIf(Now.DayOfWeek = 1, True, False)) Then - System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") - End If - Case "BRG_AUSWERTUNG_DETAILS" - System.Console.WriteLine("OPTION erkannt: BRG_AUSWERTUNG_DETAILS _ Erstellt die Auswertung der Bürgschaften mit Details.") - System.Console.WriteLine("Einlesen der Bürgschaftsdaten aus ATLAS und E-ZOLL...") - einlesenBRG() - System.Console.WriteLine("Einlesen abgeschlossen...") - System.Console.WriteLine("Auswertung Details gestartet...") - If SendEmail_BRG_Auswertung(IIf(Now.DayOfWeek = 1, True, False), True) Then 'für Andreas Details - System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") - End If - Case "WOELFL" - System.Console.WriteLine("OPTION erkannt: WOELFL ") - System.Console.WriteLine("Starte Wölfl-Mail...") - If SendEmail_WOELFL() Then - Try - Dim outFile As IO.StreamWriter = Nothing - outFile = My.Computer.FileSystem.OpenTextFileWriter(last_sent, False) - outFile.Write(Now.AddDays(-1).ToShortDateString) - outFile.Close() + ' Msg.To.Add("verimex@verimex360.com") + ' Msg.Bcc.Add("al@verag.ag") + ' Case "IMEX" + ' Msg.Subject = "Kunden TR - Offene Rechnungen - IMEX" + ' Msg.Bcc.Add("al@verag.ag") + ' Msg.To.Add("mario.hoefer@imex-group.at") + ' Msg.CC.Add("viktoria.leirich@imex-group.at") + ' Msg.CC.Add("verimex@verimex360.com") + ' Case "VERAG" + ' Msg.Subject = "Kunden TR - Offene Rechnungen" + ' Msg.To.Add("mestan@verag.ag") + ' Msg.CC.Add("verimex@verimex360.com") + ' Msg.Bcc.Add("al@verag.ag") + + ' End Select + Select Case PARAM + Case "KD_OP5000" + System.Console.WriteLine("OPTION erkannt: KD_TR_OP5000 _ Erstellt eine Liste türkischer Kunden und versendet diese AL.") + If SendEmail_OP5000("VERAG", "", {"al@verag.ag"}, {}, {}, "VERAG - Offene Posten") Then System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") - Catch ex As Exception - MsgBox(ex.Message) - End Try - End If - Case "QS_AUFTEILUNG" - System.Console.WriteLine("OPTION erkannt: QS_AUFTEILUNG _ Erstellt die Auswertung der QS-AUFTEILUNG.") - System.Console.WriteLine("Auswertung gestartet...") - If SendEmail_QS_Auswertung() Then 'für Andreas Details - System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") - End If - Case "CS_AUFTEILUNG" - System.Console.WriteLine("OPTION erkannt: CS_AUFTEILUNG _ Erstellt die Auswertung der FISKAL-AUFTEILUNG.") - System.Console.WriteLine("Auswertung gestartet...") - If SendEmail_CS_Auswertung() Then 'für Andreas Details - System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") - End If - Case "MDM_Zollbuero_Verguetung" - System.Console.WriteLine("OPTION erkannt: MDM_Zollbuero_Verguetung _ Erstellt die Auswertung der durchgeführten MWST-Auszahlungen und MD-Kartenausgabe.") - System.Console.WriteLine("Auswertung gestartet...") - If MDM_Zollbuero_Verguetung() Then 'für Andreas Details - System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") - End If - Case "Kassenbuch_Zufall" - System.Console.WriteLine("OPTION erkannt: Kassenbuch_Zufall - Zufallsziehung zur Kassenkontrolle.") - System.Console.WriteLine("Vorgang gestartet...") - If SendEmail_Kassenbuch_Zufall() Then 'für Andreas Details - System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") - End If - Case "DEPOT_Kunden_Auswertung" - System.Console.WriteLine("OPTION erkannt: DEPOT_Kunden_Auswertung") - System.Console.WriteLine("Vorgang gestartet...") - Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - Dim dt As DataTable = SQL.loadDgvBySql("SELECT KundenNrZentrale FROM [tblKundenErweitert] INNER JOIN Kunden on kundennr= kde_KundenNr where Depot_Kunde = 1", "FMZOLL") - If dt IsNot Nothing Then - For Each r In dt.Rows - DEPOT_Kunden_Auswertung(r("KundenNrZentrale")) - Next - End If - System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + End If + Case "KD_TR_OP5000" + System.Console.WriteLine("OPTION erkannt: KD_TR_OP5000 _ Erstellt eine Liste türkischer Kunden und versendet diese an Mestan und Bahadir.") + If SendEmail_OP5000("VERAG", "'TR'", {"mestan@verag.ag", "as@verag.ag"}, {"verimex@verimex360.com"}, {"al@verag.ag"}, "Kunden TR - Offene Rechnungen") Then + System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + End If + Case "KD_TR_OP5000_ATILLA" + System.Console.WriteLine("OPTION erkannt: KD_TR_OP5000_ATILLA _ Erstellt eine Liste türkischer Kunden von ATILLA.") + If SendEmail_OP5000("ATILLA", "'TR'", {"verimex@verimex360.com"}, {}, {"al@verag.ag"}, "Kunden TR - Offene Rechnungen - ATILLA") Then + System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + End If + Case "KD_TR_OP5000_IMEX" + System.Console.WriteLine("OPTION erkannt: KD_TR_OP5000_IMEX _ Erstellt eine Liste türkischer Kunden von IMEX.") + If SendEmail_OP5000("IMEX", "'TR'", {"mario.hoefer@imex-group.at"}, {"viktoria.leirich@imex-group.at", "verimex@verimex360.com"}, {"al@verag.ag"}, "Kunden TR - Offene Rechnungen - IMEX") Then + System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + End If + Case "NCTSLIST_TOBB" + System.Console.WriteLine("OPTION erkannt: NCTSLIST_TOBB _ Erstellt eine Liste der Versandscheine mit TOBB Bürgschaft.") - Case Else - System.Console.WriteLine("OPTION nicht erkannt!") + sendTOBB("VERAG/ATILLA", Now.AddDays(-1), Now.AddDays(-1)) + sendTOBB("IMEX", Now.AddDays(-1), Now.AddDays(-1)) + sendTOBB("UNISPED", Now.AddDays(-1), Now.AddDays(-1)) + + Case "BRG_AUSWERTUNG_STANDARD" + System.Console.WriteLine("OPTION erkannt: BRG_AUSWERTUNG_STANDARD _ Erstellt die Auswertung der Bürgschaften.") + System.Console.WriteLine("Einlesen der Bürgschaftsdaten aus ATLAS und E-ZOLL...") + einlesenBRG() + System.Console.WriteLine("Einlesen abgeschlossen...") + System.Console.WriteLine("Auswertung gestartet...") + If SendEmail_BRG_Auswertung(IIf(Now.DayOfWeek = 1, True, False)) Then + System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + End If + Case "BRG_AUSWERTUNG_DETAILS" + System.Console.WriteLine("OPTION erkannt: BRG_AUSWERTUNG_DETAILS _ Erstellt die Auswertung der Bürgschaften mit Details.") + System.Console.WriteLine("Einlesen der Bürgschaftsdaten aus ATLAS und E-ZOLL...") + einlesenBRG() + System.Console.WriteLine("Einlesen abgeschlossen...") + System.Console.WriteLine("Auswertung Details gestartet...") + If SendEmail_BRG_Auswertung(IIf(Now.DayOfWeek = 1, True, False), True) Then 'für Andreas Details + System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + End If + Case "WOELFL" + System.Console.WriteLine("OPTION erkannt: WOELFL ") + System.Console.WriteLine("Starte Wölfl-Mail...") + If SendEmail_WOELFL() Then + Try + Dim outFile As IO.StreamWriter = Nothing + outFile = My.Computer.FileSystem.OpenTextFileWriter(last_sent, False) + outFile.Write(Now.AddDays(-1).ToShortDateString) + outFile.Close() + System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + Catch ex As Exception + MsgBox(ex.Message) + End Try + End If + Case "QS_AUFTEILUNG" + System.Console.WriteLine("OPTION erkannt: QS_AUFTEILUNG _ Erstellt die Auswertung der QS-AUFTEILUNG.") + System.Console.WriteLine("Auswertung gestartet...") + If SendEmail_QS_Auswertung() Then 'für Andreas Details + System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + End If + Case "CS_AUFTEILUNG" + System.Console.WriteLine("OPTION erkannt: CS_AUFTEILUNG _ Erstellt die Auswertung der FISKAL-AUFTEILUNG.") + System.Console.WriteLine("Auswertung gestartet...") + If SendEmail_CS_Auswertung() Then 'für Andreas Details + System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + End If + Case "MDM_Zollbuero_Verguetung" + System.Console.WriteLine("OPTION erkannt: MDM_Zollbuero_Verguetung _ Erstellt die Auswertung der durchgeführten MWST-Auszahlungen und MD-Kartenausgabe.") + System.Console.WriteLine("Auswertung gestartet...") + Dim Jahr = -1 + If (parameter.Count - 1) >= 2 Then + Jahr = parameter(2) + System.Console.WriteLine("Parameter 'Jahr' erkannt: " & Jahr) + End If + If MDM_Zollbuero_Verguetung(Jahr) Then 'für Andreas Details + System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + End If + Case "Kassenbuch_Zufall" + System.Console.WriteLine("OPTION erkannt: Kassenbuch_Zufall - Zufallsziehung zur Kassenkontrolle.") + System.Console.WriteLine("Vorgang gestartet...") + If SendEmail_Kassenbuch_Zufall() Then 'für Andreas Details + System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + End If + Case "DEPOT_Kunden_Auswertung" + System.Console.WriteLine("OPTION erkannt: DEPOT_Kunden_Auswertung") + System.Console.WriteLine("Vorgang gestartet...") + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Dim dt As DataTable = SQL.loadDgvBySql("SELECT KundenNrZentrale FROM [tblKundenErweitert] INNER JOIN Kunden on kundennr= kde_KundenNr where Depot_Kunde = 1", "FMZOLL") + If dt IsNot Nothing Then + For Each r In dt.Rows + DEPOT_Kunden_Auswertung(r("KundenNrZentrale")) + Next + End If + System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + + Case Else + System.Console.WriteLine("OPTION nicht erkannt!") - End Select + End Select End If ' Else @@ -187,6 +217,30 @@ Module Mail End Try End Sub + Sub sendTOBB(FirmaTmp, datVon, datBis) + Dim _erg = VERAG_PROG_ALLGEMEIN.cNCTS_Helper.getXLS_FremdBRG(FirmaTmp, "TOBB - 15TR0004000020917 / 12TR0004000004665 / 17TR0004000032349 / 17TR0004000029518 ", " '12TR0004000004665','15TR0004000020917','17TR0004000032349','17TR0004000029518 '", datVon, datBis, True) + Select Case _erg + Case "NO_RESULT" + System.Console.WriteLine("Keine Einträge gefunden.") + Case "" + Case Else + Dim _list As New List(Of String) : _list.Add(_erg) + + Dim bool_sent = False + Select Case FirmaTmp + Case "VERAG/ATILLA" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;pinar.dogan@tobbund.com.tr;kerem.gozutok@tobbund.com.tr", "TOBB " & FirmaTmp, "*Automatic generated e-mail*",,,, "atilla@verag.ag", "al@verag.ag", _list) + Case "IMEX" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;pinar.dogan@tobbund.com.tr;kerem.gozutok@tobbund.com.tr", "TOBB " & FirmaTmp, "*Automatic generated e-mail*",,,, "info@imex-group.at;Mario.Hoefer@imex-group.at", "al@verag.ag", _list) + Case "UNISPED" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;pinar.dogan@tobbund.com.tr;kerem.gozutok@tobbund.com.tr", "TOBB " & FirmaTmp, "*Automatic generated e-mail*",,,, "Katharina.Haas@unisped.at;Sabine.Muehlboeck@unisped.at;Ernst.Stolzlechner@unisped.at", "al@verag.ag", _list) + End Select + + If bool_sent Then + System.Console.WriteLine("Vorgang erfolgreich abgeschlossen (" & FirmaTmp & ") ...") + Else + System.Console.WriteLine("Fehler beim Senden der Mail (" & FirmaTmp & ") ...") + End If + End Select + End Sub + Function getOption() As String Try Dim instr = New StreamReader(options) @@ -214,7 +268,7 @@ Module Mail Dim Msg As New MailMessage Dim myCredentials As New System.Net.NetworkCredential myCredentials.UserName = "support@verag.ag" - myCredentials.Password = "support" + myCredentials.Password = supportPWD ' myCredentials.UserName = "testmail@verag.ag" @@ -294,7 +348,7 @@ Module Mail Dim Msg As New MailMessage Dim myCredentials As New System.Net.NetworkCredential myCredentials.UserName = "support@verag.ag" - myCredentials.Password = "support" + myCredentials.Password = supportPWD ' myCredentials.UserName = "testmail@verag.ag" @@ -368,8 +422,6 @@ Module Mail myCredentials.UserName = "al@verag.ag" myCredentials.Password = "verag#2" - - ' myCredentials.UserName = "testmail@verag.ag" ' myCredentials.Password = "testmail" Msg.IsBodyHtml = False @@ -449,8 +501,6 @@ Module Mail myCredentials.UserName = "al@verag.ag" myCredentials.Password = "verag#2" - - ' myCredentials.UserName = "testmail@verag.ag" ' myCredentials.Password = "testmail" Msg.IsBodyHtml = False @@ -582,7 +632,7 @@ Module Mail Return False End Function - Private Function MDM_Zollbuero_Verguetung() As Boolean + Private Function MDM_Zollbuero_Verguetung(Jahr) As Boolean Dim Msg As New MailMessage Dim myCredentials As New System.Net.NetworkCredential myCredentials.UserName = "al@verag.ag" @@ -598,7 +648,7 @@ Module Mail Try Dim datum As String = Now.AddDays(-1).ToShortDateString System.Console.WriteLine("Erstelle EXCEL...") - Dim excel As String = genEXCEL_MDM_ZOLL() + Dim excel As String = genEXCEL_MDM_ZOLL(Jahr) System.Console.WriteLine("EXCEL erstellt...") If excel <> "" And Not excel.StartsWith("ERROR: ") Then @@ -606,11 +656,12 @@ Module Mail Msg.From = New MailAddress("al@verag.ag") - Msg.To.Add("al@verag.ag") - + Msg.To.Add("Viktoria.Leirich@imex-group.at") + Msg.To.Add("sales@verag.ag") ' Msg.To.Add("jl@verag.ag") ' Msg.Bcc.Add("al@verag.ag") - ' Msg.Bcc.Add("cw@verag.ag") + Msg.CC.Add("jl@verag.ag") + Msg.CC.Add("al@verag.ag") Msg.Subject = "Auswertung MDM-ZOLL Vergütung" @@ -666,7 +717,7 @@ Module Mail 'myCredentials.UserName = "al@verag.ag" 'myCredentials.Password = "verag#2" myCredentials.UserName = "support@verag.ag" - myCredentials.Password = "support" + myCredentials.Password = supportPWD ' myCredentials.UserName = "testmail@verag.ag" @@ -718,7 +769,26 @@ Module Mail Msg.Attachments.Add(attachment) - mySmtpsvr.Send(Msg) + Try + mySmtpsvr.Send(Msg) + Catch ex As Exception + Try + mySmtpsvr.Port = 25 + mySmtpsvr.Send(Msg) + Catch ex2 As Exception + Try + mySmtpsvr.Host = "192.168.0.107" + mySmtpsvr.Port = 25 + mySmtpsvr.Send(Msg) + + Catch ex3 As Exception + MsgBox(ex3.Message & ex3.StackTrace) + Return False + End Try + End Try + End Try + + System.Console.WriteLine("E-Mail gesendet.") ' MsgBox("E-Mail gesendet.", MsgBoxStyle.Information, Title:="Information") @@ -729,27 +799,13 @@ Module Mail End If Catch ex As Exception - Try - mySmtpsvr.Port = 25 - mySmtpsvr.Send(Msg) - - Catch ex2 As Exception - Try - mySmtpsvr.Host = "192.168.0.107" - mySmtpsvr.Port = 25 - mySmtpsvr.Send(Msg) - - Catch ex3 As Exception - MsgBox(ex3.Message & ex3.StackTrace) - Return False - End Try - End Try - - + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return False End Function + + Private Sub send() Dim message As New MailMessage("al@verag.ag", "al@verag.ag", "Test", "Testmail") @@ -764,7 +820,7 @@ Module Mail Dim Msg As New MailMessage Dim myCredentials As New System.Net.NetworkCredential myCredentials.UserName = "support@verag.ag" - myCredentials.Password = "support" + myCredentials.Password = supportPWD ' myCredentials.UserName = "testmail@verag.ag" @@ -1071,7 +1127,7 @@ Module Mail - Public Function genEXCEL_MDM_ZOLL() As String + Public Function genEXCEL_MDM_ZOLL(Jahr) As String Try @@ -1093,13 +1149,13 @@ Module Mail Datei = .Workbooks.Open(filepath) 'Anpassen Blatt = Datei.Worksheets("CS") 'Anpassen - Blatt.Range("E1").Value = Now.Year + Blatt.Range("F1").Value = If(Jahr > 0, Jahr, Now.AddMonths(-1).Year) ' Dim von = CDate("01." & Now.AddMonths(-1) & "." & Now.AddMonths(-1).Year) - For i = 1 To Now.AddMonths(-1).Month - Dim year = Now.AddMonths(-1).Year + For i = 1 To 12 'Now.AddMonths(-1).Month + Dim year = If(Jahr > 0, Jahr, Now.AddMonths(-1).Year) Dim sqlstr As String = "" ' Dim bis = von.AddMonths(1).AddDays(-1) @@ -1349,7 +1405,7 @@ Module Mail Public Function loadDgvBySqlSDL(ByVal sql As String) As DataTable Try Dim myTable = New DataTable() - Dim conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL + Dim conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionSDL 'conn.ConnectionString = "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=SDL;Integrated Security=false;User ID=test;Password=BmWr501956;" 'conn.Open() diff --git a/MailSender/Resources/MDM_ZOLL_Verguetung.xlsx b/MailSender/Resources/MDM_ZOLL_Verguetung.xlsx index 06aa0ae748f27178957b654686c94668b3c331f1..1ae8ad35edc5685aec9741bf0ef41b8672f67081 100644 GIT binary patch delta 4340 zcmY+IWmFW}*T#p2p%H12ZWtP*8R-~GVgN}8M7o>7Vd#)XIwcjPyM}J0L8Kd`1PKLR z@BMP$|M~Q+eSRO#+WV}%_Om;U|3JSK;p0g~R<rjmT z-l_Ls3bV;4ObHiAd$zyL`CKL{+eUXGDF!xSMwse;L?_x@Ri1E|XJ;eodS9R6o~pFi zOqb|Ye%G-oZ_lX;k8U{ct2rhvK6}~j*M5h!ClqCtsF=;$K2OC3VfF&Zxnghkh#im{ zHDZn|;^v?oLc;+uPz_KBFSDxa6c`-QkOAj$ecZ{GHB*)Sv zp{Dx&QI1S+1VUGcvZjmjd=<{^y5RMLTJL2Hg35=*0m&h(PwQw2`*GkfuZUOkSO5SA zGXOvc004X)K^~rdjxY~?Unj?HlX2%QF_KQoeJNbv)C*muBtAc<>K)IVzV5BN0h5YoHR#PAU{q0K>)TtABPgex23ADLf&G5meah>IvBO?Mt+P&Sk0Y?fjnhhGgf)T{ebjwD!-?3uOA$yo`Sa7=43 zND&RIlEYWp>M=!g!$*-bOm+J7c9A}Lk&v3{Cxg2-ZUu=PeJX_UVTa)hFitCRT&GfI z5LGby7EYAl(buqyzadMz#Js%)tvB$qX!ewfs!?bJIvqQ-MQ^a$0#EiZm)AH|&~w|Y zwHS}8+{Lzkha+HNr=!U^KaOf&8!SoT+`|<=GT*?X3hMcz8hIU;fH?Ri5va5H&yHQ# z{T22Kk-0c}%D@=W(Fx4Q!WMX*fKF=ci@e zfx{UVZ{jrt`Or84NCJ;lSlIJRIf-=g_-X{_86(y@3CkiB&{n`+9xKzX|YG1%Z#JbQm6=cIKgE%!}_(# zs0OI`r!tqEbef<|97f9@YC{I>Ujy9VIBal74}7Tij{)z&8{iy9BAQw=Jp$ zvy)T=1gYq^lA#|XU1ec)biQ?UBLz@63a3n?ak-N8Xo zb)$_&3|1CbkhuvDr^WhaCU|rwu?klSl{_0Pa43tQN4IsjV`6&UJJO=wOT##C?3)7H z@U!m~s{-HGq9(!&)JeH(7}A*O$UeVqyEymglw|7ovf7zgGO_MT%u=Q+dSefRuThu* z=33TeoMxL4e-+)>LDW#oBu4~KhxY4H4HKo`n+jGESkGwN>dW@1BPZ6%Na zT;89)Zc}>Qo*U0IKr(aJXPHjnJ&koR;$WUe$zJ-d812B}Y(2_glZNG;bofIiYn?Bz z(wp*_W=x*Dkg|t%>9#ElJ@32;?JM9$534M21*&=)lOAs(`#5xJE1&ymF5r(U=QEV< z=$_B<$(WnZ8##a5xe|a@^Ik{zxqKG?-;ROrbU|EqX@jH-@}g;Nu9s(l7EcF zro{yc3xu;mUlP56K+bHnV|cC4>LiR|<_T{&khQb!P65_1U3VefP>YqK(35L5&3TdF z;i0I4Bt$VO#^b0>QhI75Z>P#Dil>vH+r1CA&&w9s?NPEwy_q5F$8*<0rFt!^)zb;i zXrAwzDjGp)eOP=4xrFjLVeyT7$Ix7?%(S1c(BZ=C^|V+^pt0)sXRTHCe0zxet|u3U z+-rmsPI;>8*2>-_95d^GT)2XEyH%)a6<}NdGZ=Z@cIqe9O#U%TOr}3ZRPU-SyCqF^ zx{T(*q&0Ft8`{*@N;B{zdMSk3P%QnD3W)1>a_2oHsW-7_pGsn5_NMKXK-QOX7bJmRh#IAX$9k+*_BfFvY#S4yC2j{!!3t_szUo)T)uW|x<7V7q|QiE1}i;We4Shu_(DBap@^etqdpTcL8y+jVGm$KctB1cYGv z-AF$LyAI(7uhpg3f#&W!Pq8U46Av;HNhw7898fU{uKG?6WV2;`+1e;9)z#F!QMX`e ze0ArJFzj>}&?H8ge)G!o#)#T@68H*&W8=hs3F4mI$Ge@OE@#gmqFp4Ls3OR_0_CheO^4NO-0bHKvt?Wj z&uwmqdY6cHA`i8-6j=lR_hW0a8AIxvUBXQjv*9qLZcLv9UsmFqUlLsQ2Pi|3DwJvc}lI^ti z&b+S|z!Zf6YGRJ^Ms*Q{0-w=n6T{Zme)A_#ol+Paa^dQdi<46Ck+bs148~z3GmFTpjXjtwu!%Q=emJ0?kc*4t9*%vI2 z!FpJ&!xfF|7E>6FEHOAc1ha2T<-sq_b;_QBIEyZrwXQcmYV2ZzIx3jV3+!(T zDe1`yFA(5+Uj^z^O8Zty&?_Nv-*=n&gOZ#3yOPrtNg->~fWHLG{}KlV#gfJpC~t3m z=Xz%D1d>!rsK&2lA6?}grOcCljdb`Jp}Bu*15sK$H|VZ|DS;}LD&;U;fU}5<#p#;4 zU4!zCaF4WMG3VVdYWEaS_C=@4!gin=SJ{{C&sqGi!{Uqmo{m)M%7j;ncNbx74? zb;(;2JT?-@V#J|Ct$BrEJ|28E=GAXB&Q1yqsQM;7jrBEP*1Y9~k$aey}%+m=9-Fs%j3j=jX||R=Amv zt2i#gk`SN{y@FtjxsGciJGPY> zc8Yz~gXM`C=0SX9ZvX}Gf5^M4jI_rqf-4TIF!Lpn5O{}(L9lpeXT>Wv~AuwF8T@A7Nz(PUAe)IMfxy>0W`caZLnOk)=-M> z$iRjvvaMxx8!Sp+KP>O>%royj#RJ;twW(E%S1FavXi1(5(Lxs^qB~s(?115qwOu}v zMIb#yB?QlHFJ+;mO}2NCA?tQ?0;=l51z` z*(;6|t-c(NDV#U?{H#-C>am?2bI0=8{Nk*EGQvNyXDA}73n=rvfjK@VDE?$r>#}%` zl>O~PxcGZLQ9mXo&D=sT6)&CX8`W)l!(7?&sNdllxr0a|UD>X2|BSaQqvEk&!ySW=^SZUm;z^ zRu?7lxZf{%ujhK^%bB^(%zXIGxn|C9uFX14YYRw;3F#t7RdGO|U1TMx0H9aM1)b4< zCvi4Wj&c2(02h^Edf^az7Vw(PJ@CE(P0T{@;P12C3x^;cNaqiI#AIu)uHbm995iXx z-awabByywBn>*Y#k32O(6veu|E-ED#on@;xmlA6?Wi*wP@RguB2Xr!_C7@`m7NyFI6hf`hzF7g_6-FMf85QTeC$@DD))p9souV*QfRbHoZagPXS%8(c;tSxR;T%3k%oj00k&U}rBOeCdkU?TrW2y}^? z3Y6l5K$ff^5IG10@<)hx`vf5DyoLQ;5$k3nZfg=W-{`j$h)5<>^;A=Y0uYHCK3Vm!$+;qj6#EzPU`!NV_r9?;I>^3(`k#&qSTVY6N;kXlaPC(^}G=tG;2W>hl7 zq4V4=71!Jfe5%vI7_)SeHL6F(i38_IR}#8?~8fFd&OcY@3Lgiv&o28yJk>;aT)tz!+c2SJ_7`QeXT0OY^3LQHUj*CXsm^}z-LVlg z*BMV0W4^;B?2GpV!;b}kxZx82(TMI2MQg;YN0L0>xf_ujPv2g05*G=67f$$L&U}2* zThE;c|CDDELLQvV)haJyeLYM@HdPtO#-)AhdXKBctsQgV#f^=XB~z>>wj`Q^)~5ci z(Trf}2)rn{m=u39a_+0nr=NRX-!CM#CXmN=?>T+19z{LPW#eWC&KP5MiuN8PHSyWs zFEiWfuxy@_X!9G{^I1eqcFwjmXo-<9UpYpz>C0HWXyqdIzL$`B6LLVE@+*nyI2ha0 zo9`k?q^H=kO`J0}ufXm7D;uoIo=iq4?^nX*r@Wac6|O}rMLSheFvVEdB?~Ganx|SI zY25S{WY(25W)h~)iXiOjD*K{CVQ;n*#TFH3y9 zxH*wF+HB}|M>a#~;!xjk*eSB(_{U4Q(ZZ{YKMM8w$=9senhn2k{aEjYuaYnF22sQa z4TXj^lNBCO_{kgZ)=nV)!i%*cli<2bF0~r_+I~ymw}9ivfb-j zMamQwI46A^KxW?a(L@yE*5*HYs~-$X8Q}+bcW|gjtgT!cb%?YpG% zhmvVMJ(Lx+C2HQ?^HWC~MGx+=nmhM6Q8S&mV-Y1fMnkEb`^b8+E zOsui8370I<958hv%Lir{aP{#5PSfWV*imc}LVgJ<+kGKc^2{MFB~*dO(4=Km=WVnI zeyvI`mb;uw;rHpFpjp2G+?y)eUxv?7(GV~LmZv--QstD7uFy*UqKS#PFDR!LZ6@?a zu-J=ii6P|Ymx);74MFC{>!879=241ivaHILq5}=k%_okYgv%eN+eX;kmrGNv1Em#a zuFqZMUilO)%x-M&IxmSo8Q5^2s@UdSR=HRdV&2lO$c;Gg%6#5yk8%Gbubu|Mm9H6b z#A%A_nA>G=M@&x)xb}UiOjw+0&2FlScWv;UsZ*Ofn@80y4qC&=zdiWaCywWS4o%RF zT3a&y5Wa3HO7-BJ=-n1-VkGi#RpGXG-`wDVbRXf}p#c$qh;D6m&~sAI!uD-!4)(nB+oK4ReTYR~0w2;8@+rF-iv9g$y0VZgw zL&8=oCvW2Pn|Mg*5giMnO`950w+<~KOwiQK{K$M=bLONs^Yv(*&Nsk9UY<6W3Pqo1 zlWh+LkeaRnI-xafcmiv_1npMCY>%D49p$1fWwkYp>x8f&(u6Fo-e)W;INHZMJODlc z$DT2~S^SEW*f_^Q=D3V(q6->W_P$H#UJa|G8uepX67M3_p_TXOY01y)(n~U1} z7#dG*X`(79Pt64is`udOIK23}qYUL$+KmOH7m{$>7zO zi0Jcl6U1^BQ_W_@l-_Nnz>iPMXW1l3egRxKs)a~NtJB6GxMT?SC|(7PY28v$+hK$w zxG()r^joD7ca=Vox{gK+(1}e4p@RYHd{0#r+B) zSuCn6!K<|rh3<`e9AY34F9u=Y_UwNPkIeRwA;dv3_c!Yp+C~W+T&>sYxy6cuyLO(2 zfe#MzQ5%dy@J9s}D(YPyEbf@Ptsw0|8c_p)ZkAp9EEI>KVZHss*DFqf_c(0|fL*@nkph!aD;4#T^H4@F}AVB`^~} zqM-BC5WhRu0&2I2RnTRoKSy2vG|e=MBJh8qP&Q~o0OZewzL>%a1SA%YYA-n-Pe!*!S{eAoPSE>9wRpY3|aSXp-aSD=9Ez5};Z z&Vv`_nW+BZcQeNp4K*XgQu#8L3j6}>-;Aom>tmT}Z29rb+`%L)32d*}_WM2o5rQu5$Gs~;Y` ze-2qoD@inY8cVn-;k!)FE(iF9zjD##$AMs`c22AlBpzxk0X?35-U>=X!W(Mw0-`#2 zbY6#)O1`U(`6s=Gdbt~@cmKfd$4;sPs$uFjf zYCZbZGQ1CuohY%}%`Hnsk)J+o8!uP(%+>T)z?yl-(kj8{u4}{o7$9ZUAG3D%LFmIZ zk8HoyjeBl3(5%^|dvP%H0sr53YiW&H`2hY(4q?ZOq(8x=y7S0NtyMoA%f_+2(6shA z1Bw-T)0-ZQDjluv4Bj~FuY&v6O&>ps=}@2IHrX>4dKj4neH*%%lUimU2XOz#I3NHO zTmLz;YOrJH#Q}8Qh%$s@wXg3Mp6ikr)Zx%6)K>_ZeUBSx``Wn}rK_13*JS~E+bzEi88mjlO;(P{|&d5-wap^+Z<|6*LbzOjSq`-i}JcS45YOV#;cSoEI zrq~RLE>$Oy=cst|$vhat;Kip1iH}x4Xr2q^KUsKVoFN%In#I3ZmMCLKx*T0_RoXCV zI@f3t=}Lyq#mvndl~wK9*Du82Y1;NcO}e$prevUd>3*olH5r-Um_rpr#At?uK-+}` zo+lu^2HgB$9Gm4w5~x6aad|~!FDD~LOIh{3uISeOxQQ<4?h`x}11GquwviKTaKH9n z64dQ$tE)xPPgDet;f`GSuDst1R?Ynbe1BlAq6{c8gPfQyw?;I({^uAT>^!QuxxMMV ztqS<|yd_zHtu?|{+0oj`?O&qhld`DUFA9#p;;*oecAy{6oGMO-v&`{M5E8jA(RuN~ z&1RcnG5amJQWtIO}NYVZzVl z>8bAMbe49Nft+lsR%4K%);T2(Py-l4$uy7F0I;RN$}TOpHSVA46r*(xJZsdL zCQKjPw4-9E=u2)hsvTUrQgOX;l_s)YH0Jt;i{8thAE%yZvloD^dSRXrxSMSzB)?K? zijx&h5viB#*vnveM%B+11qUP91i6VG5%=nc)~5cenvDzA%cF)2yaHzN+LD0KD^fzM zO{MDTxgg{u0d0dmw*vnEqx6~lBP4%$DbiiwKJ(v?3<$(Uyoa@j|~KR?ry8= ''' Gibt das Datum für den Ostersonntag zurück. ''' - Public ReadOnly Property Ostersonntag() As Date + Public ReadOnly Property Ostersonntag_OLD() As Date Get If _Ostern.Ticks = 0 Then ' Datum des ersten Vollmondes nach Frühlingsanfang @@ -48,6 +48,54 @@ End Get End Property + Public Function Ostersonntag() As Date + Dim _month As Integer + Dim _day As Integer + Dim _moon As Integer + Dim _epact As Integer + Dim _sunday As Integer + Dim _gold As Integer + Dim _century As Integer + Dim _corx As Integer + Dim _corz As Integer + ' The Golden Number of the year in the 19 year Metonic Cycle: + _gold = (_Year Mod 19) + 1 + ' Calculate the Century: + _century = (_Year \ 100) + 1 + ' Number of years in which leap year was dropped in order + ' to keep in step with the sun: + _corx = (3 * _century) \ 4 - 12 + ' Special correction to syncronize Easter with moon's orbit: + _corz = (8 * _century + 5) \ 25 - 5 + ' Find Sunday: + _sunday = (5 * _Year) \ 4 - _corx - 10 + ' ^ evtl. long To prevent overflow at year 6554 + ' Set Epact - specifies occurrence of full moon: + _epact = (11 * _gold + 20 + _corz - _corx) Mod 30 + If _epact < 0 Then + _epact += 30 + End If + If (((_epact = 25) AndAlso (_gold > 11)) OrElse (_epact = 24)) Then + _epact += 1 + End If + ' Find Full Moon: + _moon = 44 - _epact + If _moon < 21 Then + _moon += 30 + End If + ' Advance to Sunday: + _moon += 7 - ((_sunday + _moon) Mod 7) + If (_moon > 31) Then + _month = 4 + _day = _moon - 31 + Else + _month = 3 + _day = _moon + End If + Return New DateTime(_Year, _month, _day) + End Function + + ''' ''' Gibt das Datum für den Ostermontag zurück. ''' @@ -137,8 +185,10 @@ If datum = CDate("01.11." & _Year) Then Return True If datum = CDate("25.12." & _Year) Then Return True If datum = CDate("26.12." & _Year) Then Return True + + If datum = Ostermontag Then Return True - If datum = Ostersonntag Then Return True + If datum = Ostersonntag() Then Return True If datum = Himmelfahrt Then Return True If datum = Pfingstmontag Then Return True If datum = Pfingstsonntag Then Return True @@ -158,5 +208,35 @@ End Select Return False End Function + 'Public Function isFeiertag(datum As Date, land As String) As Boolean + ' If datum = CDate("01.01." & _Year) Then Return True + ' If datum = CDate("06.01." & _Year) Then Return True + ' If datum = CDate("15.08." & _Year) Then Return True + ' If datum = CDate("01.11." & _Year) Then Return True + ' If datum = CDate("25.12." & _Year) Then Return True + ' If datum = CDate("26.12." & _Year) Then Return True + + + ' If datum = Ostermontag Then MsgBox("Ostermontag") : Return True + ' If datum = Ostersonntag() Then MsgBox("Ostersonntag") : Return True + ' If datum = Himmelfahrt Then MsgBox("Himmelfahrt") : Return True + ' If datum = Pfingstmontag Then MsgBox("Pfingstmontag") : Return True + ' If datum = Pfingstsonntag Then MsgBox("Pfingstsonntag") : Return True + ' If datum = Fronleichnam Then MsgBox("Fronleichnam") : Return True + + ' Select Case land + ' Case "AT" + ' If datum = CDate("26.10." & _Year) Then Return True + ' If datum = CDate("08.12." & _Year) Then Return True + ' If datum = CDate("01.05." & _Year) Then Return True 'Staatsfeiertag + ' Case "DE" 'BAYERN + ' If datum = CDate("03.10." & _Year) Then Return True ' Tag der Deutschen Einheit + ' If datum = BussUndBettag Then MsgBox("BussUndBettag") : Return True ' Buß- und Bettag '!!!!ABEWEICHEND + ' If datum = CDate("08.08." & _Year) Then Return True ' Augsburger Friedensfest + ' If datum = CDate("01.05." & _Year) Then Return True ' Maifeiertag + ' If datum = Karfreitag Then MsgBox("Karfreitag") : Return True + ' End Select + ' Return False + 'End Function End Class \ No newline at end of file diff --git a/UID/Dienstplan/frmDienstplanVariabel.vb b/UID/Dienstplan/frmDienstplanVariabel.vb index f0e2fcc..777d41f 100644 --- a/UID/Dienstplan/frmDienstplanVariabel.vb +++ b/UID/Dienstplan/frmDienstplanVariabel.vb @@ -2328,8 +2328,32 @@ Public Class frmDienstplanVariabel End Sub + Public Function GetWeekStartDate(weekNumber As Integer, year As Integer) As Date + Dim datum = New DateTime(year, 1, 1) + Dim firstDayOfYear = datum.DayOfWeek + Dim result = datum.AddDays(weekNumber * 7) + If firstDayOfYear = DayOfWeek.Monday Then Return result.Date + If firstDayOfYear = DayOfWeek.Tuesday Then Return result.AddDays(-1).Date + If firstDayOfYear = DayOfWeek.Wednesday Then Return result.AddDays(-2).Date + If firstDayOfYear = DayOfWeek.Thursday Then Return result.AddDays(-3).Date + If firstDayOfYear = DayOfWeek.Friday Then Return result.AddDays(-4).Date + If firstDayOfYear = DayOfWeek.Saturday Then Return result.AddDays(-5).Date + Return result.AddDays(-6).Date + End Function - Private Function GetWeekStartDate(weekNumber As Integer, year As Integer) As Date + + 'Private Function GetWeekStartDate3(weekNumber As Integer, year As Integer) As Date + ' Dim calendar As Calendar = CultureInfo.CurrentCulture.Calendar + ' Dim jan1 As DateTime = New DateTime(year, 1, 1) + ' Dim daysOffset As Integer = DayOfWeek.Monday - jan1.DayOfWeek + ' Dim firstMonday As DateTime = jan1.AddDays(daysOffset) + ' Dim firstMondayWeekNum As Integer = calendar.GetWeekOfYear(firstMonday, CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Monday) + ' Dim firstWeekDay As DateTime = firstMonday.AddDays((weekNumber - firstMondayWeekNum) * 7) + ' Return firstWeekDay + 'End Function + + + Private Function GetWeekStartDate2(weekNumber As Integer, year As Integer) As Date Dim startDate As New DateTime(year, 1, 1) Dim weekDate As DateTime = DateAdd(DateInterval.WeekOfYear, weekNumber - 1, startDate) Return DateAdd(DateInterval.Day, (-weekDate.DayOfWeek) + 1, weekDate) @@ -2342,6 +2366,7 @@ Public Class frmDienstplanVariabel aktDate = GetWeekStartDate(txtKW.Text, txtKWYear.Text) aktWoche = DateToWeek(aktDate).Substring(4, 2) aktJahr = DateToWeek(aktDate).Substring(0, 4) + initWeekInfo() initDienstplan() Me.Cursor = Cursors.Default diff --git a/UID/Mitarbeiter/usrCntlMitarbeiter.vb b/UID/Mitarbeiter/usrCntlMitarbeiter.vb index d18cf05..7411cae 100644 --- a/UID/Mitarbeiter/usrCntlMitarbeiter.vb +++ b/UID/Mitarbeiter/usrCntlMitarbeiter.vb @@ -327,7 +327,7 @@ Public Class usrCntlMitarbeiter Me.Cursor = Cursors.WaitCursor Dim frmMitarbDetails As New frmMitarbDetails frmMitarbDetails.mid = sender.CurrentRow.Cells(0).Value - frmMitarbDetails.ShowDialog(Me) + frmMitarbDetails.Show(Me) sender.RELOAD() Me.Cursor = Cursors.Default ' AddHandler frmMitarbDetails.FormClosing, AddressOf handleClose diff --git a/UID/My Project/Resources.Designer.vb b/UID/My Project/Resources.Designer.vb index e8d2d8e..6313155 100644 --- a/UID/My Project/Resources.Designer.vb +++ b/UID/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ @@ -201,7 +201,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956; ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; ähnelt. ''' Friend ReadOnly Property connStringAdmin() As String Get @@ -210,7 +210,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die Data Source=192.168.0.90\DEVSQL;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956; ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die Data Source=192.168.0.90\DEVSQL;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; ähnelt. ''' Friend ReadOnly Property connStringAdmin_DEF() As String Get @@ -219,16 +219,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die Data Source=VERAG-ATILLA2;Initial Catalog=AVISO_ATILLA;Integrated Security=false;User ID=sa;Password=BmWr501956; ähnelt. - ''' - Friend ReadOnly Property connStringAtilla() As String - Get - Return ResourceManager.GetString("connStringAtilla", resourceCulture) - End Get - End Property - - ''' - ''' Sucht eine lokalisierte Zeichenfolge, die Data Source=192.168.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956; ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die Data Source=192.168.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; ähnelt. ''' Friend ReadOnly Property connStringFMZOLL() As String Get @@ -237,7 +228,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956; ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; ähnelt. ''' Friend ReadOnly Property connStringFMZOLL_DEV() As String Get @@ -525,15 +516,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. - ''' - Friend ReadOnly Property sfsdf3sdfsdf3sdfsdfsdf() As String - Get - Return ResourceManager.GetString("sfsdf3sdfsdf3sdfsdfsdf", resourceCulture) - End Get - End Property - ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -664,7 +646,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 2.0.1 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 2.0.2 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/UID/My Project/Resources.resx b/UID/My Project/Resources.resx index 4f93f08..699e7d1 100644 --- a/UID/My Project/Resources.resx +++ b/UID/My Project/Resources.resx @@ -143,7 +143,7 @@ ..\Resources\reise.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956; + Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; ..\Resources\cmr-logo_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -185,16 +185,16 @@ ..\Resources\sanduhr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956; + Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; - 2.0.1 + 2.0.2 ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Data Source=192.168.0.90\DEVSQL;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956; + Data Source=192.168.0.90\DEVSQL;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; ..\Resources\refresh1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -212,7 +212,7 @@ ..\Resources\admin_monitoring1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Data Source=192.168.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956; + Data Source=192.168.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; ..\Resources\urlaub.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -247,9 +247,6 @@ ..\Resources\dispo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Data Source=VERAG-ATILLA2;Initial Catalog=AVISO_ATILLA;Integrated Security=false;User ID=sa;Password=BmWr501956; - ..\Resources\dp_tv.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -304,7 +301,4 @@ ..\Resources\personGray_w.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - \ No newline at end of file diff --git a/UID/Programme/usrCntlProgramme.Designer.vb b/UID/Programme/usrCntlProgramme.Designer.vb index cf2222d..7e25311 100644 --- a/UID/Programme/usrCntlProgramme.Designer.vb +++ b/UID/Programme/usrCntlProgramme.Designer.vb @@ -100,6 +100,7 @@ Partial Class usrCntlProgramme Me.Button11 = New System.Windows.Forms.Button() Me.Label17 = New System.Windows.Forms.Label() Me.PictureBox14 = New System.Windows.Forms.PictureBox() + Me.Button12 = New System.Windows.Forms.Button() CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit() @@ -815,11 +816,22 @@ Partial Class usrCntlProgramme Me.PictureBox14.TabIndex = 106 Me.PictureBox14.TabStop = False ' + 'Button12 + ' + Me.Button12.Location = New System.Drawing.Point(76, 491) + Me.Button12.Name = "Button12" + Me.Button12.Size = New System.Drawing.Size(100, 23) + Me.Button12.TabIndex = 109 + Me.Button12.Text = "Parameter" + Me.Button12.UseVisualStyleBackColor = True + Me.Button12.Visible = False + ' 'usrCntlProgramme ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Controls.Add(Me.Button12) Me.Controls.Add(Me.Button11) Me.Controls.Add(Me.Label17) Me.Controls.Add(Me.PictureBox14) @@ -994,4 +1006,5 @@ Partial Class usrCntlProgramme Friend WithEvents Button11 As Button Friend WithEvents Label17 As Label Friend WithEvents PictureBox14 As PictureBox + Friend WithEvents Button12 As Button End Class diff --git a/UID/cProgramFunctions.vb b/UID/cProgramFunctions.vb index e278d8a..27cf404 100644 --- a/UID/cProgramFunctions.vb +++ b/UID/cProgramFunctions.vb @@ -37,24 +37,23 @@ Public Class cProgramFunctions ' MsgBox(datvon.ToShortDateString & " - " & datbis.ToShortDateString) While datvon <= datbis ' MsgBox(datvon.ToShortDateString) - Dim AtWoche_atlas As String = BRG.getBrgSumFromFMZOLL_Zabis(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_AT) - AtWoche_atlas += BRG.getBrgSumFromFMZOLL_Zodiak(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_AT) ' DATEN AUS DAKOSY/ZODIAK EINLESEN - Dim DeWoche As String = BRG.getBrgSumFromFMZOLL_Zabis(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_DE) - 'DeWoche += BRG.getBrgSumFromFMZOLL_Zodiak(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_DE) - Dim De2Woche As String = BRG.getBrgSumFromFMZOLL_Zabis(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_DE_NEU) - De2Woche += BRG.getBrgSumFromFMZOLL_Zodiak(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_DE_NEU) ' DATEN AUS DAKOSY/ZODIAK EINLESEN + Dim AtWoche_atlas As String = BRG.getBrgSumFromFMZOLL_Zabis(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_AT) + AtWoche_atlas += BRG.getBrgSumFromFMZOLL_Zodiak(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_AT) ' DATEN AUS DAKOSY/ZODIAK EINLESEN + AtWoche_atlas += BRG.getBrgSumFrom_NCTS_TR(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_AT) ' DATEN AUS DAKOSY/ZODIAK EINLESEN + Dim DeWoche As String = BRG.getBrgSumFromFMZOLL_Zabis(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_DE) + 'DeWoche += BRG.getBrgSumFromFMZOLL_Zodiak(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_DE) + Dim De2Woche As String = BRG.getBrgSumFromFMZOLL_Zabis(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_DE_NEU) + De2Woche += BRG.getBrgSumFromFMZOLL_Zodiak(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_DE_NEU) ' DATEN AUS DAKOSY/ZODIAK EINLESEN + De2Woche += BRG.getBrgSumFrom_NCTS_TR(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_DE_NEU) ' DATEN AUS DAKOSY/ZODIAK EINLESEN - ' MsgBox(BRG.getBrgSumFromFMZOLL_Zodiak(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_DE_NEU)) - ' Dim test As Double = BRG.getBrgSumFromFMZOLL_Zabis(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_DE_NEU) + ' MsgBox(BRG.getBrgSumFromFMZOLL_Zodiak(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_DE_NEU)) + ' Dim test As Double = BRG.getBrgSumFromFMZOLL_Zabis(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_DE_NEU) + Dim AtWoche_zolaris As String = BRG.getBrgSumFromFMZOLL_Zolaris(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_AT) + AtWoche_zolaris += BRG.getBrgSumFromFMZOLL_TELOTEC(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_AT) ' DATEN AUS TELOTEC EINLESEN - - Dim AtWoche_zolaris As String = BRG.getBrgSumFromFMZOLL_Zolaris(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_AT) - AtWoche_zolaris += BRG.getBrgSumFromFMZOLL_TELOTEC(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_AT) ' DATEN AUS TELOTEC EINLESEN - ' MsgBox(datvon.ToShortDateString & " AtWoche_atlas: " & AtWoche_atlas) - ' MsgBox(datvon.ToShortDateString & ": " & AtWoche_atlas & " - " & DeWoche & " - " & AtWoche_zolaris) 'UPDATE Dim buergschaft As cBuergschaft buergschaft = BRG.getBrgbyDate(datvon) @@ -78,11 +77,15 @@ Public Class cProgramFunctions If datvon.ToShortDateString = Now.ToShortDateString Then buergschaft.brg_de2_tag_atlas = - BRG.getBrgSumFromFMZOLL_Zabis(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_DE_NEU) + BRG.getBrgSumFromFMZOLL_Zodiak(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_DE_NEU) + BRG.getBrgSumFromFMZOLL_Zabis(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_DE_NEU) + + BRG.getBrgSumFromFMZOLL_Zodiak(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_DE_NEU) + + BRG.getBrgSumFrom_NCTS_TR(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_DE_NEU) buergschaft.brg_de_tag_atlas = BRG.getBrgSumFromFMZOLL_Zabis(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_DE) buergschaft.brg_at_tag_atlas = - BRG.getBrgSumFromFMZOLL_Zabis(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_AT) + BRG.getBrgSumFromFMZOLL_Zodiak(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_AT) + BRG.getBrgSumFromFMZOLL_Zabis(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_AT) + + BRG.getBrgSumFromFMZOLL_Zodiak(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_AT) + + BRG.getBrgSumFrom_NCTS_TR(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_AT) buergschaft.brg_at_tag_zolaris = BRG.getBrgSumFromFMZOLL_Zolaris(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_AT, " AND DatumBestimmungErreicht IS NULL ") diff --git a/UID/cSqlDb.vb b/UID/cSqlDb.vb index 309690f..b245352 100644 --- a/UID/cSqlDb.vb +++ b/UID/cSqlDb.vb @@ -154,6 +154,39 @@ Public Class cBrgDb Return Nothing End Function + + + Public Function getBrgSumFrom_NCTS_TR(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal statusVon As String, ByVal statusBis As String, ByVal buergschaft As String, Optional where As String = "") As String + 'Return Nothing + Dim sql As String = "SELECT sum(nctsSA_AbgabenBetrag)" + sql &= " from tblNCTS_TR_Sicherheitsangaben inner join [tblNCTS_TR] on ncts_Id = nctsSA_NctsId" + sql &= " where [ncts_Eroeffnung] BETWEEN '" & datumVon.ToShortDateString & " 00:00:00' AND '" & datumBis.ToShortDateString & " 23:23:59' AND ncts_Status BETWEEN '" & statusVon & "' AND '" & statusBis & "' AND nctsSA_GRN = '" & buergschaft & "' " & where + 'MsgBox(sql) + Dim dr As SqlDataReader + Dim daten As New List(Of cBuergschaft) + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand(sql, conn) + dr = cmd.ExecuteReader() + Try + Dim cnt As Integer = 0 + If dr.Read Then + If Not dr.GetValue(0) Is DBNull.Value Then + ' MsgBox(dr.GetValue(0)) + Return dr.GetValue(0) + + End If + End If + Return "0" + Catch ex As Exception + MsgBox(System.Reflection.MethodInfo.GetCurrentMethod.Name & ": Fehler mit der Datenbankverbindung:" & vbCrLf & vbCrLf & ex.Message, vbExclamation, "Datenbankfehler") + Finally + dr.Close() + End Try + End Using + End Using + Return Nothing + End Function + Public Function getBrgSumFromFMZOLL_Zabis(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal statusVon As String, ByVal statusBis As String, ByVal buergschaft As String, Optional where As String = "") As Double Dim sql As String = "SELECT ISNULL(SUM(veoerz_sicbtg),0) " & @@ -218,6 +251,7 @@ Public Class cBrgDb Return Nothing End Function + Public Function getBrgSumFromFMZOLL_TELOTEC(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal statusVon As String, ByVal statusBis As String, ByVal buergschaft As String, Optional where As String = "") As Double ' Dim sql As String = "SELECT ISNULL(SUM(veoerz_sicbtg),0) " & diff --git a/initATLASAufschubkonten/VERAG_Interface/cVERAG_out_ncts.vb b/initATLASAufschubkonten/VERAG_Interface/cVERAG_out_ncts.vb index 42869ee..a508ac3 100644 --- a/initATLASAufschubkonten/VERAG_Interface/cVERAG_out_ncts.vb +++ b/initATLASAufschubkonten/VERAG_Interface/cVERAG_out_ncts.vb @@ -47,17 +47,25 @@ - Shared Function copyFileFTP_VERAGncts_DY_ByBezugsNr(BezugsNr As String, ISett As cVERAG_Interface_Settings) As Boolean + Shared Function copyFileFTP_VERAGncts_DY_ByBezugsNr(BezugsNr As String, ISett As cVERAG_Interface_Settings, Optional FilialenNrTmp As Object = Nothing, Optional AbfertigungsNrTmp As Object = Nothing) As Boolean cVERAG_Interface_Settings = ISett Dim DY_TMP = DAKOSY_Worker.cDakosy_Zollanmeldungen.LOADByBezugsNr(BezugsNr) Dim NCTS_TMP = DAKOSY_Worker.cDakosyNCTSOut.LOADByBezugsNr(BezugsNr, True) If DY_TMP Is Nothing Then Return False If NCTS_TMP Is Nothing Then Return False - Return copyFileFTP_VERAGncts_DY(NCTS_TMP, DY_TMP, False) + Return copyFileFTP_VERAGncts_DY(NCTS_TMP, DY_TMP, False, FilialenNrTmp, AbfertigungsNrTmp) + End Function + Shared Function getLRN_ByCRN(CRN As String) As String + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Return SQL.getValueTxtBySql("SELECT TOP 1 LRN FROM zsAnmRefs WHERE CRN = '" & CRN & "' ORDER BY GeaendertAm DESC", "EZOLL") End Function + Shared Function getBezugnNr_ByMRN(MRN As String) As String + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Return SQL.getValueTxtBySql(" SELECT TOP 1 ncts_ObjectName FROM tblDakosy_NCTSOut WHERE ncts_MRN = '" & MRN & "' ORDER BY ncts_Trans_DatumZeit DESC", "FMZOLL") + End Function - Shared Function copyFileFTP_VERAGncts_DY(NCTS_TMP As DAKOSY_Worker.cDakosyNCTSOut, DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen, Optional checkAlreadyProvided As Boolean = True) As Boolean + Shared Function copyFileFTP_VERAGncts_DY(NCTS_TMP As DAKOSY_Worker.cDakosyNCTSOut, DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen, Optional checkAlreadyProvided As Boolean = True, Optional FilialenNrTmp As Object = Nothing, Optional AbfertigungsNrTmp As Object = Nothing) As Boolean Try If NCTS_TMP Is Nothing Then Return False If NCTS_TMP.ncts_ObjectName Is Nothing Then Return False @@ -72,13 +80,16 @@ If DY_TMP.dy_SendungsId IsNot Nothing AndAlso DY_TMP.dy_SendungsId > 0 Then GLO_SND = New VERAG_PROG_ALLGEMEIN.cSendungen(DY_TMP.dy_SendungsId) + ElseIf FilialenNrTmp IsNot Nothing And AbfertigungsNrTmp IsNot Nothing Then + GLO_SND = VERAG_PROG_ALLGEMEIN.cSendungen.LOADByFilialenNrAbfertigungsNr(FilialenNrTmp, AbfertigungsNrTmp) End If If DY_TMP.dy_AvisoId IsNot Nothing AndAlso DY_TMP.dy_AvisoId > 0 Then GLO_AVISO = VERAG_PROG_ALLGEMEIN.cAviso.getAvisoById(DY_TMP.dy_AvisoId) + ElseIf GLO_SND IsNot Nothing Then + GLO_AVISO = VERAG_PROG_ALLGEMEIN.cAviso.getAvisoById(GLO_SND.tblSnd_AvisoID) End If - ' Dim filePath = SQL.getValueTxtBySql("select [dySt_pfad] from [tblDakosy_Statusmeldungen] where dySt_BezugsNr='" & NCTS_TMP.ncts_ObjectName & "' and [dySt_status]=5 and [dySt_pfad] is not null ", "FMZOLL") Dim GRN = "" @@ -98,7 +109,6 @@ Dim IF_Obj As New List(Of cVERAG_InterfaceSharedObjects) If getFTP_Paths(GRN, IF_Obj) Then - For Each o In IF_Obj Select Case o.CooName 'Case "EKOL", "TOBB" @@ -119,10 +129,19 @@ 'filePath??? cGASTON_SCHUL_Interface.copyNCTSToFTP_V1_0_0(GASTON_SCHUL_EX, o, vorsystem, "", destFile, UniqueId, checkAlreadyProvided, found) + Case "TOBB" + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("KONTROLLE --------- TOBB: BezugsNr: " & NCTS_TMP.ncts_ObjectName, "", System.Reflection.MethodInfo.GetCurrentMethod.Name, , "BezugsNr: " & NCTS_TMP.ncts_ObjectName & " (DAKOSY)") + 'Wenn TOBB, nur mit KDNR: + If getTOBBKdnr() > 0 Then + Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromDAKOSY_V2_0_2(NCTS_TMP, DY_TMP, UniqueId, getTOBBKdnr) + If NCTS_VERAG_OUT IsNot Nothing Then copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found) + Else + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("TOBB: KEINE KDNR | BezugsNr: " & NCTS_TMP.ncts_ObjectName & vbNewLine & getTOBBDetails, "", System.Reflection.MethodInfo.GetCurrentMethod.Name, , "BezugsNr: " & NCTS_TMP.ncts_ObjectName & " (DAKOSY)") + End If Case Else Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromDAKOSY_V2_0_2(NCTS_TMP, DY_TMP, UniqueId) - copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found) + If NCTS_VERAG_OUT IsNot Nothing Then copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found) 'Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromDAKOSY(NCTS_TMP, DY_TMP, UniqueId) 'copyNCTSToFTP(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found) End Select @@ -178,13 +197,13 @@ End Try End Function - Shared Function copyFileFTP_VERAGncts_TC_ByBezugsNr(BezugsNr As String, ISett As cVERAG_Interface_Settings) As Boolean + Shared Function copyFileFTP_VERAGncts_TC_ByBezugsNr(BezugsNr As String, ISett As cVERAG_Interface_Settings, Optional FilialenNrTmp As Object = Nothing, Optional AbfertigungsNrTmp As Object = Nothing) As Boolean cVERAG_Interface_Settings = ISett Dim NCTS_TMP = TELOTEC_Worker.cTelotec_Anmeldung.LOAD_ByBezugsNr(BezugsNr) If NCTS_TMP Is Nothing Then Return False - Return copyFileFTP_VERAGncts_TC(NCTS_TMP, False) + Return copyFileFTP_VERAGncts_TC(NCTS_TMP, False, FilialenNrTmp, AbfertigungsNrTmp) End Function - Shared Function copyFileFTP_VERAGncts_TC(NCTS_TMP As TELOTEC_Worker.cTelotec_Anmeldung, Optional checkAlreadyProvided As Boolean = True) As Boolean + Shared Function copyFileFTP_VERAGncts_TC(NCTS_TMP As TELOTEC_Worker.cTelotec_Anmeldung, Optional checkAlreadyProvided As Boolean = True, Optional FilialenNrTmp As Object = Nothing, Optional AbfertigungsNrTmp As Object = Nothing) As Boolean Try If NCTS_TMP Is Nothing Then Return False If NCTS_TMP.telanm_BezugsNr Is Nothing Then Return False @@ -201,10 +220,14 @@ If NCTS_TMP.telanm_SendungsId IsNot Nothing AndAlso NCTS_TMP.telanm_SendungsId > 0 Then GLO_SND = New VERAG_PROG_ALLGEMEIN.cSendungen(NCTS_TMP.telanm_SendungsId) + ElseIf FilialenNrTmp IsNot Nothing And AbfertigungsNrTmp IsNot Nothing Then + GLO_SND = VERAG_PROG_ALLGEMEIN.cSendungen.LOADByFilialenNrAbfertigungsNr(FilialenNrTmp, AbfertigungsNrTmp) End If If NCTS_TMP.telanm_AvisoId IsNot Nothing AndAlso NCTS_TMP.telanm_AvisoId > 0 Then GLO_AVISO = VERAG_PROG_ALLGEMEIN.cAviso.getAvisoById(NCTS_TMP.telanm_AvisoId) + ElseIf GLO_SND IsNot Nothing Then + GLO_AVISO = VERAG_PROG_ALLGEMEIN.cAviso.getAvisoById(GLO_SND.tblSnd_AvisoID) End If ' Dim filePath = SQL.getValueTxtBySql("select [dySt_pfad] from [tblDakosy_Statusmeldungen] where dySt_BezugsNr='" & NCTS_TMP.ncts_ObjectName & "' and [dySt_status]=5 and [dySt_pfad] is not null ", "FMZOLL") @@ -232,6 +255,16 @@ ' 'copyNCTSToFTP_V2_0_1(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found) ' Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromTELOTEC_V2_0_2(NCTS_TMP, UniqueId) ' copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found) + Case "TOBB" + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("KONTROLLE --------- TOBB: BezugsNr: " & NCTS_TMP.telanm_BezugsNr, "", System.Reflection.MethodInfo.GetCurrentMethod.Name, , "BezugsNr: " & NCTS_TMP.telanm_BezugsNr & " (TELOTEC)") + 'Wenn TOBB, nur mit KDNR: + If getTOBBKdnr() > 0 Then + Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromTELOTEC_V2_0_2(NCTS_TMP, UniqueId, getTOBBKdnr) + copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found) + Else + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("TOBB: KEINE KDNR | BezugsNr: " & NCTS_TMP.telanm_BezugsNr & vbNewLine & getTOBBDetails, "", System.Reflection.MethodInfo.GetCurrentMethod.Name, , "BezugsNr: " & NCTS_TMP.telanm_BezugsNr & " (TELOTEC)") + End If + Case Else Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromTELOTEC_V2_0_2(NCTS_TMP, UniqueId) copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found) @@ -331,14 +364,14 @@ End Sub - Shared Function copyFileFTP_VERAGncts_EZOLL_ByBezugsNr(LRN As String, ISett As cVERAG_Interface_Settings) As Boolean + Shared Function copyFileFTP_VERAGncts_EZOLL_ByBezugsNr(LRN As String, ISett As cVERAG_Interface_Settings, Optional FilialenNrTmp As Object = Nothing, Optional AbfertigungsNrTmp As Object = Nothing) As Boolean cVERAG_Interface_Settings = ISett Dim AnmId = SQL.getValueTxtBySql("SELECT TOP 1 AnmId FROM zsAnmRefs WHERE (VorgangID = 'AV') AND (LRN = '" & LRN & "')", "EZOLL") If AnmId = "" Then Return False - Return copyFileFTP_VERAGncts_EZOLL(AnmId, False) + Return copyFileFTP_VERAGncts_EZOLL(AnmId, False, FilialenNrTmp, AbfertigungsNrTmp) End Function - Shared Function copyFileFTP_VERAGncts_EZOLL(AnmId As String, Optional checkAlreadyProvided As Boolean = True) As Boolean + Shared Function copyFileFTP_VERAGncts_EZOLL(AnmId As String, Optional checkAlreadyProvided As Boolean = True, Optional FilialenNrTmp As Object = Nothing, Optional AbfertigungsNrTmp As Object = Nothing) As Boolean Dim LRN = "" Try @@ -352,13 +385,36 @@ If dEZOLL.Rows.Count <= 0 Then Return False 'If NCTS_TMP.telanm_firma.ToString = "DURMAZ" Then Return False - + LRN = dEZOLL.Rows(0)("LRN") GLO_SND = Nothing GLO_AVISO = Nothing - LRN = dEZOLL.Rows(0)("LRN") + 'Versuche + Dim f_tmp As Integer = -1 + Dim a_tmp As Integer = -1 + If LRN.Length >= 13 Then + If IsNumeric(LRN.Substring(0, 4)) Then + f_tmp = LRN.Substring(0, 4) + End If + If IsNumeric(LRN.Substring(5, 8)) Then + a_tmp = LRN.Substring(5, 8) + End If + End If + + If f_tmp > 0 And a_tmp > 0 Then + GLO_SND = VERAG_PROG_ALLGEMEIN.cSendungen.LOADByFilialenNrAbfertigungsNr(f_tmp, a_tmp) + ElseIf FilialenNrTmp IsNot Nothing And AbfertigungsNrTmp IsNot Nothing Then + GLO_SND = VERAG_PROG_ALLGEMEIN.cSendungen.LOADByFilialenNrAbfertigungsNr(FilialenNrTmp, AbfertigungsNrTmp) + End If + + If GLO_SND IsNot Nothing Then + GLO_AVISO = VERAG_PROG_ALLGEMEIN.cAviso.getAvisoById(GLO_SND.tblSnd_AvisoID) + End If + + + Select Case SQL.getValueTxtBySql("SELECT TOP 1 DecTy FROM zsAnmHea WHERE (VorgangID = 'AV') AND (AnmId = '" & AnmId & "')", "EZOLL") Case "T1", "T2", "T2L", "T-" Case Else @@ -383,9 +439,19 @@ ' 'copyNCTSToFTP_V2_0_1(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found) ' Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromEZOLLByAnmId_V2_0_2(AnmId, UniqueId) ' copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found) + Case "TOBB" + 'VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("KONTROLLE --------- TOBB: BezugsNr: " & LRN, "", System.Reflection.MethodInfo.GetCurrentMethod.Name, , "BezugsNr: " & LRN & " (DHF/EZOLL)") + 'Wenn TOBB, nur mit KDNR: + If getTOBBKdnr() > 0 Then + Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromEZOLLByAnmId_V2_0_2(AnmId, UniqueId, getTOBBKdnr) + If NCTS_VERAG_OUT IsNot Nothing Then copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found) + Else + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("TOBB: KEINE KDNR | BezugsNr: " & LRN & vbNewLine & getTOBBDetails, "", System.Reflection.MethodInfo.GetCurrentMethod.Name, , "BezugsNr: " & LRN & " (DHF/EZOLL)") + End If + Case Else Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromEZOLLByAnmId_V2_0_2(AnmId, UniqueId) - copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found) + If NCTS_VERAG_OUT IsNot Nothing Then copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found) 'Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromEZOLLByAnmId(AnmId, UniqueId) 'copyNCTSToFTP(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found) End Select @@ -412,14 +478,16 @@ Shared Function getFTP_Paths(GRN As String, ByRef IF_Obj As List(Of cVERAG_InterfaceSharedObjects)) As Boolean + IF_Obj = New List(Of cVERAG_InterfaceSharedObjects) + Try Select Case GRN Case "15TR0004000020917", "12TR0004000004665", "17TR0004000032349", "17TR0004000029518" - If cVERAG_Interface_Settings.acticeInterface_TOBB Then IF_Obj.Add(New cVERAG_InterfaceSharedObjects("\\ftps.verag.ag\FTP\TOBB\OUT\", "TOBB")) - Case "18DE0000000073276", "19DE0000000075520", "18DE0000000075520", "15TR0004000020500" - If cVERAG_Interface_Settings.acticeInterface_OREGON Then IF_Obj.Add(New cVERAG_InterfaceSharedObjects("\\ftps.verag.ag\FTP\OREGON\OUT\", " ")) + If cVERAG_Interface_Settings.acticeInterface_TOBB Then IF_Obj.Add(New cVERAG_InterfaceSharedObjects("\\ftps.verag.ag\FTP\TOBB\OUT\", "TOBB")) : IF_Obj.Add(New cVERAG_InterfaceSharedObjects("\\datenarchiv\Datenarchiv\DAKOSY\ECHTSYSTEM\FTP\TOBB\", "TOBB")) + Case "18DE0000000073276", "19DE0000000075520", "18DE0000000075520", "15TR0004000020500", "ITTR0000000000153" + If cVERAG_Interface_Settings.acticeInterface_OREGON Then IF_Obj.Add(New cVERAG_InterfaceSharedObjects("\\ftps.verag.ag\FTP\OREGON\OUT\", "OREGON")) : IF_Obj.Add(New cVERAG_InterfaceSharedObjects("\\datenarchiv\Datenarchiv\DAKOSY\ECHTSYSTEM\FTP\OREGON\", "OREGON")) Case "17DE0000000071678", "05AT510000G000FP7" 'VERAG If cVERAG_Interface_Settings.acticeInterface_VERAG Then IF_Obj.Add(New cVERAG_InterfaceSharedObjects(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\FTP\VERAG\", "VERAG")) Case "16AT520000G000VA6" 'IMEX @@ -440,22 +508,47 @@ End Function + 'Shared Function isFTP_EKOL_NCTS_OLD() As Boolean + ' Try + ' If GLO_AVISO IsNot Nothing Then ' FRÄCHTER,AVISIERER + ' If GLO_AVISO.Frächter_KdNr > 0 Then + ' Select Case GLO_AVISO.Frächter_KdNr + ' Case 724284, 717845, 709869, 629246, 100041, 609759, 703729, 711217 'Zukunft: Kundenstamm--> NCTS_OUT_Partnersystem = "EKOL" + ' Return True + ' End Select + ' Select Case GLO_AVISO.Auftraggeber_KdNr + ' Case 724284, 717845, 709869, 629246, 100041, 609759, 703729, 711217 + ' Return True + ' End Select + ' End If + + ' If GLO_AVISO.Frächter.ToUpper.StartsWith("EKOL") Then Return True + ' If GLO_AVISO.Auftraggeber.ToUpper.StartsWith("EKOL") Then Return True + ' End If + + ' Catch ex As Exception + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine, System.Reflection.MethodInfo.GetCurrentMethod.Name) + ' End Try + ' Return False + 'End Function + + Shared Function isFTP_EKOL_NCTS() As Boolean Try - If GLO_AVISO IsNot Nothing Then ' FRÄCHTER,AVISIERER - If GLO_AVISO.Frächter_KdNr > 0 Then - Select Case GLO_AVISO.Frächter_KdNr + If GLO_SND IsNot Nothing Then ' FRÄCHTER,AVISIERER + If GLO_SND.tblSnd_FrachtfuehrerKdNr > 0 Then + Select Case GLO_SND.tblSnd_FrachtfuehrerKdNr Case 724284, 717845, 709869, 629246, 100041, 609759, 703729, 711217 'Zukunft: Kundenstamm--> NCTS_OUT_Partnersystem = "EKOL" Return True End Select - Select Case GLO_AVISO.Auftraggeber_KdNr + Select Case GLO_SND.tblSnd_AvisiererKdNr Case 724284, 717845, 709869, 629246, 100041, 609759, 703729, 711217 Return True End Select End If - If GLO_AVISO.Frächter.ToUpper.StartsWith("EKOL") Then Return True - If GLO_AVISO.Auftraggeber.ToUpper.StartsWith("EKOL") Then Return True + If If(GLO_SND.tblSnd_Frachtfuehrer, "").ToUpper.StartsWith("EKOL") Then Return True + If If(GLO_SND.tblSnd_Avisierer, "").ToUpper.StartsWith("EKOL") Then Return True End If Catch ex As Exception @@ -483,9 +576,9 @@ Shared Function isFTP_TEST_NCTS() As Boolean Try - If GLO_AVISO IsNot Nothing Then ' AndAlso GLO_AVISO.Frächter_KdNr > 0 Then ' FRÄCHTER,AVISIERER - If GLO_AVISO.Frächter.ToUpper.StartsWith("IBRAH") Then Return True - If GLO_AVISO.Auftraggeber.ToUpper.StartsWith("IBRAH") Then Return True + If GLO_SND IsNot Nothing Then ' AndAlso GLO_snd.Frächter_KdNr > 0 Then ' FRÄCHTER,AVISIERER + If GLO_SND.tblSnd_Frachtfuehrer.ToUpper.StartsWith("IBRAH") Then Return True + If GLO_SND.tblSnd_Avisierer.ToUpper.StartsWith("IBRAH") Then Return True End If Catch ex As Exception @@ -494,6 +587,21 @@ Return False End Function + + 'Shared Function isFTP_TEST_NCTS() As Boolean + ' Try + ' If GLO_AVISO IsNot Nothing Then ' AndAlso GLO_AVISO.Frächter_KdNr > 0 Then ' FRÄCHTER,AVISIERER + ' If GLO_AVISO.Frächter.ToUpper.StartsWith("IBRAH") Then Return True + ' If GLO_AVISO.Auftraggeber.ToUpper.StartsWith("IBRAH") Then Return True + ' End If + + ' Catch ex As Exception + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine, System.Reflection.MethodInfo.GetCurrentMethod.Name) + ' End Try + ' Return False + 'End Function + + Shared Function alreadyProvidedInInterface(ReferenzNumber As String, ProcedureCode As String, Status As String, vorsystem As String, ftp_CooName As String, Optional checkAlreadyProvided As Boolean = True) As Boolean If Not checkAlreadyProvided Then Return False ' wenn es nicht geprüft werden soll, dann wird "Nicht bereitgestellt" zurückgegeben Try @@ -777,9 +885,10 @@ VERAG_NCTS.NCTS_Data.Consignee.Adress.City = If(NCTS_TMP.ncts_Empfaenger_Ort, "") 'Frächter - If GLO_AVISO IsNot Nothing AndAlso GLO_AVISO.Frächter_KdNr > 0 Then - Dim AD = New VERAG_PROG_ALLGEMEIN.cAdressen(GLO_AVISO.Frächter_KdNr) - Dim KD = New VERAG_PROG_ALLGEMEIN.cKunde(GLO_AVISO.Frächter_KdNr) + Dim FRAECHTER_KDNR = getFraechterKdnr() + If FRAECHTER_KDNR > 0 Then + Dim AD = New VERAG_PROG_ALLGEMEIN.cAdressen(FRAECHTER_KDNR) + Dim KD = New VERAG_PROG_ALLGEMEIN.cKunde(FRAECHTER_KDNR) VERAG_NCTS.NCTS_Data.Carrier.Name = If(AD.Name_1, "") VERAG_NCTS.NCTS_Data.Carrier.EORI = If(KD.EORITIN, "") VERAG_NCTS.NCTS_Data.Carrier.EORI_NL = If(KD.EORITIN_NL, "") @@ -788,7 +897,7 @@ VERAG_NCTS.NCTS_Data.Carrier.Adress.Postcode = If(AD.PLZ, "") VERAG_NCTS.NCTS_Data.Carrier.Adress.Street = If(AD.Straße, "") VERAG_NCTS.NCTS_Data.Carrier.Adress.City = If(AD.Ort, "") - VERAG_NCTS.NCTS_Data.Carrier.CustomerCode = GLO_AVISO.Frächter_KdNr + VERAG_NCTS.NCTS_Data.Carrier.CustomerCode = FRAECHTER_KDNR Else VERAG_NCTS.NCTS_Data.Carrier.Name = If(NCTS_TMP.ncts_SumA_Befoerderer_Name, "") VERAG_NCTS.NCTS_Data.Carrier.EORI = If(NCTS_TMP.ncts_SumA_Befoerderer_EORI, "") @@ -800,6 +909,8 @@ VERAG_NCTS.NCTS_Data.Carrier.Adress.City = If(NCTS_TMP.ncts_SumA_Befoerderer_Ort, "") End If + + If NCTS_TMP.ncts_SICHERHEITSANGABEN IsNot Nothing AndAlso NCTS_TMP.ncts_SICHERHEITSANGABEN.Count > 0 Then VERAG_NCTS.NCTS_Data.Guarantee.GRN = If(NCTS_TMP.ncts_SICHERHEITSANGABEN(0).nctsSA_GRN, "") VERAG_NCTS.NCTS_Data.Guarantee.Amount = If(NCTS_TMP.ncts_SICHERHEITSANGABEN(0).nctsSA_AbgabenBetrag, "0") @@ -867,8 +978,112 @@ End Function + Shared Function getAuftraggeberKdnr() As Integer + If GLO_SND IsNot Nothing Then + If GLO_SND.tblSnd_AuftraggeberKdNr > 0 Then + Return GLO_SND.tblSnd_AuftraggeberKdNr + End If + End If - Shared Function genVERAG_OUT_NCTS_FromDAKOSY_V2_0_2(NCTS_TMP As DAKOSY_Worker.cDakosyNCTSOut, DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen, ByRef UniqueId As String) As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS_V2_0_2.VERAG_out_ncts + Return -1 + End Function + Shared Function getFraechterKdnr() As Integer + If GLO_SND IsNot Nothing Then + If GLO_SND.tblSnd_FrachtfuehrerKdNr > 0 Then + Return GLO_SND.tblSnd_FrachtfuehrerKdNr + End If + End If + If GLO_AVISO IsNot Nothing Then + If GLO_AVISO.Frächter_KdNr > 0 Then + Return GLO_AVISO.Frächter_KdNr + End If + End If + Return -1 + End Function + Shared Function getFraechterKdNrName() As String + If GLO_SND IsNot Nothing Then + If GLO_SND.tblSnd_FrachtfuehrerKdNr > 0 Then + Return "KDNR: " & GLO_SND.tblSnd_FrachtfuehrerKdNr & " NAME: " & GLO_SND.tblSnd_Frachtfuehrer + ElseIf GLO_SND.tblSnd_Frachtfuehrer <> "" Then + Return " NAME: " & GLO_SND.tblSnd_Frachtfuehrer + End If + End If + If GLO_AVISO IsNot Nothing Then + If GLO_AVISO.Frächter_KdNr > 0 Then + Return "KDNR: " & GLO_AVISO.Frächter_KdNr & " NAME: " & GLO_AVISO.Frächter + Else + Return " NAME: " & GLO_AVISO.Frächter + End If + End If + Return "" + End Function + + Shared Function getAvisiererKdNrName() As String + If GLO_SND IsNot Nothing Then + If GLO_SND.tblSnd_AvisiererKdNr > 0 Then + Return "KDNR: " & GLO_SND.tblSnd_AvisiererKdNr & " NAME: " & GLO_SND.tblSnd_Avisierer + ElseIf GLO_SND.tblSnd_Avisierer <> "" Then + Return " NAME: " & GLO_SND.tblSnd_Avisierer + End If + End If + If GLO_AVISO IsNot Nothing Then + If GLO_AVISO.Auftraggeber_KdNr > 0 Then + Return "KDNR: " & GLO_AVISO.Auftraggeber_KdNr & " NAME: " & GLO_AVISO.Auftraggeber + ElseIf GLO_AVISO.Auftraggeber <> "" Then + Return " NAME: " & GLO_AVISO.Auftraggeber_KdNr + End If + End If + Return "" + End Function + Shared Function getAuftraggeberKdNrName() As String + If GLO_SND IsNot Nothing Then + + If GLO_SND.tblSnd_AuftraggeberKdNr > 0 Then + Return "KDNR: " & GLO_SND.tblSnd_AuftraggeberKdNr & " NAME: " & GLO_SND.tblSnd_Auftraggeber + Else + Return " NAME: " & GLO_SND.tblSnd_Auftraggeber + End If + End If + Return "" + End Function + + Shared Function getTOBBKdnr() As Integer + Dim KdNr = -1 + If KdNr < 0 Then KdNr = getTOBBKdnrFromKdNr(getAuftraggeberKdnr()) + If KdNr < 0 Then KdNr = getTOBBKdnrFromKdNr(getFraechterKdnr()) + If KdNr < 0 Then KdNr = getTOBBKdnrFromKdNr(getAvisiererKdnr()) + Return KdNr + End Function + + Shared Function getTOBBKdnrFromKdNr(KdNr) As Integer + If KdNr > 0 Then + Dim KD_ERW As New VERAG_PROG_ALLGEMEIN.cKundenErweitert(KdNr) + Return If(KD_ERW.kde_TOBB_KundenNr, -1) + End If + Return -1 + End Function + Shared Function getTOBBDetails() As String + + getTOBBDetails = vbNewLine & "Auftraggeber: " & getAuftraggeberKdNrName() & vbNewLine & "Frächter: " & getFraechterKdNrName() & vbNewLine & "Avisierer: " & getAvisiererKdNrName() + getTOBBDetails &= vbNewLine & "AVISO: " & If(GLO_AVISO Is Nothing, "keine Zuweisung ", GLO_AVISO.AvisoID) + getTOBBDetails &= vbNewLine & "SENDUNG: " & If(GLO_SND Is Nothing, "keine Zuweisung ", GLO_SND.tblSnd_SendungID) + + End Function + Shared Function getAvisiererKdnr() As Integer + If GLO_SND IsNot Nothing Then + If GLO_SND.tblSnd_AvisiererKdNr > 0 Then + Return GLO_SND.tblSnd_AvisiererKdNr + End If + End If + If GLO_AVISO IsNot Nothing Then + If GLO_AVISO.Auftraggeber_KdNr > 0 Then + Return GLO_AVISO.Auftraggeber_KdNr + End If + End If + Return -1 + End Function + + Shared Function genVERAG_OUT_NCTS_FromDAKOSY_V2_0_2(NCTS_TMP As DAKOSY_Worker.cDakosyNCTSOut, DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen, ByRef UniqueId As String, Optional ClientReference As String = "") As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS_V2_0_2.VERAG_out_ncts Dim VERAG_NCTS As New VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS_V2_0_2.VERAG_out_ncts Try If DY_TMP Is Nothing Then Return Nothing @@ -883,6 +1098,9 @@ Else VERAG_NCTS.Company = "VERAG" End If + + ' If VERAG_NCTS.Company = "UNISPED" Then Return Nothing ' ---> KEIN UNISPED, erst klären!!!!!!! + VERAG_NCTS.Department = NCTS_TMP.ncts_niederlassung 'VERAG_NCTS.InternalReference.OfficeCode = If( @@ -931,9 +1149,10 @@ VERAG_NCTS.NCTS_Data.Consignee.Adress.City = If(NCTS_TMP.ncts_Empfaenger_Ort, "") 'Frächter - If GLO_AVISO IsNot Nothing AndAlso GLO_AVISO.Frächter_KdNr > 0 Then - Dim AD = New VERAG_PROG_ALLGEMEIN.cAdressen(GLO_AVISO.Frächter_KdNr) - Dim KD = New VERAG_PROG_ALLGEMEIN.cKunde(GLO_AVISO.Frächter_KdNr) + Dim FRAECHTER_KDNR = getFraechterKdnr() + If FRAECHTER_KDNR > 0 Then + Dim AD = New VERAG_PROG_ALLGEMEIN.cAdressen(FRAECHTER_KDNR) + Dim KD = New VERAG_PROG_ALLGEMEIN.cKunde(FRAECHTER_KDNR) VERAG_NCTS.NCTS_Data.Carrier.Name = If(AD.Name_1, "") VERAG_NCTS.NCTS_Data.Carrier.EORI = If(KD.EORITIN, "") VERAG_NCTS.NCTS_Data.Carrier.EORI_NL = If(KD.EORITIN_NL, "") @@ -942,7 +1161,7 @@ VERAG_NCTS.NCTS_Data.Carrier.Adress.Postcode = If(AD.PLZ, "") VERAG_NCTS.NCTS_Data.Carrier.Adress.Street = If(AD.Straße, "") VERAG_NCTS.NCTS_Data.Carrier.Adress.City = If(AD.Ort, "") - VERAG_NCTS.NCTS_Data.Carrier.CustomerCode = GLO_AVISO.Frächter_KdNr + VERAG_NCTS.NCTS_Data.Carrier.CustomerCode = FRAECHTER_KDNR Else VERAG_NCTS.NCTS_Data.Carrier.Name = If(NCTS_TMP.ncts_SumA_Befoerderer_Name, "") @@ -955,11 +1174,17 @@ VERAG_NCTS.NCTS_Data.Carrier.Adress.City = If(NCTS_TMP.ncts_SumA_Befoerderer_Ort, "") End If - If GLO_AVISO IsNot Nothing Then - If GLO_AVISO.KdAuftragsNr_Avisierer IsNot Nothing Then VERAG_NCTS.ClientReference = GLO_AVISO.KdAuftragsNr_Avisierer + If ClientReference <> "" Then + VERAG_NCTS.ClientReference = ClientReference + Else + Dim AVISIERER_KDNR = getAvisiererKdnr() + If AVISIERER_KDNR > 0 Then + VERAG_NCTS.ClientReference = AVISIERER_KDNR + Else + VERAG_NCTS.ClientReference = "" + End If End If - If NCTS_TMP.ncts_SICHERHEITSANGABEN IsNot Nothing AndAlso NCTS_TMP.ncts_SICHERHEITSANGABEN.Count > 0 Then VERAG_NCTS.NCTS_Data.Guarantee.GRN = If(NCTS_TMP.ncts_SICHERHEITSANGABEN(0).nctsSA_GRN, "") VERAG_NCTS.NCTS_Data.Guarantee.Amount = If(NCTS_TMP.ncts_SICHERHEITSANGABEN(0).nctsSA_AbgabenBetrag, "0") @@ -1384,9 +1609,10 @@ 'Frächter - If GLO_AVISO IsNot Nothing AndAlso GLO_AVISO.Frächter_KdNr > 0 Then - Dim AD = New VERAG_PROG_ALLGEMEIN.cAdressen(GLO_AVISO.Frächter_KdNr) - Dim KD = New VERAG_PROG_ALLGEMEIN.cKunde(GLO_AVISO.Frächter_KdNr) + Dim FRAECHTER_KDNR = getFraechterKdnr() + If FRAECHTER_KDNR > 0 Then + Dim AD = New VERAG_PROG_ALLGEMEIN.cAdressen(FRAECHTER_KDNR) + Dim KD = New VERAG_PROG_ALLGEMEIN.cKunde(FRAECHTER_KDNR) VERAG_NCTS.NCTS_Data.Carrier.Name = If(AD.Name_1, "") VERAG_NCTS.NCTS_Data.Carrier.EORI = If(KD.EORITIN, "") VERAG_NCTS.NCTS_Data.Carrier.EORI_NL = If(KD.EORITIN_NL, "") @@ -1395,7 +1621,7 @@ VERAG_NCTS.NCTS_Data.Carrier.Adress.Postcode = If(AD.PLZ, "") VERAG_NCTS.NCTS_Data.Carrier.Adress.Street = If(AD.Straße, "") VERAG_NCTS.NCTS_Data.Carrier.Adress.City = If(AD.Ort, "") - VERAG_NCTS.NCTS_Data.Carrier.CustomerCode = GLO_AVISO.Frächter_KdNr + VERAG_NCTS.NCTS_Data.Carrier.CustomerCode = FRAECHTER_KDNR Else Dim DTzsAnmCarrier As DataTable = SQL.loadDgvBySql("SELECT * FROM [zsAnmCarrTra] WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ")", "EZOLL") If DTzsAnmCarrier.Rows().Count > 0 Then @@ -1410,6 +1636,8 @@ End If End If + + ' Tabelle zsAnmGrteeGrteeRef lesen. Dim DTzsAnmGrteeGrteeRef As DataTable = SQL.loadDgvBySql("SELECT GRN, GVal" & " FROM zsAnmGrteeGrteeRef" & @@ -1464,7 +1692,7 @@ End Function - Shared Function genVERAG_OUT_NCTS_FromEZOLLByAnmId_V2_0_2(AnmID As String, ByRef UniqueId As String) As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS_V2_0_2.VERAG_out_ncts + Shared Function genVERAG_OUT_NCTS_FromEZOLLByAnmId_V2_0_2(AnmID As String, ByRef UniqueId As String, Optional ClientReference As String = "") As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS_V2_0_2.VERAG_out_ncts Dim VERAG_NCTS As New VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS_V2_0_2.VERAG_out_ncts Dim LRN = "" Try @@ -1600,11 +1828,12 @@ 'VERAG_NCTS.NCTS_Data.Consignee.UID_Nr = If(NCTS_TMP.ncts_Empfaenger_NLNR, "") End If - 'Frächter - If GLO_AVISO IsNot Nothing AndAlso GLO_AVISO.Frächter_KdNr > 0 Then - Dim AD = New VERAG_PROG_ALLGEMEIN.cAdressen(GLO_AVISO.Frächter_KdNr) - Dim KD = New VERAG_PROG_ALLGEMEIN.cKunde(GLO_AVISO.Frächter_KdNr) + Dim FRAECHTER_KDNR = getFraechterKdnr() + If FRAECHTER_KDNR > 0 Then + Dim AD = New VERAG_PROG_ALLGEMEIN.cAdressen(FRAECHTER_KDNR) + Dim KD = New VERAG_PROG_ALLGEMEIN.cKunde(FRAECHTER_KDNR) + VERAG_NCTS.NCTS_Data.Carrier.Name = If(AD.Name_1, "") VERAG_NCTS.NCTS_Data.Carrier.EORI = If(KD.EORITIN, "") VERAG_NCTS.NCTS_Data.Carrier.EORI_NL = If(KD.EORITIN_NL, "") @@ -1613,7 +1842,7 @@ VERAG_NCTS.NCTS_Data.Carrier.Adress.Postcode = If(AD.PLZ, "") VERAG_NCTS.NCTS_Data.Carrier.Adress.Street = If(AD.Straße, "") VERAG_NCTS.NCTS_Data.Carrier.Adress.City = If(AD.Ort, "") - VERAG_NCTS.NCTS_Data.Carrier.CustomerCode = GLO_AVISO.Frächter_KdNr + VERAG_NCTS.NCTS_Data.Carrier.CustomerCode = FRAECHTER_KDNR Else Dim DTzsAnmCarrier As DataTable = SQL.loadDgvBySql("SELECT * FROM [zsAnmCarrTra] WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ")", "EZOLL") If DTzsAnmCarrier.Rows().Count > 0 Then @@ -1628,10 +1857,21 @@ End If End If - If GLO_AVISO IsNot Nothing Then - If GLO_AVISO.KdAuftragsNr_Avisierer IsNot Nothing Then VERAG_NCTS.ClientReference = GLO_AVISO.KdAuftragsNr_Avisierer + If ClientReference <> "" Then + VERAG_NCTS.ClientReference = ClientReference + Else + Dim AVISIERER_KDNR = getAvisiererKdnr() + If AVISIERER_KDNR > 0 Then + VERAG_NCTS.ClientReference = AVISIERER_KDNR + Else + VERAG_NCTS.ClientReference = "" + End If End If + + + + ' Tabelle zsAnmGrteeGrteeRef lesen. Dim DTzsAnmGrteeGrteeRef As DataTable = SQL.loadDgvBySql("SELECT GRN, GVal" & " FROM zsAnmGrteeGrteeRef" & @@ -1760,10 +2000,12 @@ VERAG_NCTS.NCTS_Data.Consignee.Adress.Street = If(NCTS_TMP.ConeeTra_Strt, "") VERAG_NCTS.NCTS_Data.Consignee.Adress.City = If(NCTS_TMP.ConeeTra_Cty, "") + ''Frächter - If GLO_AVISO IsNot Nothing AndAlso GLO_AVISO.Frächter_KdNr > 0 Then - Dim AD = New VERAG_PROG_ALLGEMEIN.cAdressen(GLO_AVISO.Frächter_KdNr) - Dim KD = New VERAG_PROG_ALLGEMEIN.cKunde(GLO_AVISO.Frächter_KdNr) + Dim FRAECHTER_KDNR = getFraechterKdnr() + If FRAECHTER_KDNR > 0 Then + Dim AD = New VERAG_PROG_ALLGEMEIN.cAdressen(FRAECHTER_KDNR) + Dim KD = New VERAG_PROG_ALLGEMEIN.cKunde(FRAECHTER_KDNR) VERAG_NCTS.NCTS_Data.Carrier.Name = If(AD.Name_1, "") VERAG_NCTS.NCTS_Data.Carrier.EORI = If(KD.EORITIN, "") VERAG_NCTS.NCTS_Data.Carrier.EORI_NL = If(KD.EORITIN_NL, "") @@ -1772,7 +2014,7 @@ VERAG_NCTS.NCTS_Data.Carrier.Adress.Postcode = If(AD.PLZ, "") VERAG_NCTS.NCTS_Data.Carrier.Adress.Street = If(AD.Straße, "") VERAG_NCTS.NCTS_Data.Carrier.Adress.City = If(AD.Ort, "") - VERAG_NCTS.NCTS_Data.Carrier.CustomerCode = GLO_AVISO.Frächter_KdNr + VERAG_NCTS.NCTS_Data.Carrier.CustomerCode = FRAECHTER_KDNR Else 'VERAG_NCTS.NCTS_Data.Carrier.Name = If(NCTS_TMP.ConorTra_Na, "") @@ -1783,8 +2025,10 @@ 'VERAG_NCTS.NCTS_Data.Carrier.Adress.Postcode = If(NCTS_TMP.ConorTra_Pst, "") 'VERAG_NCTS.NCTS_Data.Carrier.Adress.Street = If(NCTS_TMP.ConorTra_Strt, "") 'VERAG_NCTS.NCTS_Data.Carrier.Adress.City = If(NCTS_TMP.ConorTra_Cty, "") + End If + If NCTS_TMP.SICHERHEIT IsNot Nothing AndAlso NCTS_TMP.SICHERHEIT.Count > 0 Then VERAG_NCTS.NCTS_Data.Guarantee.GRN = If(NCTS_TMP.SICHERHEIT(0).GRN, "") VERAG_NCTS.NCTS_Data.Guarantee.Amount = If(NCTS_TMP.SICHERHEIT(0).GVal, "0") @@ -1834,7 +2078,7 @@ End Function - Shared Function genVERAG_OUT_NCTS_FromTELOTEC_V2_0_2(NCTS_TMP As TELOTEC_Worker.cTelotec_Anmeldung, ByRef UniqueId As String) As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS_V2_0_2.VERAG_out_ncts + Shared Function genVERAG_OUT_NCTS_FromTELOTEC_V2_0_2(NCTS_TMP As TELOTEC_Worker.cTelotec_Anmeldung, ByRef UniqueId As String, Optional ClientReference As String = "") As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS_V2_0_2.VERAG_out_ncts Dim VERAG_NCTS As New VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS_V2_0_2.VERAG_out_ncts Try If NCTS_TMP Is Nothing Then Return Nothing @@ -1898,10 +2142,12 @@ VERAG_NCTS.NCTS_Data.Consignee.Adress.Street = If(NCTS_TMP.ConeeTra_Strt, "") VERAG_NCTS.NCTS_Data.Consignee.Adress.City = If(NCTS_TMP.ConeeTra_Cty, "") + ''Frächter - If GLO_AVISO IsNot Nothing AndAlso GLO_AVISO.Frächter_KdNr > 0 Then - Dim AD = New VERAG_PROG_ALLGEMEIN.cAdressen(GLO_AVISO.Frächter_KdNr) - Dim KD = New VERAG_PROG_ALLGEMEIN.cKunde(GLO_AVISO.Frächter_KdNr) + Dim FRAECHTER_KDNR = getFraechterKdnr() + If FRAECHTER_KDNR > 0 Then + Dim AD = New VERAG_PROG_ALLGEMEIN.cAdressen(FRAECHTER_KDNR) + Dim KD = New VERAG_PROG_ALLGEMEIN.cKunde(FRAECHTER_KDNR) VERAG_NCTS.NCTS_Data.Carrier.Name = If(AD.Name_1, "") VERAG_NCTS.NCTS_Data.Carrier.EORI = If(KD.EORITIN, "") VERAG_NCTS.NCTS_Data.Carrier.EORI_NL = If(KD.EORITIN_NL, "") @@ -1910,7 +2156,7 @@ VERAG_NCTS.NCTS_Data.Carrier.Adress.Postcode = If(AD.PLZ, "") VERAG_NCTS.NCTS_Data.Carrier.Adress.Street = If(AD.Straße, "") VERAG_NCTS.NCTS_Data.Carrier.Adress.City = If(AD.Ort, "") - VERAG_NCTS.NCTS_Data.Carrier.CustomerCode = GLO_AVISO.Frächter_KdNr + VERAG_NCTS.NCTS_Data.Carrier.CustomerCode = FRAECHTER_KDNR Else 'VERAG_NCTS.NCTS_Data.Carrier.Name = If(NCTS_TMP.ConorTra_Na, "") @@ -1923,10 +2169,21 @@ 'VERAG_NCTS.NCTS_Data.Carrier.Adress.City = If(NCTS_TMP.ConorTra_Cty, "") End If - If GLO_AVISO IsNot Nothing Then - If GLO_AVISO.KdAuftragsNr_Avisierer IsNot Nothing Then VERAG_NCTS.ClientReference = GLO_AVISO.KdAuftragsNr_Avisierer + If ClientReference <> "" Then + VERAG_NCTS.ClientReference = ClientReference + Else + Dim AVISIERER_KDNR = getAvisiererKdnr() + If AVISIERER_KDNR > 0 Then + VERAG_NCTS.ClientReference = AVISIERER_KDNR + Else + VERAG_NCTS.ClientReference = "" + End If End If + + + + If NCTS_TMP.SICHERHEIT IsNot Nothing AndAlso NCTS_TMP.SICHERHEIT.Count > 0 Then VERAG_NCTS.NCTS_Data.Guarantee.GRN = If(NCTS_TMP.SICHERHEIT(0).GRN, "") VERAG_NCTS.NCTS_Data.Guarantee.Amount = If(NCTS_TMP.SICHERHEIT(0).GVal, "0") diff --git a/initATLASAufschubkonten/cMAVIWorker.vb b/initATLASAufschubkonten/cMAVIWorker.vb index f119ce0..2514170 100644 --- a/initATLASAufschubkonten/cMAVIWorker.vb +++ b/initATLASAufschubkonten/cMAVIWorker.vb @@ -42,10 +42,12 @@ Public Class cMAVIWorker NCTS.ncts_Partnersystem = "MAVI" - If doc.GetElementsByTagName("GuaRefNumGRNREF1").Count > 0 AndAlso doc.GetElementsByTagName("AmoConREF7").Count > 0 Then + If doc.GetElementsByTagName("GuaRefNumGRNREF1").Count > 0 Then ' AndAlso doc.GetElementsByTagName("AmoConREF7").Count > 0 Then Dim BRG As New VERAG_PROG_ALLGEMEIN.cNCTS_TR_Sicherheitsangaben BRG.nctsSA_GRN = doc.GetElementsByTagName("GuaRefNumGRNREF1")(0).InnerText - Dim Betrag = doc.GetElementsByTagName("AmoConREF7")(0).InnerText + Dim Betrag = 0.0 + If doc.GetElementsByTagName("AmoConREF7").Count > 0 Then Betrag = doc.GetElementsByTagName("AmoConREF7")(0).InnerText + If IsNumeric(Betrag) Then BRG.nctsSA_AbgabenBetrag = CDbl(Betrag) End If diff --git a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb index b9f7d43..680693c 100644 --- a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb @@ -206,331 +206,333 @@ Public Class frmDYNachrichtenVerarbeitung Dim statusTMP As DAKOSY_Worker.cDakosy_Statusmeldungen = Nothing Dim fi As FileInfo = New FileInfo(d) + If Not fi.Name.StartsWith(".") Then + + ' EDIFACT + ' If fi.Extension = ".edi" Then + Dim alreadyMoved = False + If fi.Extension = ".nlc" Then ' Or fi.Name.StartsWith("ZA") Then + If Not IO.Directory.Exists(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\nlc\") Then IO.Directory.CreateDirectory(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\nlc\") + frmStartOptions.moveFile(d, VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\nlc\") + alreadyMoved = True + addDGVEinarbeitung("** NLC-Datei **", fi.Name) + ElseIf fi.Extension = ".edi" Then ' Or fi.Name.StartsWith("ZA") Then + Dim s As String = File.ReadAllText(d, System.Text.UTF8Encoding.Default) + If s.Contains("'") Then + Dim lines = s.Split("'") + For i = 0 To lines.Count - 1 + lines(i) = lines(i).Replace("?+", "|plus|").Replace("?:", "|dppkt|").Replace("?.", "|pkt|") ' Da '+' ein Splitter ist, wird ein '+' als Text wie folgt dargestellt: '?+', --> Ersezten + Next + + 'NCTS: Versandanmeldung + If Not found AndAlso cGetMsgType.isNCTS_Versandanmeldung(lines) Then + Dim bezugsNr = cWorker_NCTS.readNCTS_Versandanmeldung(Me, lines) + If bezugsNr <> "" Then addDGVEinarbeitung("NCTS: Versandanmeldung", bezugsNr) : found = True + End If + + 'EZA: FreierVerkehrAktVeredelUmwandlung + If Not found AndAlso cGetMsgType.isEZA_FreierVerkehrAktVeredelUmwandlung(lines) Then + Dim bezugsNr = readEZA_FreierVerkehrAktVeredelUmwandlung(lines) + If bezugsNr <> "" Then + addDGVEinarbeitung("EZA: FreierVerkehr", bezugsNr) : found = True + found = True + End If + End If + + 'NCTS: Ankunftsanzeige + If Not found AndAlso cGetMsgType.isNCTS_Ankunftsanzeige(lines) Then + Dim bezugsNr = cWorker_NCTS.readNCTS_Ankunftsanzeige(Me, lines) + If bezugsNr <> "" Then addDGVEinarbeitung("NCTS: Ankunftsanzeige", bezugsNr) : found = True + End If - ' EDIFACT - ' If fi.Extension = ".edi" Then - Dim alreadyMoved = False - If fi.Extension = ".nlc" Then ' Or fi.Name.StartsWith("ZA") Then - If Not IO.Directory.Exists(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\nlc\") Then IO.Directory.CreateDirectory(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\nlc\") - frmStartOptions.moveFile(d, VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\nlc\") - alreadyMoved = True - addDGVEinarbeitung("** NLC-Datei **", fi.Name) - ElseIf fi.Extension = ".edi" Then ' Or fi.Name.StartsWith("ZA") Then - Dim s As String = File.ReadAllText(d, System.Text.UTF8Encoding.Default) - If s.Contains("'") Then - Dim lines = s.Split("'") - For i = 0 To lines.Count - 1 - lines(i) = lines(i).Replace("?+", "|plus|").Replace("?:", "|dppkt|").Replace("?.", "|pkt|") ' Da '+' ein Splitter ist, wird ein '+' als Text wie folgt dargestellt: '?+', --> Ersezten - Next - 'NCTS: Versandanmeldung - If Not found AndAlso cGetMsgType.isNCTS_Versandanmeldung(lines) Then - Dim bezugsNr = cWorker_NCTS.readNCTS_Versandanmeldung(Me, lines) - If bezugsNr <> "" Then addDGVEinarbeitung("NCTS: Versandanmeldung", bezugsNr) : found = True End If - 'EZA: FreierVerkehrAktVeredelUmwandlung - If Not found AndAlso cGetMsgType.isEZA_FreierVerkehrAktVeredelUmwandlung(lines) Then - Dim bezugsNr = readEZA_FreierVerkehrAktVeredelUmwandlung(lines) + 'XML + ElseIf fi.Extension = ".xml" Then + Dim xmlWriterSettings As XmlWriterSettings = New XmlWriterSettings With {.Encoding = System.Text.Encoding.UTF8, .CheckCharacters = True} + + Dim doc As New XmlDocument() + + + Dim XML_Code = System.IO.File.ReadAllText(d, System.Text.UTF8Encoding.Default) + + doc.LoadXml(SanitizeXmlString(XML_Code)) + + Dim VERSION As String = "" + + + '------------------------------------------------------------------------------------------------------------------------------ + ' ATLAS + '------------------------------------------------------------------------------------------------------------------------------ + + + '------------------------------------------ + '------------------ NCTS ------------------ + '------------------------------------------ + + 'NCTS: Versandanmeldung + If Not found AndAlso cGetMsgType.isNCTS_VersandanmeldungXML(doc) Then + If cWorker_NCTS.readNCTS_VersandanmeldungXML(Me, doc, statusTMP) <> "" Then found = True + End If + + 'NCTS: Ankunftsanzeige + If Not found AndAlso cGetMsgType.isNCTS_AnkunftsanzeigeXML(doc) Then + If cWorker_NCTS.readNCTS_AnkunftsanzeigeXML(doc) <> "" Then found = True + End If + + 'NCTS: Versandbestätigung + If Not found And cGetMsgType.isNCTS_Versandbestaetigung(doc) Then + If cWorker_NCTS.readNCTS_Versandbestaetigung(Me, d) <> "" Then found = True + ' If bezugsNr <> "" Then addDGVEinarbeitung("NCTS: Versandbestätigung", bezugsNr) : found = True + End If + + 'NCTS: Ueberlassungsmeldung + If Not found And cGetMsgType.isNCTS_Ueberlassungsmeldung(doc, VERSION) Then + Select Case VERSION + Case "007" : If cWorker_NCTS.readNCTS_Ueberlassungsmeldung007(Me, d, statusTMP) <> "" Then found = True ': MsgBox("005!") + Case "006" : If cWorker_NCTS.readNCTS_Ueberlassungsmeldung006(Me, d, statusTMP) <> "" Then found = True ': MsgBox("005!") + Case "005" : If cWorker_NCTS.readNCTS_Ueberlassungsmeldung005(Me, d, statusTMP) <> "" Then found = True ': MsgBox("005!") + Case Else : If cWorker_NCTS.readNCTS_Ueberlassungsmeldung(Me, d, statusTMP) <> "" Then found = True + End Select + End If + + 'NCTS: AnrechnungReferenzbetraege + If Not found And cGetMsgType.isNCTS_AnrechnungReferenzbetraege(doc) Then + If cWorker_NCTS.readNCTS_AnrechnungReferenzbetraege(Me, d) <> "" Then found = True + End If + + 'NCTS: Erledigungsmeldung + If Not found And cGetMsgType.isNCTS_Erledigungsmeldung(doc) Then + If cWorker_NCTS.readNCTS_Erledigungsmeldung(Me, d) <> "" Then found = True + End If + + 'NCTS: StatusmeldungNCTSDE + If Not found And cGetMsgType.isNCTS_StatusmeldungNCTSDE(doc) Then + If cWorker_NCTS.readNCTS_StatusmeldungNCTSDE(Me, d) <> "" Then found = True + End If + + 'NCTS: UngueltigkeitSicherheitenNCTSDE + If Not found And cGetMsgType.isNCTS_UngueltigkeitSicherheitenNCTSDE(doc, VERSION) Then + Select Case VERSION + Case "003" : If cWorker_NCTS.readNCTS_UngueltigkeitSicherheitenNCTSDE003(Me, d) <> "" Then found = True ': MsgBox("005!") + Case Else : If cWorker_NCTS.readNCTS_UngueltigkeitSicherheitenNCTSDE(Me, d) <> "" Then found = True + End Select + End If + + + + + '------------------------------------------ + '------------------ EZA ------------------ + '------------------------------------------ + + + 'EZA: FreierVerkehrAktVeredelUmwandlung NEU XML + If Not found AndAlso cGetMsgType.isEZA_FreierVerkehrAktVeredelUmwandlungXML(doc) Then + Dim bezugsNr = readEZA_FreierVerkehrAktVeredelUmwandlungXML(doc) + If bezugsNr <> "" Then + found = True + End If + End If + 'EZA: FreierVerkehrAktVeredelUmwandlung NEU XML + If Not found AndAlso cGetMsgType.isEZA_FreierVerkehrAktVeredelUmwandlungXML_FCFCDD(doc) Then + Dim bezugsNr = readEZA_FreierVerkehrAktVeredelUmwandlungXML_FCFCDD(doc) If bezugsNr <> "" Then - addDGVEinarbeitung("EZA: FreierVerkehr", bezugsNr) : found = True found = True End If End If - 'NCTS: Ankunftsanzeige - If Not found AndAlso cGetMsgType.isNCTS_Ankunftsanzeige(lines) Then - Dim bezugsNr = cWorker_NCTS.readNCTS_Ankunftsanzeige(Me, lines) - If bezugsNr <> "" Then addDGVEinarbeitung("NCTS: Ankunftsanzeige", bezugsNr) : found = True + 'EZA: EntscheidungAnmeldung + If Not found And cGetMsgType.isEZA_EntscheidungAnmeldung(doc) Then + If readEZA_EntscheidungAnmeldung(d) <> "" Then found = True + End If + + 'EZA: SumAErledigungsinformationVorpapier + If Not found And cGetMsgType.isEZA_SumAErledigungsinformationVorpapier(doc) Then + If readEZA_SumAErledigungsinformationVorpapier(d) <> "" Then found = True + End If + + 'EZA: Abgabenbescheid + If Not found And cGetMsgType.isEZA_Abgabenbescheid(doc, VERSION) Then + Select Case VERSION + Case "009" : If readEZA_Abgabenbescheid009(d, statusTMP) <> "" Then found = True + Case "008" : If readEZA_Abgabenbescheid008(d) <> "" Then found = True + Case Else : If readEZA_Abgabenbescheid(d) <> "" Then found = True + End Select End If - End If + 'EZA: NichtAbschliessendeFestsetzung + If Not found And cGetMsgType.isEZA_NichtAbschliessendeFestsetzung(doc, VERSION) Then + Select Case VERSION + Case "003" : If readEZA_NichtAbschliessendeFestsetzung003(d) <> "" Then found = True + Case Else : If readEZA_NichtAbschliessendeFestsetzung(d) <> "" Then found = True + End Select + End If - 'XML - ElseIf fi.Extension = ".xml" Then - Dim xmlWriterSettings As XmlWriterSettings = New XmlWriterSettings With {.Encoding = System.Text.Encoding.UTF8, .CheckCharacters = True} + 'EZA: AbschliessendeFestsetzung + If Not found And cGetMsgType.isEZA_AbschliessendeFestsetzung(doc, VERSION) Then + Select Case VERSION + Case "004" : If readEZA_AbschliessendeFestsetzung004(d) <> "" Then found = True + Case Else : If readEZA_AbschliessendeFestsetzung(d) <> "" Then found = True + End Select - Dim doc As New XmlDocument() + End If + + 'EZA: StornierungBescheid + If Not found And cGetMsgType.isEZA_StornierungBescheid(doc) Then + If readEZA_StornierungBescheid(d) <> "" Then found = True + End If + + 'EZA: BefundVereinfachteZollanmeldung + If Not found And cGetMsgType.isEZA_BefundVereinfachteZollanmeldung(doc, VERSION) Then + Select Case VERSION + Case "006" : found = True : addDGVEinarbeitung("*EZA: BefundVereinfachteZollanmeldung", "-") + Case "007" : found = True : addDGVEinarbeitung("*EZA: BefundVereinfachteZollanmeldung", "-") + Case Else : found = True : addDGVEinarbeitung("*EZA: BefundVereinfachteZollanmeldung", "-") + End Select - Dim XML_Code = System.IO.File.ReadAllText(d, System.Text.UTF8Encoding.Default) + End If - doc.LoadXml(SanitizeXmlString(XML_Code)) + 'EZA: MitteilungAbschreibung + If Not found And cGetMsgType.isEZA_MitteilungAbschreibung(doc) Then + found = True : addDGVEinarbeitung("*EZA: MitteilungAbschreibung", "-") + End If - Dim VERSION As String = "" - - - '------------------------------------------------------------------------------------------------------------------------------ - ' ATLAS - '------------------------------------------------------------------------------------------------------------------------------ - - - '------------------------------------------ - '------------------ NCTS ------------------ - '------------------------------------------ - - 'NCTS: Versandanmeldung - If Not found AndAlso cGetMsgType.isNCTS_VersandanmeldungXML(doc) Then - If cWorker_NCTS.readNCTS_VersandanmeldungXML(Me, doc, statusTMP) <> "" Then found = True - End If - - 'NCTS: Ankunftsanzeige - If Not found AndAlso cGetMsgType.isNCTS_AnkunftsanzeigeXML(doc) Then - If cWorker_NCTS.readNCTS_AnkunftsanzeigeXML(doc) <> "" Then found = True - End If - - 'NCTS: Versandbestätigung - If Not found And cGetMsgType.isNCTS_Versandbestaetigung(doc) Then - If cWorker_NCTS.readNCTS_Versandbestaetigung(Me, d) <> "" Then found = True - ' If bezugsNr <> "" Then addDGVEinarbeitung("NCTS: Versandbestätigung", bezugsNr) : found = True - End If - - 'NCTS: Ueberlassungsmeldung - If Not found And cGetMsgType.isNCTS_Ueberlassungsmeldung(doc, VERSION) Then - Select Case VERSION - Case "007" : If cWorker_NCTS.readNCTS_Ueberlassungsmeldung007(Me, d, statusTMP) <> "" Then found = True ': MsgBox("005!") - Case "006" : If cWorker_NCTS.readNCTS_Ueberlassungsmeldung006(Me, d, statusTMP) <> "" Then found = True ': MsgBox("005!") - Case "005" : If cWorker_NCTS.readNCTS_Ueberlassungsmeldung005(Me, d, statusTMP) <> "" Then found = True ': MsgBox("005!") - Case Else : If cWorker_NCTS.readNCTS_Ueberlassungsmeldung(Me, d, statusTMP) <> "" Then found = True - End Select - End If - - 'NCTS: AnrechnungReferenzbetraege - If Not found And cGetMsgType.isNCTS_AnrechnungReferenzbetraege(doc) Then - If cWorker_NCTS.readNCTS_AnrechnungReferenzbetraege(Me, d) <> "" Then found = True - End If - - 'NCTS: Erledigungsmeldung - If Not found And cGetMsgType.isNCTS_Erledigungsmeldung(doc) Then - If cWorker_NCTS.readNCTS_Erledigungsmeldung(Me, d) <> "" Then found = True - End If - - 'NCTS: StatusmeldungNCTSDE - If Not found And cGetMsgType.isNCTS_StatusmeldungNCTSDE(doc) Then - If cWorker_NCTS.readNCTS_StatusmeldungNCTSDE(Me, d) <> "" Then found = True - End If - - 'NCTS: UngueltigkeitSicherheitenNCTSDE - If Not found And cGetMsgType.isNCTS_UngueltigkeitSicherheitenNCTSDE(doc, VERSION) Then - Select Case VERSION - Case "003" : If cWorker_NCTS.readNCTS_UngueltigkeitSicherheitenNCTSDE003(Me, d) <> "" Then found = True ': MsgBox("005!") - Case Else : If cWorker_NCTS.readNCTS_UngueltigkeitSicherheitenNCTSDE(Me, d) <> "" Then found = True - End Select - End If - - - - - '------------------------------------------ - '------------------ EZA ------------------ - '------------------------------------------ - - - 'EZA: FreierVerkehrAktVeredelUmwandlung NEU XML - If Not found AndAlso cGetMsgType.isEZA_FreierVerkehrAktVeredelUmwandlungXML(doc) Then - Dim bezugsNr = readEZA_FreierVerkehrAktVeredelUmwandlungXML(doc) - If bezugsNr <> "" Then + 'EZA: WeitergabeHauptzollamt + If Not found And cGetMsgType.isEZA_WeitergabeHauptzollamt(doc) Then found = True - End If - End If - 'EZA: FreierVerkehrAktVeredelUmwandlung NEU XML - If Not found AndAlso cGetMsgType.isEZA_FreierVerkehrAktVeredelUmwandlungXML_FCFCDD(doc) Then - Dim bezugsNr = readEZA_FreierVerkehrAktVeredelUmwandlungXML_FCFCDD(doc) - If bezugsNr <> "" Then - found = True - End If - End If - - 'EZA: EntscheidungAnmeldung - If Not found And cGetMsgType.isEZA_EntscheidungAnmeldung(doc) Then - If readEZA_EntscheidungAnmeldung(d) <> "" Then found = True - End If - - 'EZA: SumAErledigungsinformationVorpapier - If Not found And cGetMsgType.isEZA_SumAErledigungsinformationVorpapier(doc) Then - If readEZA_SumAErledigungsinformationVorpapier(d) <> "" Then found = True - End If - - 'EZA: Abgabenbescheid - If Not found And cGetMsgType.isEZA_Abgabenbescheid(doc, VERSION) Then - Select Case VERSION - Case "009" : If readEZA_Abgabenbescheid009(d, statusTMP) <> "" Then found = True - Case "008" : If readEZA_Abgabenbescheid008(d) <> "" Then found = True - Case Else : If readEZA_Abgabenbescheid(d) <> "" Then found = True - End Select - End If - - - 'EZA: NichtAbschliessendeFestsetzung - If Not found And cGetMsgType.isEZA_NichtAbschliessendeFestsetzung(doc, VERSION) Then - Select Case VERSION - Case "003" : If readEZA_NichtAbschliessendeFestsetzung003(d) <> "" Then found = True - Case Else : If readEZA_NichtAbschliessendeFestsetzung(d) <> "" Then found = True - End Select - End If - - 'EZA: AbschliessendeFestsetzung - If Not found And cGetMsgType.isEZA_AbschliessendeFestsetzung(doc, VERSION) Then - Select Case VERSION - Case "004" : If readEZA_AbschliessendeFestsetzung004(d) <> "" Then found = True - Case Else : If readEZA_AbschliessendeFestsetzung(d) <> "" Then found = True - End Select - - End If - - 'EZA: StornierungBescheid - If Not found And cGetMsgType.isEZA_StornierungBescheid(doc) Then - If readEZA_StornierungBescheid(d) <> "" Then found = True - End If - - 'EZA: BefundVereinfachteZollanmeldung - If Not found And cGetMsgType.isEZA_BefundVereinfachteZollanmeldung(doc, VERSION) Then - Select Case VERSION - Case "006" : found = True : addDGVEinarbeitung("*EZA: BefundVereinfachteZollanmeldung", "-") - Case "007" : found = True : addDGVEinarbeitung("*EZA: BefundVereinfachteZollanmeldung", "-") - Case Else : found = True : addDGVEinarbeitung("*EZA: BefundVereinfachteZollanmeldung", "-") - End Select - - - End If - - 'EZA: MitteilungAbschreibung - If Not found And cGetMsgType.isEZA_MitteilungAbschreibung(doc) Then - found = True : addDGVEinarbeitung("*EZA: MitteilungAbschreibung", "-") - End If - - 'EZA: WeitergabeHauptzollamt - If Not found And cGetMsgType.isEZA_WeitergabeHauptzollamt(doc) Then - found = True - addDGVEinarbeitung("*EZA: WeitergabeHauptzollamt", "-") - End If - - - '------------------------------------------ - '------------------ AES ------------------ - '------------------------------------------ - - If Not found Then - - Dim doc2 As New XmlDocument() - Dim XML_Code2 = System.IO.File.ReadAllText(d, System.Text.ASCIIEncoding.UTF8) - doc2.LoadXml(SanitizeXmlString(XML_Code2)) - - 'AES: VollstaendigeAusfuhr - If Not found And cGetMsgType.isAES_DEXPDD(doc2) Then - If readAES_DEXPDD(doc2) <> "" Then found = True - End If - 'AES: VollstaendigeAusfuhr - If Not found And cGetMsgType.isAES_DEXPDE(doc2) Then - If readAES_DEXPDE(doc2) <> "" Then found = True + addDGVEinarbeitung("*EZA: WeitergabeHauptzollamt", "-") End If - 'AES: Statusmeldung - If Not found And cGetMsgType.isAES_DEXPSD(doc2) Then - If readAES_DEXPSD(doc2) <> "" Then found = True - End If - 'AES: DeliveryNotification - If Not found And cGetMsgType.isAES_DeliveryNotification(doc2) Then - found = True - addDGVEinarbeitung("*AES: DeliveryNotification", "-") - End If + '------------------------------------------ + '------------------ AES ------------------ + '------------------------------------------ - 'AES: DEXPRE - Überlassung 2.3 - If Not found And cGetMsgType.isAES_DEXPRD(doc2) Then - If readAES_DEXPRD(doc2) <> "" Then found = True - End If + If Not found Then - 'AES: DEXPRE - Überlassung 2.4 - If Not found And cGetMsgType.isAES_DEXPRE(doc2) Then - If readAES_DEXPRE(doc2) <> "" Then found = True - End If + Dim doc2 As New XmlDocument() + Dim XML_Code2 = System.IO.File.ReadAllText(d, System.Text.ASCIIEncoding.UTF8) + doc2.LoadXml(SanitizeXmlString(XML_Code2)) - 'AES: Error - If Not found And cGetMsgType.isAES_DEERRE(doc2) Then - readAES_DEERRE(doc2) - found = True - End If - - 'AES: DEXPNE - Mitteilung - If Not found And (cGetMsgType.isAES_DEXPNE(doc2) Or cGetMsgType.isAES_DEXPND(doc2)) Then - found = True - addDGVEinarbeitung("*AES: Mitteilung", "-") - End If - - 'AES: Storno - If Not found And cGetMsgType.isAES_DEXPCC(doc2) Then - readAES_DEXPCC(doc2) - found = True - 'kann sein, dass keine Bezugsnr gefunden, nur MRN... - End If - - End If - - '------------------------------------------ - '------------------ Diverse ------------------ - '------------------------------------------ - 'SONDERFALL: Betrifft div. Arten von Anmeldungen: GenerellesEreignis - If Not found And cGetMsgType.isNCTS_GenerellesEreignis(doc) Then - If readNCTS_GenerellesEreignis(d) Then - found = True - End If - End If - - - - '------------------------------------------------------------------------------------------------------------------------------ - ' EZOLL - '------------------------------------------------------------------------------------------------------------------------------ - - - '------------------------------------------ - '------------------ NCTS ------------------ - '------------------------------------------ - - 'NCTS: TR100 Versandanmeldung - If Not found And cGetMsgType.isNCTS_AT_TR100_Versandanmeldung(doc) Then - If readNCTS_AT_TR100_Versandanmeldung(doc) <> "" Then found = True - End If - - - - '------------------------------------------------------------------------------------------------------------------------------ - ' VERAG - '------------------------------------------------------------------------------------------------------------------------------ - - 'VERAG KD TEST - If Not found And cGetMsgType.isVERAG_KD(doc) Then - If readVERAG_KD(d) <> "" Then found = True - ' If bezugsNr <> "" Then addDGVEinarbeitung("NCTS: UngueltigkeitSicherheitenNCTSDE", bezugsNr) : found = True - End If - - - ' If found = False Then getString(doc) - - End If - - If True Then - If Not alreadyMoved Then - If found Then - Dim dest = ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\" - If Not IO.Directory.Exists(dest) Then IO.Directory.CreateDirectory(dest) - Dim destFile = "" - If frmStartOptions.moveFile(d, dest, destFile) Then ' dest: Filename wird angefügt - If statusTMP IsNot Nothing Then - statusTMP.updatePfad(destFile) - End If + 'AES: VollstaendigeAusfuhr + If Not found And cGetMsgType.isAES_DEXPDD(doc2) Then + If readAES_DEXPDD(doc2) <> "" Then found = True End If - Else - frmStartOptions.moveFile(d, ERROR_PFAD) + 'AES: VollstaendigeAusfuhr + If Not found And cGetMsgType.isAES_DEXPDE(doc2) Then + If readAES_DEXPDE(doc2) <> "" Then found = True + End If + + 'AES: Statusmeldung + If Not found And cGetMsgType.isAES_DEXPSD(doc2) Then + If readAES_DEXPSD(doc2) <> "" Then found = True + End If + + 'AES: DeliveryNotification + If Not found And cGetMsgType.isAES_DeliveryNotification(doc2) Then + found = True + addDGVEinarbeitung("*AES: DeliveryNotification", "-") + End If + + 'AES: DEXPRE - Überlassung 2.3 + If Not found And cGetMsgType.isAES_DEXPRD(doc2) Then + If readAES_DEXPRD(doc2) <> "" Then found = True + End If + + 'AES: DEXPRE - Überlassung 2.4 + If Not found And cGetMsgType.isAES_DEXPRE(doc2) Then + If readAES_DEXPRE(doc2) <> "" Then found = True + End If + + 'AES: Error + If Not found And cGetMsgType.isAES_DEERRE(doc2) Then + readAES_DEERRE(doc2) + found = True + End If + + 'AES: DEXPNE - Mitteilung + If Not found And (cGetMsgType.isAES_DEXPNE(doc2) Or cGetMsgType.isAES_DEXPND(doc2)) Then + found = True + addDGVEinarbeitung("*AES: Mitteilung", "-") + End If + + 'AES: Storno + If Not found And cGetMsgType.isAES_DEXPCC(doc2) Then + readAES_DEXPCC(doc2) + found = True + 'kann sein, dass keine Bezugsnr gefunden, nur MRN... + End If + End If + + '------------------------------------------ + '------------------ Diverse ------------------ + '------------------------------------------ + 'SONDERFALL: Betrifft div. Arten von Anmeldungen: GenerellesEreignis + If Not found And cGetMsgType.isNCTS_GenerellesEreignis(doc) Then + If readNCTS_GenerellesEreignis(d) Then + found = True + End If + End If + + + + '------------------------------------------------------------------------------------------------------------------------------ + ' EZOLL + '------------------------------------------------------------------------------------------------------------------------------ + + + '------------------------------------------ + '------------------ NCTS ------------------ + '------------------------------------------ + + 'NCTS: TR100 Versandanmeldung + If Not found And cGetMsgType.isNCTS_AT_TR100_Versandanmeldung(doc) Then + If readNCTS_AT_TR100_Versandanmeldung(doc) <> "" Then found = True + End If + + + + '------------------------------------------------------------------------------------------------------------------------------ + ' VERAG + '------------------------------------------------------------------------------------------------------------------------------ + + 'VERAG KD TEST + If Not found And cGetMsgType.isVERAG_KD(doc) Then + If readVERAG_KD(d) <> "" Then found = True + ' If bezugsNr <> "" Then addDGVEinarbeitung("NCTS: UngueltigkeitSicherheitenNCTSDE", bezugsNr) : found = True + End If + + + ' If found = False Then getString(doc) + End If - End If + If True Then + If Not alreadyMoved Then + If found Then + Dim dest = ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\" + If Not IO.Directory.Exists(dest) Then IO.Directory.CreateDirectory(dest) + Dim destFile = "" + If frmStartOptions.moveFile(d, dest, destFile) Then ' dest: Filename wird angefügt + If statusTMP IsNot Nothing Then + statusTMP.updatePfad(destFile) + End If + End If + Else + frmStartOptions.moveFile(d, ERROR_PFAD) + End If + End If - Me.Refresh() - If found Then cntDatenEingelesen += 1 Else dsNichtErkannt += 1 + End If + + Me.Refresh() + If found Then cntDatenEingelesen += 1 Else dsNichtErkannt += 1 + End If End If Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) diff --git a/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb index 4c481f8..fb7ba81 100644 --- a/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb @@ -269,12 +269,19 @@ Public Class frmMDMNachrichtenVerarbeitung If True Then ' Temp.DownloadPfad - Dim destFilenameTMP = VERARBEITUNGS_PFAD & "." & If(IO.File.Exists(VERARBEITUNGS_PFAD & "." & name), name.Replace(".csv", "_") & Now.ToString("yyMMdd_HHmmss.fff") & ".csv", name) Dim downloadRequest As FtpWebRequest = WebRequest.Create(fileUrl) downloadRequest.Method = WebRequestMethods.Ftp.DownloadFile downloadRequest.Credentials = credentials + Dim fileDateTmp As Date = ServerDateFile(credentials, fileUrl) + + 'Dim destFilenameTMP = VERARBEITUNGS_PFAD & "." & If(IO.File.Exists(VERARBEITUNGS_PFAD & "." & name), name.Replace(".csv", "_") & " RGDAT_" & fileDateTmp.ToShortDateString & "_" & Now.ToString("yyMMdd_HHmmss.fff") & ".csv", name) + ' Dim FimeNameTmp = If(IO.File.Exists(VERARBEITUNGS_PFAD & "." & name), name.Replace(".csv", "_") & " RGDAT_" & fileDateTmp.ToShortDateString & "_" & Now.ToString("yyMMdd_HHmmss.fff") & ".csv", name) + name = name.Replace(".csv", "_RGDAT_" & fileDateTmp.ToShortDateString & ".csv") + + Dim destFilenameTMP = VERARBEITUNGS_PFAD & "." & If(IO.File.Exists(VERARBEITUNGS_PFAD & "." & name), name.Replace(".csv", "_") & Now.ToString("yyMMdd_HHmmss.fff") & ".csv", name) + Using downloadResponse As FtpWebResponse = downloadRequest.GetResponse(), sourceStream As Stream = downloadResponse.GetResponseStream(), targetStream As Stream = File.OpenWrite(destFilenameTMP) @@ -291,7 +298,8 @@ Public Class frmMDMNachrichtenVerarbeitung targetStream.Dispose() downloadResponse.Dispose() - Dim destFilename = VERARBEITUNGS_PFAD & "." & If(IO.File.Exists(VERARBEITUNGS_PFAD & "." & name), name.Replace(".csv", "_") & Now.ToString("yyMMdd_HHmmss.fff") & ".csv", name) + Dim destFilename = VERARBEITUNGS_PFAD & If(IO.File.Exists(VERARBEITUNGS_PFAD & name), name.Replace(".csv", "_") & Now.ToString("yyMMdd_HHmmss.fff") & ".csv", name) + IO.File.Move(destFilenameTMP, destFilename) 'Datei umbenennen @@ -316,6 +324,28 @@ Public Class frmMDMNachrichtenVerarbeitung End Sub + + Private Function ServerDateFile(credentials As NetworkCredential, fileUrl As String) As Date + Dim ServerDate As DateTime + Try + Dim request As FtpWebRequest = WebRequest.Create(fileUrl) + request.Method = WebRequestMethods.Ftp.GetDateTimestamp + request.Credentials = credentials + + Using response = CType(request.GetResponse(), Net.FtpWebResponse) + ServerDate = response.LastModified.ToShortDateString + End Using + + Return ServerDate + Catch ex As WebException + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "PLOSE GET DATE FILE: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + Return ServerDate + End Function + + + Function getNachrichtenDatenFromMDMServices_ALTERNATIV() As Integer Dim cnt = 0 Try @@ -567,14 +597,36 @@ Public Class frmMDMNachrichtenVerarbeitung Dim fi As FileInfo = New FileInfo(d) If fi.Name.Length > 8 Then - Dim plose_RechnungsNr = fi.Name.Substring(0, 8) + 'Dim plose_RechnungsNr = fi.Name.Substring(0, 8) + Dim plose_RechnungsJahr = fi.Name.Substring(0, 2) + Dim plose_RechnungsLieferantCode = fi.Name.Substring(2, 1) + Dim plose_RechnungsNr = fi.Name.Substring(3, 5) + Dim plose_RechnungsDat = Nothing + + Dim plose_Lieferant = Nothing + Select Case plose_RechnungsLieferantCode + Case "0" : plose_Lieferant = "PLOSE Sistem Service" + Case "7" : plose_Lieferant = "Consortio PLOSE" + End Select + + If fi.FullName.Contains("_RGDAT_") Then + Try + plose_RechnungsDat = CDate(fi.FullName.Substring(fi.FullName.IndexOf("_RGDAT_") + 7, 10)) + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "PLOSE RG DATUM, FILE: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End If If currentRow.Length > 24 AndAlso currentRow(12) <> "839160" Then 'KDNR <> VERAG --> Die Kosten bleiben uns Dim PLOSE As New MDM_Worker.cPLOSE PLOSE.plose_Dateiname = fi.Name PLOSE.plose_RechnungsNr = plose_RechnungsNr + PLOSE.plose_Lieferant = plose_Lieferant + PLOSE.plose_LieferantCode = plose_RechnungsLieferantCode + PLOSE.plose_RechnungsJahr = plose_RechnungsJahr + If plose_RechnungsDat IsNot Nothing Then PLOSE.plose_RechnungsDatum = plose_RechnungsDat PLOSE.plose_Datensatztyp = SQL.isleernothing(currentRow(0)) PLOSE.plose_KodexMautTankstelle = SQL.isleernothing(currentRow(1)) PLOSE.plose_BeschreibungMautTankstelle = SQL.isleernothing(currentRow(2)) @@ -663,6 +715,11 @@ Public Class frmMDMNachrichtenVerarbeitung Function readPLOSE_Header(d As String) As String Try + Return "" ' Keine Übernahme der Daten (RgDatum) --> Falsches Format!!! + + + + readPLOSE_Header = "" Dim KdnR = "" diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index 72bb5dd..1e520f8 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -24,7 +24,13 @@ Partial Class frmStartOptions Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStartOptions)) Me.pnl = New System.Windows.Forms.Panel() + Me.LinkLabel33 = New System.Windows.Forms.LinkLabel() + Me.Button5 = New System.Windows.Forms.Button() + Me.LinkLabel32 = New System.Windows.Forms.LinkLabel() + Me.Button4 = New System.Windows.Forms.Button() + Me.CheckBox5 = New System.Windows.Forms.CheckBox() Me.Button3 = New System.Windows.Forms.Button() + Me.cboBMDUnispedFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.CheckBox4 = New System.Windows.Forms.CheckBox() Me.Label13 = New System.Windows.Forms.Label() Me.CheckBox3 = New System.Windows.Forms.CheckBox() @@ -64,6 +70,10 @@ Partial Class frmStartOptions Me.LinkLabel16 = New System.Windows.Forms.LinkLabel() Me.PictureBox8 = New System.Windows.Forms.PictureBox() Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.Label14 = New System.Windows.Forms.Label() + Me.txtVRGOut_FilialenNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtVRGOut_AbfertigungsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cbxOUT_NCTS_TESTORDNER = New System.Windows.Forms.CheckBox() Me.cbxISettEZA_VERAG = New System.Windows.Forms.CheckBox() Me.PictureBox15 = New System.Windows.Forms.PictureBox() Me.Label9 = New System.Windows.Forms.Label() @@ -81,6 +91,10 @@ Partial Class frmStartOptions Me.Label7 = New System.Windows.Forms.Label() Me.LinkLabel27 = New System.Windows.Forms.LinkLabel() Me.Label6 = New System.Windows.Forms.Label() + Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtVRGOutEZA_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtVRGOut_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.TabPage3 = New System.Windows.Forms.TabPage() Me.LinkLabel31 = New System.Windows.Forms.LinkLabel() Me.Label12 = New System.Windows.Forms.Label() @@ -94,6 +108,7 @@ Partial Class frmStartOptions Me.cbxKd = New System.Windows.Forms.CheckBox() Me.Button9 = New System.Windows.Forms.Button() Me.Label3 = New System.Windows.Forms.Label() + Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.PictureBox12 = New System.Windows.Forms.PictureBox() Me.LinkLabel20 = New System.Windows.Forms.LinkLabel() Me.PictureBox11 = New System.Windows.Forms.PictureBox() @@ -109,14 +124,8 @@ Partial Class frmStartOptions Me.LinkLabel3 = New System.Windows.Forms.LinkLabel() Me.lklAufschubkontenATLASEZOLL = New System.Windows.Forms.LinkLabel() Me.lblRoutineManager = New System.Windows.Forms.Label() - Me.CheckBox5 = New System.Windows.Forms.CheckBox() - Me.cboBMDUnispedFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.txtVRGOutEZA_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.txtVRGOut_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Button4 = New System.Windows.Forms.Button() + Me.txtVRGOut_MRN = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label15 = New System.Windows.Forms.Label() Me.pnl.SuspendLayout() Me.tbcntr.SuspendLayout() Me.TabPage1.SuspendLayout() @@ -144,6 +153,9 @@ Partial Class frmStartOptions ' Me.pnl.BackColor = System.Drawing.Color.White Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnl.Controls.Add(Me.LinkLabel33) + Me.pnl.Controls.Add(Me.Button5) + Me.pnl.Controls.Add(Me.LinkLabel32) Me.pnl.Controls.Add(Me.Button4) Me.pnl.Controls.Add(Me.CheckBox5) Me.pnl.Controls.Add(Me.Button3) @@ -181,6 +193,65 @@ Partial Class frmStartOptions Me.pnl.Size = New System.Drawing.Size(790, 720) Me.pnl.TabIndex = 0 ' + 'LinkLabel33 + ' + Me.LinkLabel33.AutoSize = True + Me.LinkLabel33.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.LinkLabel33.Location = New System.Drawing.Point(15, 170) + Me.LinkLabel33.Name = "LinkLabel33" + Me.LinkLabel33.Size = New System.Drawing.Size(107, 13) + Me.LinkLabel33.TabIndex = 47 + Me.LinkLabel33.TabStop = True + Me.LinkLabel33.Text = "UID-Prüfung AMBAR" + ' + 'Button5 + ' + Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button5.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button5.Location = New System.Drawing.Point(482, 141) + Me.Button5.Name = "Button5" + Me.Button5.Size = New System.Drawing.Size(211, 24) + Me.Button5.TabIndex = 46 + Me.Button5.Text = "SMS Status Update" + Me.Button5.UseVisualStyleBackColor = True + ' + 'LinkLabel32 + ' + Me.LinkLabel32.AutoSize = True + Me.LinkLabel32.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.LinkLabel32.Location = New System.Drawing.Point(15, 152) + Me.LinkLabel32.Name = "LinkLabel32" + Me.LinkLabel32.Size = New System.Drawing.Size(95, 13) + Me.LinkLabel32.TabIndex = 45 + Me.LinkLabel32.TabStop = True + Me.LinkLabel32.Text = "UID-Prüfung IMEX" + ' + 'Button4 + ' + Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button4.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button4.Location = New System.Drawing.Point(449, 228) + Me.Button4.Name = "Button4" + Me.Button4.Size = New System.Drawing.Size(149, 24) + Me.Button4.TabIndex = 44 + Me.Button4.Text = "Stammdaten --> BMD" + Me.Button4.UseVisualStyleBackColor = True + ' + 'CheckBox5 + ' + Me.CheckBox5.AutoSize = True + Me.CheckBox5.Checked = True + Me.CheckBox5.CheckState = System.Windows.Forms.CheckState.Checked + Me.CheckBox5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.CheckBox5.Location = New System.Drawing.Point(519, 255) + Me.CheckBox5.Name = "CheckBox5" + Me.CheckBox5.Size = New System.Drawing.Size(79, 17) + Me.CheckBox5.TabIndex = 43 + Me.CheckBox5.Text = "Testsystem" + Me.CheckBox5.UseVisualStyleBackColor = True + ' 'Button3 ' Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -193,6 +264,17 @@ Partial Class frmStartOptions Me.Button3.Text = "Buchungen --> BMD" Me.Button3.UseVisualStyleBackColor = True ' + 'cboBMDUnispedFirma + ' + Me.cboBMDUnispedFirma._allowedValuesFreiText = Nothing + Me.cboBMDUnispedFirma._allowFreiText = False + Me.cboBMDUnispedFirma._value = "" + Me.cboBMDUnispedFirma.FormattingEnabled = True + Me.cboBMDUnispedFirma.Location = New System.Drawing.Point(302, 251) + Me.cboBMDUnispedFirma.Name = "cboBMDUnispedFirma" + Me.cboBMDUnispedFirma.Size = New System.Drawing.Size(148, 21) + Me.cboBMDUnispedFirma.TabIndex = 42 + ' 'CheckBox4 ' Me.CheckBox4.AutoSize = True @@ -640,6 +722,12 @@ Partial Class frmStartOptions ' 'TabPage2 ' + Me.TabPage2.Controls.Add(Me.Label15) + Me.TabPage2.Controls.Add(Me.txtVRGOut_MRN) + Me.TabPage2.Controls.Add(Me.Label14) + Me.TabPage2.Controls.Add(Me.txtVRGOut_FilialenNr) + Me.TabPage2.Controls.Add(Me.txtVRGOut_AbfertigungsNr) + Me.TabPage2.Controls.Add(Me.cbxOUT_NCTS_TESTORDNER) Me.TabPage2.Controls.Add(Me.cbxISettEZA_VERAG) Me.TabPage2.Controls.Add(Me.PictureBox15) Me.TabPage2.Controls.Add(Me.Label9) @@ -669,12 +757,77 @@ Partial Class frmStartOptions Me.TabPage2.Text = "VERAG Interface" Me.TabPage2.UseVisualStyleBackColor = True ' + 'Label14 + ' + Me.Label14.AutoSize = True + Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label14.Location = New System.Drawing.Point(395, 160) + Me.Label14.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(156, 13) + Me.Label14.TabIndex = 72 + Me.Label14.Text = "Zuordnung Filiale/Abf.Nr ( opt.):" + ' + 'txtVRGOut_FilialenNr + ' + Me.txtVRGOut_FilialenNr._DateTimeOnly = False + Me.txtVRGOut_FilialenNr._numbersOnly = False + Me.txtVRGOut_FilialenNr._numbersOnlyKommastellen = "" + Me.txtVRGOut_FilialenNr._Prozent = False + Me.txtVRGOut_FilialenNr._ShortDateNew = False + Me.txtVRGOut_FilialenNr._ShortDateOnly = False + Me.txtVRGOut_FilialenNr._TimeOnly = False + Me.txtVRGOut_FilialenNr._value = "" + Me.txtVRGOut_FilialenNr._Waehrung = False + Me.txtVRGOut_FilialenNr._WaehrungZeichen = False + Me.txtVRGOut_FilialenNr.ForeColor = System.Drawing.Color.Red + Me.txtVRGOut_FilialenNr.Location = New System.Drawing.Point(398, 176) + Me.txtVRGOut_FilialenNr.MaxLineLength = -1 + Me.txtVRGOut_FilialenNr.MaxLines_Warning = "" + Me.txtVRGOut_FilialenNr.MaxLines_Warning_Label = Nothing + Me.txtVRGOut_FilialenNr.Multiline = True + Me.txtVRGOut_FilialenNr.Name = "txtVRGOut_FilialenNr" + Me.txtVRGOut_FilialenNr.Size = New System.Drawing.Size(56, 21) + Me.txtVRGOut_FilialenNr.TabIndex = 71 + ' + 'txtVRGOut_AbfertigungsNr + ' + Me.txtVRGOut_AbfertigungsNr._DateTimeOnly = False + Me.txtVRGOut_AbfertigungsNr._numbersOnly = False + Me.txtVRGOut_AbfertigungsNr._numbersOnlyKommastellen = "" + Me.txtVRGOut_AbfertigungsNr._Prozent = False + Me.txtVRGOut_AbfertigungsNr._ShortDateNew = False + Me.txtVRGOut_AbfertigungsNr._ShortDateOnly = False + Me.txtVRGOut_AbfertigungsNr._TimeOnly = False + Me.txtVRGOut_AbfertigungsNr._value = "" + Me.txtVRGOut_AbfertigungsNr._Waehrung = False + Me.txtVRGOut_AbfertigungsNr._WaehrungZeichen = False + Me.txtVRGOut_AbfertigungsNr.ForeColor = System.Drawing.Color.Red + Me.txtVRGOut_AbfertigungsNr.Location = New System.Drawing.Point(453, 176) + Me.txtVRGOut_AbfertigungsNr.MaxLineLength = -1 + Me.txtVRGOut_AbfertigungsNr.MaxLines_Warning = "" + Me.txtVRGOut_AbfertigungsNr.MaxLines_Warning_Label = Nothing + Me.txtVRGOut_AbfertigungsNr.Multiline = True + Me.txtVRGOut_AbfertigungsNr.Name = "txtVRGOut_AbfertigungsNr" + Me.txtVRGOut_AbfertigungsNr.Size = New System.Drawing.Size(137, 21) + Me.txtVRGOut_AbfertigungsNr.TabIndex = 70 + ' + 'cbxOUT_NCTS_TESTORDNER + ' + Me.cbxOUT_NCTS_TESTORDNER.AutoSize = True + Me.cbxOUT_NCTS_TESTORDNER.Location = New System.Drawing.Point(518, 111) + Me.cbxOUT_NCTS_TESTORDNER.Name = "cbxOUT_NCTS_TESTORDNER" + Me.cbxOUT_NCTS_TESTORDNER.Size = New System.Drawing.Size(101, 17) + Me.cbxOUT_NCTS_TESTORDNER.TabIndex = 69 + Me.cbxOUT_NCTS_TESTORDNER.Text = "TESTORDNER" + Me.cbxOUT_NCTS_TESTORDNER.UseVisualStyleBackColor = True + Me.cbxOUT_NCTS_TESTORDNER.Visible = False + ' 'cbxISettEZA_VERAG ' Me.cbxISettEZA_VERAG.AutoSize = True Me.cbxISettEZA_VERAG.Checked = True Me.cbxISettEZA_VERAG.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxISettEZA_VERAG.Location = New System.Drawing.Point(297, 257) + Me.cbxISettEZA_VERAG.Location = New System.Drawing.Point(297, 279) Me.cbxISettEZA_VERAG.Name = "cbxISettEZA_VERAG" Me.cbxISettEZA_VERAG.Size = New System.Drawing.Size(63, 17) Me.cbxISettEZA_VERAG.TabIndex = 68 @@ -685,7 +838,7 @@ Partial Class frmStartOptions ' Me.PictureBox15.BackgroundImage = CType(resources.GetObject("PictureBox15.BackgroundImage"), System.Drawing.Image) Me.PictureBox15.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox15.Location = New System.Drawing.Point(562, 233) + Me.PictureBox15.Location = New System.Drawing.Point(596, 255) Me.PictureBox15.Name = "PictureBox15" Me.PictureBox15.Size = New System.Drawing.Size(18, 18) Me.PictureBox15.TabIndex = 67 @@ -696,7 +849,7 @@ Partial Class frmStartOptions ' Me.Label9.AutoSize = True Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label9.Location = New System.Drawing.Point(295, 214) + Me.Label9.Location = New System.Drawing.Point(295, 236) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(176, 13) Me.Label9.TabIndex = 63 @@ -707,7 +860,7 @@ Partial Class frmStartOptions Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button2.Location = New System.Drawing.Point(484, 213) + Me.Button2.Location = New System.Drawing.Point(518, 235) Me.Button2.Name = "Button2" Me.Button2.Size = New System.Drawing.Size(72, 38) Me.Button2.TabIndex = 66 @@ -718,7 +871,7 @@ Partial Class frmStartOptions ' Me.Label10.AutoSize = True Me.Label10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label10.Location = New System.Drawing.Point(295, 188) + Me.Label10.Location = New System.Drawing.Point(295, 210) Me.Label10.Name = "Label10" Me.Label10.Size = New System.Drawing.Size(115, 13) Me.Label10.TabIndex = 62 @@ -729,7 +882,7 @@ Partial Class frmStartOptions Me.cbxISett_IMEX.AutoSize = True Me.cbxISett_IMEX.Checked = True Me.cbxISett_IMEX.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxISett_IMEX.Location = New System.Drawing.Point(298, 158) + Me.cbxISett_IMEX.Location = New System.Drawing.Point(298, 180) Me.cbxISett_IMEX.Name = "cbxISett_IMEX" Me.cbxISett_IMEX.Size = New System.Drawing.Size(52, 17) Me.cbxISett_IMEX.TabIndex = 61 @@ -741,7 +894,7 @@ Partial Class frmStartOptions Me.cbxISett_VERAG.AutoSize = True Me.cbxISett_VERAG.Checked = True Me.cbxISett_VERAG.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxISett_VERAG.Location = New System.Drawing.Point(298, 135) + Me.cbxISett_VERAG.Location = New System.Drawing.Point(298, 157) Me.cbxISett_VERAG.Name = "cbxISett_VERAG" Me.cbxISett_VERAG.Size = New System.Drawing.Size(63, 17) Me.cbxISett_VERAG.TabIndex = 60 @@ -753,7 +906,7 @@ Partial Class frmStartOptions Me.cbxISett_TEST.AutoSize = True Me.cbxISett_TEST.Checked = True Me.cbxISett_TEST.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxISett_TEST.Location = New System.Drawing.Point(377, 112) + Me.cbxISett_TEST.Location = New System.Drawing.Point(377, 134) Me.cbxISett_TEST.Name = "cbxISett_TEST" Me.cbxISett_TEST.Size = New System.Drawing.Size(54, 17) Me.cbxISett_TEST.TabIndex = 59 @@ -765,7 +918,7 @@ Partial Class frmStartOptions Me.cbxISett_EKOL.AutoSize = True Me.cbxISett_EKOL.Checked = True Me.cbxISett_EKOL.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxISett_EKOL.Location = New System.Drawing.Point(377, 89) + Me.cbxISett_EKOL.Location = New System.Drawing.Point(377, 111) Me.cbxISett_EKOL.Name = "cbxISett_EKOL" Me.cbxISett_EKOL.Size = New System.Drawing.Size(54, 17) Me.cbxISett_EKOL.TabIndex = 58 @@ -777,7 +930,7 @@ Partial Class frmStartOptions Me.cbxISett_TOBB.AutoSize = True Me.cbxISett_TOBB.Checked = True Me.cbxISett_TOBB.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxISett_TOBB.Location = New System.Drawing.Point(298, 112) + Me.cbxISett_TOBB.Location = New System.Drawing.Point(298, 134) Me.cbxISett_TOBB.Name = "cbxISett_TOBB" Me.cbxISett_TOBB.Size = New System.Drawing.Size(55, 17) Me.cbxISett_TOBB.TabIndex = 57 @@ -789,7 +942,7 @@ Partial Class frmStartOptions Me.cbxISett_OREGON.AutoSize = True Me.cbxISett_OREGON.Checked = True Me.cbxISett_OREGON.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxISett_OREGON.Location = New System.Drawing.Point(298, 89) + Me.cbxISett_OREGON.Location = New System.Drawing.Point(298, 111) Me.cbxISett_OREGON.Name = "cbxISett_OREGON" Me.cbxISett_OREGON.Size = New System.Drawing.Size(73, 17) Me.cbxISett_OREGON.TabIndex = 38 @@ -800,7 +953,7 @@ Partial Class frmStartOptions ' Me.PictureBox14.BackgroundImage = CType(resources.GetObject("PictureBox14.BackgroundImage"), System.Drawing.Image) Me.PictureBox14.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox14.Location = New System.Drawing.Point(562, 65) + Me.PictureBox14.Location = New System.Drawing.Point(596, 65) Me.PictureBox14.Name = "PictureBox14" Me.PictureBox14.Size = New System.Drawing.Size(18, 18) Me.PictureBox14.TabIndex = 56 @@ -822,9 +975,9 @@ Partial Class frmStartOptions Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button1.Location = New System.Drawing.Point(484, 45) + Me.Button1.Location = New System.Drawing.Point(518, 62) Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(72, 38) + Me.Button1.Size = New System.Drawing.Size(72, 43) Me.Button1.TabIndex = 6 Me.Button1.Text = "Daten --> FTP" Me.Button1.UseVisualStyleBackColor = True @@ -861,6 +1014,71 @@ Partial Class frmStartOptions Me.Label6.TabIndex = 0 Me.Label6.Text = "VERAG IN" ' + 'MyComboBox2 + ' + Me.MyComboBox2._allowedValuesFreiText = Nothing + Me.MyComboBox2._allowFreiText = False + Me.MyComboBox2._value = "" + Me.MyComboBox2.FormattingEnabled = True + Me.MyComboBox2.Location = New System.Drawing.Point(298, 252) + Me.MyComboBox2.Name = "MyComboBox2" + Me.MyComboBox2.Size = New System.Drawing.Size(62, 21) + Me.MyComboBox2.TabIndex = 64 + ' + 'txtVRGOutEZA_BezugsNr + ' + Me.txtVRGOutEZA_BezugsNr._DateTimeOnly = False + Me.txtVRGOutEZA_BezugsNr._numbersOnly = False + Me.txtVRGOutEZA_BezugsNr._numbersOnlyKommastellen = "" + Me.txtVRGOutEZA_BezugsNr._Prozent = False + Me.txtVRGOutEZA_BezugsNr._ShortDateNew = False + Me.txtVRGOutEZA_BezugsNr._ShortDateOnly = False + Me.txtVRGOutEZA_BezugsNr._TimeOnly = False + Me.txtVRGOutEZA_BezugsNr._value = "" + Me.txtVRGOutEZA_BezugsNr._Waehrung = False + Me.txtVRGOutEZA_BezugsNr._WaehrungZeichen = False + Me.txtVRGOutEZA_BezugsNr.ForeColor = System.Drawing.Color.Red + Me.txtVRGOutEZA_BezugsNr.Location = New System.Drawing.Point(359, 252) + Me.txtVRGOutEZA_BezugsNr.MaxLineLength = -1 + Me.txtVRGOutEZA_BezugsNr.MaxLines_Warning = "" + Me.txtVRGOutEZA_BezugsNr.MaxLines_Warning_Label = Nothing + Me.txtVRGOutEZA_BezugsNr.Multiline = True + Me.txtVRGOutEZA_BezugsNr.Name = "txtVRGOutEZA_BezugsNr" + Me.txtVRGOutEZA_BezugsNr.Size = New System.Drawing.Size(153, 21) + Me.txtVRGOutEZA_BezugsNr.TabIndex = 65 + ' + 'MyComboBox1 + ' + Me.MyComboBox1._allowedValuesFreiText = Nothing + Me.MyComboBox1._allowFreiText = False + Me.MyComboBox1._value = "" + Me.MyComboBox1.FormattingEnabled = True + Me.MyComboBox1.Location = New System.Drawing.Point(298, 62) + Me.MyComboBox1.Name = "MyComboBox1" + Me.MyComboBox1.Size = New System.Drawing.Size(62, 21) + Me.MyComboBox1.TabIndex = 4 + ' + 'txtVRGOut_BezugsNr + ' + Me.txtVRGOut_BezugsNr._DateTimeOnly = False + Me.txtVRGOut_BezugsNr._numbersOnly = False + Me.txtVRGOut_BezugsNr._numbersOnlyKommastellen = "" + Me.txtVRGOut_BezugsNr._Prozent = False + Me.txtVRGOut_BezugsNr._ShortDateNew = False + Me.txtVRGOut_BezugsNr._ShortDateOnly = False + Me.txtVRGOut_BezugsNr._TimeOnly = False + Me.txtVRGOut_BezugsNr._value = "" + Me.txtVRGOut_BezugsNr._Waehrung = False + Me.txtVRGOut_BezugsNr._WaehrungZeichen = False + Me.txtVRGOut_BezugsNr.ForeColor = System.Drawing.Color.Red + Me.txtVRGOut_BezugsNr.Location = New System.Drawing.Point(359, 62) + Me.txtVRGOut_BezugsNr.MaxLineLength = -1 + Me.txtVRGOut_BezugsNr.MaxLines_Warning = "" + Me.txtVRGOut_BezugsNr.MaxLines_Warning_Label = Nothing + Me.txtVRGOut_BezugsNr.Name = "txtVRGOut_BezugsNr" + Me.txtVRGOut_BezugsNr.Size = New System.Drawing.Size(153, 20) + Me.txtVRGOut_BezugsNr.TabIndex = 5 + ' 'TabPage3 ' Me.TabPage3.Controls.Add(Me.LinkLabel31) @@ -1006,11 +1224,33 @@ Partial Class frmStartOptions Me.Label3.TabIndex = 14 Me.Label3.Text = "Routine Manager IMEX" ' + 'MyTextBox1 + ' + Me.MyTextBox1._DateTimeOnly = False + Me.MyTextBox1._numbersOnly = True + Me.MyTextBox1._numbersOnlyKommastellen = "" + Me.MyTextBox1._Prozent = False + Me.MyTextBox1._ShortDateNew = False + Me.MyTextBox1._ShortDateOnly = False + Me.MyTextBox1._TimeOnly = False + Me.MyTextBox1._value = "10000" + Me.MyTextBox1._Waehrung = False + Me.MyTextBox1._WaehrungZeichen = True + Me.MyTextBox1.ForeColor = System.Drawing.Color.Black + Me.MyTextBox1.Location = New System.Drawing.Point(151, 132) + Me.MyTextBox1.MaxLineLength = -1 + Me.MyTextBox1.MaxLines_Warning = "" + Me.MyTextBox1.MaxLines_Warning_Label = Nothing + Me.MyTextBox1.Name = "MyTextBox1" + Me.MyTextBox1.Size = New System.Drawing.Size(53, 20) + Me.MyTextBox1.TabIndex = 11 + Me.MyTextBox1.Text = "10000" + ' 'PictureBox12 ' Me.PictureBox12.BackgroundImage = CType(resources.GetObject("PictureBox12.BackgroundImage"), System.Drawing.Image) Me.PictureBox12.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox12.Location = New System.Drawing.Point(87, 130) + Me.PictureBox12.Location = New System.Drawing.Point(127, 130) Me.PictureBox12.Name = "PictureBox12" Me.PictureBox12.Size = New System.Drawing.Size(18, 18) Me.PictureBox12.TabIndex = 37 @@ -1023,10 +1263,10 @@ Partial Class frmStartOptions Me.LinkLabel20.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.LinkLabel20.Location = New System.Drawing.Point(15, 135) Me.LinkLabel20.Name = "LinkLabel20" - Me.LinkLabel20.Size = New System.Drawing.Size(66, 13) + Me.LinkLabel20.Size = New System.Drawing.Size(106, 13) Me.LinkLabel20.TabIndex = 10 Me.LinkLabel20.TabStop = True - Me.LinkLabel20.Text = "UID-Prüfung" + Me.LinkLabel20.Text = "UID-Prüfung VERAG" ' 'PictureBox11 ' @@ -1173,129 +1413,36 @@ Partial Class frmStartOptions Me.lblRoutineManager.TabIndex = 1 Me.lblRoutineManager.Text = "Routine Manager" ' - 'CheckBox5 + 'txtVRGOut_MRN ' - Me.CheckBox5.AutoSize = True - Me.CheckBox5.Checked = True - Me.CheckBox5.CheckState = System.Windows.Forms.CheckState.Checked - Me.CheckBox5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CheckBox5.Location = New System.Drawing.Point(519, 255) - Me.CheckBox5.Name = "CheckBox5" - Me.CheckBox5.Size = New System.Drawing.Size(79, 17) - Me.CheckBox5.TabIndex = 43 - Me.CheckBox5.Text = "Testsystem" - Me.CheckBox5.UseVisualStyleBackColor = True + Me.txtVRGOut_MRN._DateTimeOnly = False + Me.txtVRGOut_MRN._numbersOnly = False + Me.txtVRGOut_MRN._numbersOnlyKommastellen = "" + Me.txtVRGOut_MRN._Prozent = False + Me.txtVRGOut_MRN._ShortDateNew = False + Me.txtVRGOut_MRN._ShortDateOnly = False + Me.txtVRGOut_MRN._TimeOnly = False + Me.txtVRGOut_MRN._value = "" + Me.txtVRGOut_MRN._Waehrung = False + Me.txtVRGOut_MRN._WaehrungZeichen = False + Me.txtVRGOut_MRN.ForeColor = System.Drawing.Color.Red + Me.txtVRGOut_MRN.Location = New System.Drawing.Point(359, 84) + Me.txtVRGOut_MRN.MaxLineLength = -1 + Me.txtVRGOut_MRN.MaxLines_Warning = "" + Me.txtVRGOut_MRN.MaxLines_Warning_Label = Nothing + Me.txtVRGOut_MRN.Name = "txtVRGOut_MRN" + Me.txtVRGOut_MRN.Size = New System.Drawing.Size(153, 20) + Me.txtVRGOut_MRN.TabIndex = 73 ' - 'cboBMDUnispedFirma + 'Label15 ' - Me.cboBMDUnispedFirma._allowedValuesFreiText = Nothing - Me.cboBMDUnispedFirma._allowFreiText = False - Me.cboBMDUnispedFirma._value = "" - Me.cboBMDUnispedFirma.FormattingEnabled = True - Me.cboBMDUnispedFirma.Location = New System.Drawing.Point(302, 251) - Me.cboBMDUnispedFirma.Name = "cboBMDUnispedFirma" - Me.cboBMDUnispedFirma.Size = New System.Drawing.Size(148, 21) - Me.cboBMDUnispedFirma.TabIndex = 42 - ' - 'MyComboBox2 - ' - Me.MyComboBox2._allowedValuesFreiText = Nothing - Me.MyComboBox2._allowFreiText = False - Me.MyComboBox2._value = "" - Me.MyComboBox2.FormattingEnabled = True - Me.MyComboBox2.Location = New System.Drawing.Point(298, 230) - Me.MyComboBox2.Name = "MyComboBox2" - Me.MyComboBox2.Size = New System.Drawing.Size(62, 21) - Me.MyComboBox2.TabIndex = 64 - ' - 'txtVRGOutEZA_BezugsNr - ' - Me.txtVRGOutEZA_BezugsNr._DateTimeOnly = False - Me.txtVRGOutEZA_BezugsNr._numbersOnly = False - Me.txtVRGOutEZA_BezugsNr._numbersOnlyKommastellen = "" - Me.txtVRGOutEZA_BezugsNr._Prozent = False - Me.txtVRGOutEZA_BezugsNr._ShortDateNew = False - Me.txtVRGOutEZA_BezugsNr._ShortDateOnly = False - Me.txtVRGOutEZA_BezugsNr._TimeOnly = False - Me.txtVRGOutEZA_BezugsNr._value = "" - Me.txtVRGOutEZA_BezugsNr._Waehrung = False - Me.txtVRGOutEZA_BezugsNr._WaehrungZeichen = False - Me.txtVRGOutEZA_BezugsNr.ForeColor = System.Drawing.Color.Red - Me.txtVRGOutEZA_BezugsNr.Location = New System.Drawing.Point(359, 230) - Me.txtVRGOutEZA_BezugsNr.MaxLineLength = -1 - Me.txtVRGOutEZA_BezugsNr.MaxLines_Warning = "" - Me.txtVRGOutEZA_BezugsNr.MaxLines_Warning_Label = Nothing - Me.txtVRGOutEZA_BezugsNr.Multiline = True - Me.txtVRGOutEZA_BezugsNr.Name = "txtVRGOutEZA_BezugsNr" - Me.txtVRGOutEZA_BezugsNr.Size = New System.Drawing.Size(119, 21) - Me.txtVRGOutEZA_BezugsNr.TabIndex = 65 - ' - 'MyComboBox1 - ' - Me.MyComboBox1._allowedValuesFreiText = Nothing - Me.MyComboBox1._allowFreiText = False - Me.MyComboBox1._value = "" - Me.MyComboBox1.FormattingEnabled = True - Me.MyComboBox1.Location = New System.Drawing.Point(298, 62) - Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(62, 21) - Me.MyComboBox1.TabIndex = 4 - ' - 'txtVRGOut_BezugsNr - ' - Me.txtVRGOut_BezugsNr._DateTimeOnly = False - Me.txtVRGOut_BezugsNr._numbersOnly = False - Me.txtVRGOut_BezugsNr._numbersOnlyKommastellen = "" - Me.txtVRGOut_BezugsNr._Prozent = False - Me.txtVRGOut_BezugsNr._ShortDateNew = False - Me.txtVRGOut_BezugsNr._ShortDateOnly = False - Me.txtVRGOut_BezugsNr._TimeOnly = False - Me.txtVRGOut_BezugsNr._value = "" - Me.txtVRGOut_BezugsNr._Waehrung = False - Me.txtVRGOut_BezugsNr._WaehrungZeichen = False - Me.txtVRGOut_BezugsNr.ForeColor = System.Drawing.Color.Red - Me.txtVRGOut_BezugsNr.Location = New System.Drawing.Point(359, 62) - Me.txtVRGOut_BezugsNr.MaxLineLength = -1 - Me.txtVRGOut_BezugsNr.MaxLines_Warning = "" - Me.txtVRGOut_BezugsNr.MaxLines_Warning_Label = Nothing - Me.txtVRGOut_BezugsNr.Multiline = True - Me.txtVRGOut_BezugsNr.Name = "txtVRGOut_BezugsNr" - Me.txtVRGOut_BezugsNr.Size = New System.Drawing.Size(119, 21) - Me.txtVRGOut_BezugsNr.TabIndex = 5 - ' - 'MyTextBox1 - ' - Me.MyTextBox1._DateTimeOnly = False - Me.MyTextBox1._numbersOnly = True - Me.MyTextBox1._numbersOnlyKommastellen = "" - Me.MyTextBox1._Prozent = False - Me.MyTextBox1._ShortDateNew = False - Me.MyTextBox1._ShortDateOnly = False - Me.MyTextBox1._TimeOnly = False - Me.MyTextBox1._value = "10000" - Me.MyTextBox1._Waehrung = False - Me.MyTextBox1._WaehrungZeichen = True - Me.MyTextBox1.ForeColor = System.Drawing.Color.Black - Me.MyTextBox1.Location = New System.Drawing.Point(111, 132) - Me.MyTextBox1.MaxLineLength = -1 - Me.MyTextBox1.MaxLines_Warning = "" - Me.MyTextBox1.MaxLines_Warning_Label = Nothing - Me.MyTextBox1.Name = "MyTextBox1" - Me.MyTextBox1.Size = New System.Drawing.Size(53, 20) - Me.MyTextBox1.TabIndex = 11 - Me.MyTextBox1.Text = "10000" - ' - 'Button4 - ' - Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button4.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button4.Location = New System.Drawing.Point(449, 228) - Me.Button4.Name = "Button4" - Me.Button4.Size = New System.Drawing.Size(149, 24) - Me.Button4.TabIndex = 44 - Me.Button4.Text = "Stammdaten --> BMD" - Me.Button4.UseVisualStyleBackColor = True + Me.Label15.AutoSize = True + Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label15.Location = New System.Drawing.Point(295, 87) + Me.Label15.Name = "Label15" + Me.Label15.Size = New System.Drawing.Size(59, 13) + Me.Label15.TabIndex = 74 + Me.Label15.Text = "oder MRN:" ' 'frmStartOptions ' @@ -1432,4 +1579,13 @@ Partial Class frmStartOptions Friend WithEvents cboBMDUnispedFirma As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents CheckBox5 As CheckBox Friend WithEvents Button4 As Button + Friend WithEvents LinkLabel32 As LinkLabel + Friend WithEvents cbxOUT_NCTS_TESTORDNER As CheckBox + Friend WithEvents Button5 As Button + Friend WithEvents LinkLabel33 As LinkLabel + Friend WithEvents Label14 As Label + Friend WithEvents txtVRGOut_FilialenNr As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtVRGOut_AbfertigungsNr As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label15 As Label + Friend WithEvents txtVRGOut_MRN As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/initATLASAufschubkonten/frmStartOptions.resx b/initATLASAufschubkonten/frmStartOptions.resx index 4fe3046..b0ba11d 100644 --- a/initATLASAufschubkonten/frmStartOptions.resx +++ b/initATLASAufschubkonten/frmStartOptions.resx @@ -118,6 +118,150 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj @@ -356,150 +500,6 @@ WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index d270594..9c8acb5 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -110,6 +110,11 @@ Public Class frmStartOptions AddHandler f.FormClosed, AddressOf closeMe + Case "UPDATE_SMS" + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" + UPDATE_SMS() + Case "DY_EINARBEITUNG_UNISPED" VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED" @@ -174,17 +179,23 @@ Public Class frmStartOptions VERAG_PROG_ALLGEMEIN.SDL_Functions.SDL_GueltigBis_UTA_IDS() closeMe() - Case "dakosy_mail_attach" + Case "zoll_mail_attach" Dim pfad = "" Dim betreff = "" + Dim von = "" If (parameter.Count - 1) >= 3 Then 'Höher als 1 weil der index 0 der Pfad zum programm ist pfad = parameter(2) betreff = parameter(3) - VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + If (parameter.Count - 1) >= 5 Then von = parameter(5) - importFileFromDyMailAnhang(pfad, betreff) + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + If von.Contains("@miccustoms.com") Or betreff.Contains("FORWARDING EMAIL | BEZUGSNUMMER") Then + importFileFromMICMailAnhang(pfad, betreff) + Else + importFileFromDyMailAnhang(pfad, betreff) + End If End If closeMe() @@ -350,7 +361,8 @@ Public Class frmStartOptions Dim Emails_list_sent As New VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigungList VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(KundenNr, 2, EMails, EMails_CC, EMails_BCC, Emails_list_sent) - body = body.Replace("%Platzhalter%", "E-Mails: " & EMails & " CC: " & EMails_CC & " BCC:" & EMails_BCC) + ' body = body.Replace("%Platzhalter%", "E-Mails: " & EMails & " CC: " & EMails_CC & " BCC:" & EMails_BCC) + body = body.Replace("%Platzhalter%", "") EMails = "al@verag.ag" EMails_CC = "" @@ -398,6 +410,236 @@ Public Class frmStartOptions Case Else : Return "noreply@verag.ag" End Select End Function + Sub importFileFromMICMailAnhang(pfad, betreff) + + + Try + Dim sql As New VERAG_PROG_ALLGEMEIN.SQL + Dim DS As VERAG_PROG_ALLGEMEIN.cDATENSERVER = Nothing + + 'moveFile(d, VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\nlc\") + + 'IO.Directory.CreateDirectory(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\TEST3\" & betreff.ToString.Replace(",", "")) + 'Report nctsTransDeclGuarantees generated successfully + 'If betreff.ToString.Contains("VBD FORWARDING EMAIL | BEZUGSNUMMER = ") Then + If betreff.ToString.Contains("TAD FORWARDING EMAIL | ") Then + betreff = betreff.replace("WG: ", "") + betreff = betreff.replace("FW: ", "") + betreff = betreff.replace("TAD FORWARDING EMAIL | ", "") + betreff = betreff.trim + + + Dim split = betreff.ToString.Split("|") + + Dim MRN = "" + Dim LRN = "" + For Each s In split + If s.Trim.StartsWith("MRN") Then + MRN = s.Replace("MRN", "").Trim + End If + If s.Trim.StartsWith("LRN") Then + LRN = s.Replace("LRN", "").Trim + End If + Next + + Dim tmp_filialenNr = "" + Dim tmp_abfertigungsNr = "" + + Dim SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch = Nothing + If LRN.ToString.Length >= 13 And LRN.ToString.Replace("-", "/").Contains("/") Then + Dim sp = LRN.ToString.Replace("-", "/").Split("/") + If sp(0).Length = 4 And sp(1).Length >= 8 Then + tmp_filialenNr = sp(0) + tmp_abfertigungsNr = sp(1).Substring(0, 8) + If IsNumeric(tmp_filialenNr) And IsNumeric(tmp_abfertigungsNr) Then + SPEDBUCH = New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(tmp_filialenNr, tmp_abfertigungsNr) + insertIntoSpedBuch_MIC(tmp_filialenNr, tmp_abfertigungsNr, LRN, "", SPEDBUCH, MRN) 'SPEDBUCH GENEREITERENERENRNERNERNERN!!!! + End If + End If + End If + + DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("ZOLLDATEN", "VBD", tmp_filialenNr & tmp_abfertigungsNr, "", "", LRN.ToString.Replace("/", "-").Replace(",", "-").Replace("\", "-").Replace(":", "."), 0, False) + DS.da_vorlage = False + + Dim ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "MIC\ECHTSYSTEM\ZOLLDATEN\VBD\NOT_IDENTIFIED\" + If SPEDBUCH IsNot Nothing AndAlso SPEDBUCH.hasEntry Then ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "MIC\ECHTSYSTEM\ZOLLDATEN\VBD\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\" + If Not IO.Directory.Exists(ZIEL_PFAD) Then IO.Directory.CreateDirectory(ZIEL_PFAD) + + Dim destFull = "" + moveFile(pfad, ZIEL_PFAD, destFull) + + + + If DS.insertDataToDATENSERVER(destFull) Then + If SPEDBUCH IsNot Nothing AndAlso SPEDBUCH.hasEntry Then + SPEDBUCH.DokumentId_VBD = DS.da_id + SPEDBUCH.SAVE() + 'doMailZollbeleg(DS.GET_TOP1_PATH, "VBD", dy_id) + End If + End If + + ''ABD + ElseIf betreff.ToString.Contains("EAD FORWARDING EMAIL | ") Then + betreff = betreff.replace("WG: ", "") + betreff = betreff.replace("FW: ", "") + betreff = betreff.replace("EAD FORWARDING EMAIL | ", "") + betreff = betreff.trim + + Dim split = betreff.ToString.Split("|") + + Dim BEZUGSNUMMER = "" + For Each s In split + If s.Trim.StartsWith("BEZUGSNUMMER ") Then + BEZUGSNUMMER = s.Replace("BEZUGSNUMMER ", "").Trim + End If + + Next + + Dim tmp_filialenNr = "" + Dim tmp_abfertigungsNr = "" + + Dim SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch = Nothing + If BEZUGSNUMMER.ToString.Length >= 13 And BEZUGSNUMMER.ToString.Replace("-", "/").Contains("/") Then + Dim sp = BEZUGSNUMMER.ToString.Replace("-", "/").Split("/") + If sp(0).Length = 4 And sp(1).Length >= 8 Then + tmp_filialenNr = sp(0) + tmp_abfertigungsNr = sp(1).Substring(0, 8) + If IsNumeric(tmp_filialenNr) And IsNumeric(tmp_abfertigungsNr) Then + SPEDBUCH = New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(tmp_filialenNr, tmp_abfertigungsNr) + insertIntoSpedBuch_MIC(tmp_filialenNr, tmp_abfertigungsNr, "", BEZUGSNUMMER, SPEDBUCH, "") + End If + End If + End If + + DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("ZOLLDATEN", "ABD", tmp_filialenNr & tmp_abfertigungsNr, "", "", BEZUGSNUMMER.ToString.Replace("/", "-").Replace(",", "-").Replace("\", "-").Replace(":", "."), 0, False) + DS.da_vorlage = False + + Dim ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "MIC\ECHTSYSTEM\ZOLLDATEN\ABD\NOT_IDENTIFIED\" + If SPEDBUCH IsNot Nothing AndAlso SPEDBUCH.hasEntry Then ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "MIC\ECHTSYSTEM\ZOLLDATEN\ABD\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\" + If Not IO.Directory.Exists(ZIEL_PFAD) Then IO.Directory.CreateDirectory(ZIEL_PFAD) + + Dim destFull = "" + moveFile(pfad, ZIEL_PFAD, destFull) + + If DS.insertDataToDATENSERVER(destFull) Then + If SPEDBUCH IsNot Nothing AndAlso SPEDBUCH.hasEntry Then + SPEDBUCH.DokumentId_ABD = DS.da_id + SPEDBUCH.SAVE() + 'doMailZollbeleg(DS.GET_TOP1_PATH, "ABD", dy_id) + End If + End If + + 'AVM + ElseIf betreff.ToString.Contains("AVM - Ausgangsvermerk (DE), ") Then + betreff = betreff.replace("WG: ", "") + betreff = betreff.replace("FW: ", "") + betreff = betreff.replace("AVM - Ausgangsvermerk (DE), ", "") + If betreff.ToString.Contains(",") Then + Dim sp = betreff.ToString.Split(",") + betreff = sp(0).Trim + + Dim dy_id As String = "" + If betreff.ToString.Length > 15 Then + dy_id = sql.getValueTxtBySql("SELECT isnull(aes_dyaAnmID,-1) FROM [tblDakosy_AES] inner join tblDakosy_Zollanmeldungen on dy_id=aes_dyaAnmID where '" & betreff.ToString.Trim & "' LIKE aes_ObjectName +'%' and LEN(aes_ObjectName)>=13", "FMZOLL") + Else + dy_id = sql.getValueTxtBySql("SELECT isnull(aes_dyaAnmID,-1) FROM [tblDakosy_AES] inner join tblDakosy_Zollanmeldungen on dy_id=aes_dyaAnmID where aes_ObjectName='" & betreff.ToString.Trim & "'", "FMZOLL") + End If + ' IO.Directory.CreateDirectory(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\TEST3\") + + DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("ZOLLDATEN", "AVM", dy_id, "", "", betreff.ToString.Replace("/", "-").Replace(",", "-").Replace("\", "-").Replace(":", "."), 0, False) + DS.da_vorlage = False + + Dim ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\AVM\NOT_IDENTIFIED\" + If IsNumeric(dy_id) AndAlso dy_id > 0 Then ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\AVM\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\" + If Not IO.Directory.Exists(ZIEL_PFAD) Then IO.Directory.CreateDirectory(ZIEL_PFAD) + + Dim destFull = "" + moveFile(pfad, ZIEL_PFAD, destFull) + + If DS.insertDataToDATENSERVER(destFull) Then + If IsNumeric(dy_id) AndAlso dy_id > 0 Then + sql.doSQL("UPDATE tblDakosy_Zollanmeldungen SET dy_AVM_dsId='" & DS.da_id & "' where dy_id='" & dy_id & "'", "FMZOLL") + sql.doSQL("UPDATE Speditionsbuch SET DokumentId_AVM='" & DS.da_id & "' where AtlasBezNrEZA='" & betreff.ToString.Trim & "' AND DokumentId_AVM is null", "FMZOLL") 'Falls Spedbuch schon zuvor generiert wurde! + doMailZollbeleg(DS.GET_TOP1_PATH, "AVM", dy_id) + End If + End If + + End If + End If + + ' GENERELLES NOT IDENTIFIED!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + + + + '"""""""""""" + ' If Not alreadyMoved Then + + ' End If + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + End Try + + End Sub + + + Function insertIntoSpedBuch_MIC(FilialenNr As Integer, AbfertigungsNr As Integer, AtlasBezNrNCTS As String, AtlasBezNrEZA As String, ByRef SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, MRN As String) As Boolean + 'Dim SPEDBUCH As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch + + Dim firmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(FilialenNr) + If Not SPEDBUCH.hasEntry Then 'countSpedbuchEntrysFilialeAbf(FilialenNr, AbfertigungsNr) = 0 Then + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.sendERRORperMail("HEUREKA EZA ", "" & Me.eza_ObjectName, Now.ToString("yyyy.MM.dd HH:mm"), "al@verag.ag", "") + SPEDBUCH.FilialenNr = FilialenNr + SPEDBUCH.AbfertigungsNr = AbfertigungsNr + SPEDBUCH.NewUNTER_NR() + + SPEDBUCH.Abfertigungsanzahl = 1 + SPEDBUCH.Fakturiert = 0 + SPEDBUCH.AtlasBezNrEZA = AtlasBezNrEZA + SPEDBUCH.AtlasBezNrNCTS = AtlasBezNrNCTS + SPEDBUCH.Zollsystem = "D" + SPEDBUCH.Sachbearbeiter = "AUTO" + SPEDBUCH.BelegNr = MRN + + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + SPEDBUCH.AvisoID = SQL.DLookup("tblSnd_AvisoID", "tblSendungen", " FilialenNr='" & FilialenNr & "' and AbfertigungsNr='" & AbfertigungsNr & "' ", "AVISO", 0) + SPEDBUCH.SendungID = SQL.DLookup("tblSnd_SendungID", "tblSendungen", " FilialenNr='" & FilialenNr & "' and AbfertigungsNr='" & AbfertigungsNr & "' ", "AVISO", 0) + + Dim ZOLL_IMPORT As New DAKOSY_Worker.cZOLL_IMPORT + + Dim notfound = False + Dim posAnzahl = 0 + Dim filialeBez = "" + SPEDBUCH = ZOLL_IMPORT.IMPORT(SPEDBUCH, SPEDBUCH.AvisoID, SPEDBUCH.SendungID, "VERA", filialeBez, 2, AtlasBezNrEZA, "", notfound, True) + + If notfound Then Return False + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.sendERRORperMail("HEUREKA EZA !!", "" & Me.eza_ObjectName, Now.ToString("yyyy.MM.dd HH:mm"), "al@verag.ag", "") + + ' MsgBox(SPEDBUCH.FilialenNr & " - " & SPEDBUCH.AbfertigungsNr) + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firmaTmp + + If SPEDBUCH.SAVE Then + VERAG_PROG_ALLGEMEIN.cSendungen.SET_SpedbuchEntry(SPEDBUCH.SendungID, True) + Return True + Else + Return False + End If + + End If + Return False + + End Function + + + 'Function countSpedbuchEntrysFilialeAbf(filiale, abfertigungsnummer) As Integer + ' Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + ' If If(abfertigungsnummer, "") = "" Then Return 0 + ' Return Sql.getValueTxtBySqlVarList("SELECT isnull(count(*),0) FROM Speditionsbuch WHERE [FilialenNr]='" & filiale & "' AND AbfertigungsNr='" & abfertigungsnummer & "'", "FMZOLL") + 'End Function + + Sub importFileFromDyMailAnhang(pfad, betreff) @@ -766,9 +1008,9 @@ Public Class frmStartOptions If Not IO.File.Exists(file) Then Return False If Not IO.Directory.Exists(toDirectory) Then IO.Directory.CreateDirectory(toDirectory) dest = toDirectory & ".tmp_" & cut_file(file) - If IO.File.Exists(dest) Then + While IO.File.Exists(dest) Or IO.File.Exists(dest).ToString.Replace(".tmp_", "") 'wenn mit oder ohen .tmp_ existiert... dest = toDirectory & ".tmp_" & Now.ToString("yyMMdd_HHmmss.fff_") & cut_file(file) - End If + End While IO.File.Copy(file, dest) ' Verschiebt die Datei IO.File.Move(dest, dest.ToString.Replace(".tmp_", "")) ' Umbenennen der Datei --> der "." am Anfang dient dazu, dass die Datei nicht abgegriffen wird, während sie kopiert wird! dest = dest.ToString.Replace(".tmp_", "") @@ -874,7 +1116,73 @@ Public Class frmStartOptions Function getUID_Pruefung(maxAnz As Integer) As Boolean + getUID_Pruefung(maxAnz, "VERAG", "UID Prüfung VERAG", "mm@verag.ag;la@verag.ag", "al@verag.ag") + getUID_Pruefung(maxAnz, "IMEX", "UID Prüfung IMEX", "Viktoria.Leirich@imex-group.at;la@verag.ag", "al@verag.ag") + getUID_Pruefung(maxAnz, "AMBAR", "UID Prüfung AMBAR", "la@verag.ag", "al@verag.ag") + getUID_Pruefung(maxAnz, "UNISPED", "UID Prüfung UNISPED", "al@verag.ag", "al@verag.ag") + 'getUID_Pruefung(maxAnz, "VERAG", "UID Prüfung VERAG", "mm@verag.ag;la@verag.ag", "al@verag.ag") + + End Function + + Function getUID_Pruefung(maxAnz As Integer, Mail_FIMRA As String, Mail_betreff As String, Mail_To As String, Optional Mail_CC As String = "", Optional Mail_BCC As String = "") As Boolean + Dim firmatmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Try + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = Mail_FIMRA + Dim dt = VERAG_PROG_ALLGEMEIN.cUIDPruefung.doUIDPruefungALL(CDate(Now.ToString("01.MM.yyyy")).AddMonths(-1), True, False, maxAnz, False) + If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + Dim PDF = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False) + If PDF <> "" Then + Dim list As New List(Of String) + list.Add(PDF) + Dim Body = "Anbei befinden sich die Auflistung der geprüfen UID-Nummern.
Bei UID-Nummer mit dem Prüfungserbnis 'OK' wurde das Prüfdatum in den Kundenstamm eingetragen. " + Body &= "
Ungültige UID-Nummern bitte manuell bearbeiten!" + Body &= "

Erstellt am: " & Now.ToShortDateString & ", um " & Now.ToShortTimeString + Body &= "

Automatisch generiertes E-Mail." + + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mail_To, Mail_betreff, Body,,, False, Mail_CC, Mail_BCC, list) + ' VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "UID Prüfung", Body,,, False, ,, list) + End If + End If + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firmatmp + Return True + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firmatmp + MsgBox(ex.Message & ex.StackTrace) + Return False + End Try + + End Function + Function getUID_PruefungVERAG(maxAnz As Integer) As Boolean + Dim firmatmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Try + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" + Dim dt = VERAG_PROG_ALLGEMEIN.cUIDPruefung.doUIDPruefungALL(CDate(Now.ToString("01.MM.yyyy")).AddMonths(-1), True, False, maxAnz, False) + If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + Dim PDF = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False) + If PDF <> "" Then + Dim list As New List(Of String) + list.Add(PDF) + Dim Body = "Anbei befinden sich die Auflistung der geprüfen UID-Nummern.
Bei UID-Nummer mit dem Prüfungserbnis 'OK' wurde das Prüfdatum in den Kundenstamm eingetragen. " + Body &= "
Ungültige UID-Nummern bitte manuell bearbeiten!" + Body &= "

Erstellt am: " & Now.ToShortDateString & ", um " & Now.ToShortTimeString + Body &= "

Automatisch generiertes E-Mail." + + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("mm@verag.ag;la@verag.ag", "UID Prüfung VERAG", Body,,, False, "al@verag.ag",, list) + ' VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "UID Prüfung", Body,,, False, ,, list) + End If + End If + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firmatmp + Return True + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firmatmp + MsgBox(ex.Message & ex.StackTrace) + Return False + End Try + End Function + Function getUID_PruefungIMEX(maxAnz As Integer) As Boolean + Dim firmatmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Try + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Dim dt = VERAG_PROG_ALLGEMEIN.cUIDPruefung.doUIDPruefungALL(CDate(Now.ToString("01.MM.yyyy")).AddMonths(-1), True, False, maxAnz, False) If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then @@ -883,21 +1191,50 @@ Public Class frmStartOptions Dim list As New List(Of String) list.Add(PDF) Dim Body = "Anbei befinden sich die Auflistung der geprüfen UID-Nummern.
Bei UID-Nummer mit dem Prüfungserbnis 'OK' wurde das Prüfdatum in den Kundenstamm eingetragen. " - Body &= "
Ungültige UID-Nummern bitte manuell bearbeiten!" + Body &= "
Ungültige UID-Nummern bitte manuell bearbeiten!" Body &= "

Erstellt am: " & Now.ToShortDateString & ", um " & Now.ToShortTimeString Body &= "

Automatisch generiertes E-Mail." - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("cw@verag.ag;mm@verag.ag", "UID Prüfung", Body,,, False, "al@verag.ag",, list) + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("Viktoria.Leirich@imex-group.at;la@verag.ag", "UID Prüfung IMEX", Body,,, False, "al@verag.ag",, list) ' VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "UID Prüfung", Body,,, False, ,, list) End If End If + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firmatmp Return True Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firmatmp MsgBox(ex.Message & ex.StackTrace) Return False End Try End Function + Function getUID_PruefungAMBAR(maxAnz As Integer) As Boolean + Dim firmatmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Try + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" + Dim dt = VERAG_PROG_ALLGEMEIN.cUIDPruefung.doUIDPruefungALL(CDate(Now.ToString("01.MM.yyyy")).AddMonths(-1), True, False, maxAnz, False) + If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + Dim PDF = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False) + If PDF <> "" Then + Dim list As New List(Of String) + list.Add(PDF) + Dim Body = "Anbei befinden sich die Auflistung der geprüfen UID-Nummern.
Bei UID-Nummer mit dem Prüfungserbnis 'OK' wurde das Prüfdatum in den Kundenstamm eingetragen. " + Body &= "
Ungültige UID-Nummern bitte manuell bearbeiten!" + Body &= "

Erstellt am: " & Now.ToShortDateString & ", um " & Now.ToShortTimeString + Body &= "

Automatisch generiertes E-Mail." + + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("la@verag.ag", "UID Prüfung AMBAR", Body,,, False, "al@verag.ag",, list) + ' VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "UID Prüfung", Body,,, False, ,, list) + End If + End If + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firmatmp + Return True + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firmatmp + MsgBox(ex.Message & ex.StackTrace) + Return False + End Try + End Function Function getEZB_Waehrungskurse90D() As Boolean Dim MyData As String = "" @@ -1167,7 +1504,7 @@ Public Class frmStartOptions Private Sub LinkLabel20_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel20.LinkClicked VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False - Dim bool = getUID_Pruefung(MyTextBox1.Text) + Dim bool = getUID_PruefungVERAG(MyTextBox1.Text) showPic(bool, PictureBox12) End Sub @@ -1268,11 +1605,29 @@ Public Class frmStartOptions End Sub Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click + Dim ftmp As Object = If(IsNumeric(txtVRGOut_FilialenNr.Text.Trim), txtVRGOut_FilialenNr.Text, Nothing) + Dim atmp As Object = If(IsNumeric(txtVRGOut_AbfertigungsNr.Text.Trim), txtVRGOut_AbfertigungsNr.Text, Nothing) + + Dim BezugsNr = txtVRGOut_BezugsNr.Text + If txtVRGOut_BezugsNr.Text.Trim = "" And txtVRGOut_MRN.Text <> "" Then + + Select Case MyComboBox1._value + Case "DY" : BezugsNr = cVERAG_out_ncts.getBezugnNr_ByMRN(txtVRGOut_MRN.Text) + Case "TC" : BezugsNr = TELOTEC_Worker.cTelotec_Anmeldung.getBezugnNr_ByMRN(txtVRGOut_MRN.Text) + Case "DHF" : BezugsNr = cVERAG_out_ncts.getLRN_ByCRN(txtVRGOut_MRN.Text) + End Select + + End If + If BezugsNr = "" Then + MsgBox("Bezugsnummer leer!") + Exit Sub + End If + Dim ok As Boolean = False Select Case MyComboBox1._value - Case "DY" : ok = cVERAG_out_ncts.copyFileFTP_VERAGncts_DY_ByBezugsNr(txtVRGOut_BezugsNr.Text, getISett) - Case "TC" : ok = cVERAG_out_ncts.copyFileFTP_VERAGncts_TC_ByBezugsNr(txtVRGOut_BezugsNr.Text, getISett) - Case "DHF" : ok = cVERAG_out_ncts.copyFileFTP_VERAGncts_EZOLL_ByBezugsNr(txtVRGOut_BezugsNr.Text, getISett) + Case "DY" : ok = cVERAG_out_ncts.copyFileFTP_VERAGncts_DY_ByBezugsNr(BezugsNr, getISett, ftmp, atmp) + Case "TC" : ok = cVERAG_out_ncts.copyFileFTP_VERAGncts_TC_ByBezugsNr(BezugsNr, getISett, ftmp, atmp) + Case "DHF" : ok = cVERAG_out_ncts.copyFileFTP_VERAGncts_EZOLL_ByBezugsNr(BezugsNr, getISett, ftmp, atmp) End Select showPic(ok, PictureBox14) @@ -1491,4 +1846,38 @@ Public Class frmStartOptions VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox5.Checked 'False VERAG_PROG_ALLGEMEIN.cBMD_Interface.genDatensatzCSV_ALL(CheckBox4.Checked,, False) End Sub + + Private Sub LinkLabel32_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel32.LinkClicked + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + Dim bool = getUID_PruefungIMEX(MyTextBox1.Text) + showPic(bool, PictureBox12) + End Sub + Private Sub LinkLabel33_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel33.LinkClicked + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + Dim bool = getUID_PruefungAMBAR(MyTextBox1.Text) + showPic(bool, PictureBox12) + End Sub + + Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click + UPDATE_SMS() + End Sub + + Function UPDATE_SMS() As Boolean + Try + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Dim dt As DataTable = SQL.loadDgvBySql("SELECT * FROM tblSMS where sms_Status not IN(3,4) and sms_MessageIds is not null and sms_MessageIds not like 'https://api.esendex.com/%'", "FMZOLL") + If dt IsNot Nothing Then + For Each r In dt.Rows + Dim cSMS As New VERAG_PROG_ALLGEMEIN.cSMS(r("sms_id")) + cSMS.checkSMSStatus() + Next + End If + Return True + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name) + Return False + End Try + End Function + + End Class \ No newline at end of file diff --git a/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb index 6e2509b..56fa897 100644 --- a/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb @@ -12,6 +12,7 @@ Public Class frmTCNachrichtenVerarbeitung ' Dim DY_PFAD = "C:\Users\DEVELOPER1\Desktop\test\TEST\" Dim TELOTEC_PFAD = "" '"C:\Users\DEVELOPER1\Desktop\test\TEST\Nachrichtendaten_Einarbeitung\" + Dim TELOTEC_PFAD_VERAG = "" '"C:\Users\DEVELOPER1\Desktop\test\TEST\Nachrichtendaten_Einarbeitung\" Dim VERARBEITUNGS_PFAD = "" '"C:\Users\DEVELOPER1\Desktop\test\TEST\Nachrichtendaten_Einarbeitung\" Dim ZIEL_PFAD = "" '"C:\Users\DEVELOPER1\Desktop\test\TEST\Nachrichtendaten_Ablage\" Dim ERROR_PFAD = "" '"C:\Users\DEVELOPER1\Desktop\test\TEST\Nachrichtendaten_ERROR\" @@ -38,6 +39,7 @@ Public Class frmTCNachrichtenVerarbeitung Sub initPfade() Me.TELOTEC_PFAD = TELOTEC_Worker.cTC_Paramter.GET_PARAM_ByName("TELOTEC_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) + Me.TELOTEC_PFAD_VERAG = TELOTEC_Worker.cTC_Paramter.GET_PARAM_ByName("TELOTEC_PFAD_VERAG", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) Me.VERARBEITUNGS_PFAD = TELOTEC_Worker.cTC_Paramter.GET_PARAM_ByName("VERARBEITUNGS_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) 'VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\TESTSYSTEM\Nachrichtendaten_Einarbeitung\" Me.ZIEL_PFAD = TELOTEC_Worker.cTC_Paramter.GET_PARAM_ByName("ZIEL_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) @@ -59,6 +61,7 @@ Public Class frmTCNachrichtenVerarbeitung ListBox3.Items.Add(frmStartOptions.cut_file(d)) Me.Refresh() Next + End Sub Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click @@ -66,6 +69,7 @@ Public Class frmTCNachrichtenVerarbeitung Try Label9.Visible = True Dim cnt = getNachrichtenDatenFromTelotec() + cnt += getNachrichtenDatenFromTelotec_VERAG() Label9.Text = cnt & " Datensätze empfangen." Catch ex As Exception @@ -165,7 +169,34 @@ Public Class frmTCNachrichtenVerarbeitung 'Return cnt End Function + Function getNachrichtenDatenFromTelotec_VERAG() As Integer + Dim cnt = 0 + Try + For Each f In IO.Directory.GetFiles(TELOTEC_PFAD_VERAG) + Dim FI As New FileInfo(f) + If Not FI.Name.StartsWith(".") Then + 'Temp. DownloadPfad + Dim destFilenameTMP = VERARBEITUNGS_PFAD + "." & If(IO.File.Exists(VERARBEITUNGS_PFAD & "." & FI.Name), Now.ToString("yyMMdd_HHmmss.fff_"), "") & FI.Name + 'Datei herunterladen + IO.File.Copy(f, destFilenameTMP) + If IO.File.Exists(destFilenameTMP) Then IO.File.Delete(f) 'Datei nach erfolgreichem Herunterladen vom Server löschen + + 'Gültiger Filename + Dim destFilename = VERARBEITUNGS_PFAD & If(IO.File.Exists(VERARBEITUNGS_PFAD & FI.Name), Now.ToString("yyMMdd_HHmmss.fff_"), "") & FI.Name + IO.File.Move(destFilenameTMP, destFilename) 'Datei umbenennen + + Dim fi_dest As FileInfo = New FileInfo(destFilename) + ListBox3.Items.Add(frmStartOptions.cut_file(fi_dest.Name)) 'zur Liste hinzufügen + cnt += 1 + End If + Next + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + Return cnt + End Function @@ -204,7 +235,14 @@ Public Class frmTCNachrichtenVerarbeitung Return (character = 9 OrElse character = 10 OrElse character = 13 OrElse (character >= 32 AndAlso character <= 55295) OrElse (character >= 57344 AndAlso character <= 65533) OrElse (character >= 65536 AndAlso character <= 1114111)) End Function + Private Function getFilesInOrder() As String() + Dim myDirectory As New IO.DirectoryInfo(VERARBEITUNGS_PFAD) + 'Dim myfiles() As String = myDirectory.GetFiles.OrderBy(Function(x) x.LastWriteTime).Select(Function(x) x.FullName).Take(40).ToArray + Dim myfiles() As String = myDirectory.GetFiles.OrderBy(Function(x) x.CreationTime).Select(Function(x) x.FullName).ToArray + ' Dim myfiles As FileInfo() = myDirectory.GetFiles().OrderBy(Function(p) p.CreationTime).Select(Function(x) x.FullName).ToArray + Return myfiles + End Function Sub DatenEinlesen() @@ -216,57 +254,60 @@ Public Class frmTCNachrichtenVerarbeitung Exit Sub End If - For Each d In System.IO.Directory.GetFiles(VERARBEITUNGS_PFAD) + For Each d In getFilesInOrder() 'System.IO.Directory.GetFiles(VERARBEITUNGS_PFAD) + Try Dateiname = d cWorker_NCTS.Dateiname = d If IO.File.Exists(d) Then Dim found = False Dim fi As FileInfo = New FileInfo(d) + If Not fi.Name.StartsWith(".") Then - ' EDIFACT - ' If fi.Extension = ".edi" Then - Dim alreadyMoved = False - If fi.Extension = ".xml" Then - Dim xmlWriterSettings As XmlWriterSettings = New XmlWriterSettings With {.Encoding = System.Text.Encoding.UTF8, .CheckCharacters = True} + ' EDIFACT + ' If fi.Extension = ".edi" Then + Dim alreadyMoved = False + If fi.Extension = ".xml" Then + Dim xmlWriterSettings As XmlWriterSettings = New XmlWriterSettings With {.Encoding = System.Text.Encoding.UTF8, .CheckCharacters = True} - Dim doc As New XmlDocument() - Dim XML_Code = System.IO.File.ReadAllText(d, System.Text.UTF8Encoding.Default) + Dim doc As New XmlDocument() + Dim XML_Code = System.IO.File.ReadAllText(d, System.Text.UTF8Encoding.Default) - doc.LoadXml(SanitizeXmlString(XML_Code)) - Dim VERSION As String = "" + doc.LoadXml(SanitizeXmlString(XML_Code)) + Dim VERSION As String = "" - '------------------------------------------------------------------------------------------------------------------------------ - ' eZOLL - '------------------------------------------------------------------------------------------------------------------------------ + '------------------------------------------------------------------------------------------------------------------------------ + ' eZOLL + '------------------------------------------------------------------------------------------------------------------------------ - '------------------------------------------ - '------------------ Anmeldung ------------------ - '------------------------------------------ - 'TC: Versandbestätigung - If Not found And cGetMsgType.isTC_Anmeldung(doc) Then - If readTC_Anmeldung(doc, d) <> "" Then found = True - ' If bezugsNr <> "" Then addDGVEinarbeitung("NCTS: Versandbestätigung", bezugsNr) : found = True - End If - - End If - - If True Then - If Not alreadyMoved Then - If found Then - If Not IO.Directory.Exists(ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") Then IO.Directory.CreateDirectory(ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") - frmStartOptions.moveFile(d, ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") - Else - frmStartOptions.moveFile(d, ERROR_PFAD) + '------------------------------------------ + '------------------ Anmeldung ------------------ + '------------------------------------------ + 'TC: Versandbestätigung + If Not found And cGetMsgType.isTC_Anmeldung(doc) Then + If readTC_Anmeldung(doc, d) <> "" Then found = True + ' If bezugsNr <> "" Then addDGVEinarbeitung("NCTS: Versandbestätigung", bezugsNr) : found = True End If + End If - End If + If True Then + If Not alreadyMoved Then + If found Then + If Not IO.Directory.Exists(ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") Then IO.Directory.CreateDirectory(ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") + frmStartOptions.moveFile(d, ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") + Else + frmStartOptions.moveFile(d, ERROR_PFAD) + End If + End If - Me.Refresh() - If found Then cntDatenEingelesen += 1 Else dsNichtErkannt += 1 + End If + + Me.Refresh() + If found Then cntDatenEingelesen += 1 Else dsNichtErkannt += 1 + End If End If Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -544,8 +585,11 @@ Public Class frmTCNachrichtenVerarbeitung End Select 'Derzeit nur IMEX - TC.telanm_firma = "IMEX" - TC.telanm_niederlassung = "Sub" + TC.telanm_firma = vifDEC.Mandant_ID.ToUpper '"IMEX" + If TC.telanm_BezugsNr.ToString.StartsWith("5501") Then + TC.telanm_firma = "IMEX" 'VERAG WO + End If + TC.telanm_niederlassung = "SUB" TC.telanm_Erstellung = Now TC.telanm_LetzteBearbeitung = Now