diff --git a/ADMINUPDATER/UPDATERfrm.vb b/ADMINUPDATER/UPDATERfrm.vb index 930ce83..fe969d9 100644 --- a/ADMINUPDATER/UPDATERfrm.vb +++ b/ADMINUPDATER/UPDATERfrm.vb @@ -16,13 +16,13 @@ Public Class UPDATERfrm Dim F As String = "F:\Programme\ADMIN\" ' WDH TERM - Dim F_PROD As String = "\\192.168.0.91\f\Programme\ADMIN\" ' VERAG + Dim F_PROD As String = "\\share01\Programme\ADMIN\" ' VERAG ' Dim F As String = "\\192.168.0.90\f\Programme\ADMIN\" 'DEVELOPER Dim F_ATILLA As String = "\\172.16.0.99\Daten\Programme\ADMIN\" ' ATILLA Dim F_IMEX As String = "\\192.168.1.20\Daten\VERAG Programme\ADMIN\" ' IMEX Public Sub Main() - + Dim FIRMA = "VERAG" Dim pfadDatei As String = System.AppDomain.CurrentDomain.BaseDirectory & "\Standort.txt" FIRMA = "VERAG" diff --git a/DAKOSY_Worker/cDakosyFunftions.vb b/DAKOSY_Worker/cDakosyFunftions.vb index 696e5f6..64b4994 100644 --- a/DAKOSY_Worker/cDakosyFunftions.vb +++ b/DAKOSY_Worker/cDakosyFunftions.vb @@ -113,7 +113,7 @@ Public Class cDakosyFunftions Shared Sub getSFTPLoginData(ByRef DY_server, ByRef DY_name, ByRef DY_pwd, ByRef DY_port, ByRef DY_PFAD_IN, ByRef DY_PFAD_OUT, ByRef DY_PFAD_IN_KD, FIRMA_DY) - If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then + If False Then 'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then DY_server = cDY_Paramter.GET_PARAM_ByName("FTP_TEST_SERVER", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, FIRMA_DY) DY_name = cDY_Paramter.GET_PARAM_ByName("FTP_TEST_NAME", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, FIRMA_DY) DY_pwd = cDY_Paramter.GET_PARAM_ByName("FTP_TEST_PASSWORD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, FIRMA_DY) diff --git a/DAKOSY_Worker/cZOLL_IMPORT.vb b/DAKOSY_Worker/cZOLL_IMPORT.vb index bc3e8e4..fdff797 100644 --- a/DAKOSY_Worker/cZOLL_IMPORT.vb +++ b/DAKOSY_Worker/cZOLL_IMPORT.vb @@ -530,6 +530,11 @@ Public Class cZOLL_IMPORT If SPEDITIONSBUCH.Abfertigungsanzahl = 0 Then SPEDITIONSBUCH.Abfertigungsanzahl = SENDUNG.tblSnd_anzahlHandling If SPEDITIONSBUCH.PersonalnummerQS <= 0 Then SPEDITIONSBUCH.PersonalnummerQS = SENDUNG.tblSnd_QS_MA + If SENDUNG.tblSnd_FilialeAbklaerung IsNot Nothing AndAlso IsNumeric(SENDUNG.tblSnd_FilialeAbklaerung) AndAlso SENDUNG.tblSnd_FilialeAbklaerung > 0 Then + SPEDITIONSBUCH.FilialenNrAbklaerung = SENDUNG.tblSnd_FilialeAbklaerung + 'Else + ' SPEDITIONSBUCH.FilialenNrHandling = SPEDITIONSBUCH.FilialenNr + End If SENDUNG.LOAD_ABRECHNUNG() Dim FindPOS = SENDUNG.ABRECHNUNG.Find(Function(x) x.sndabr_beteiligter = "AUFTR" And x.sndabr_wert = "ERSTATTUNG") diff --git a/DienstplanTV/My Project/Resources.Designer.vb b/DienstplanTV/My Project/Resources.Designer.vb index 0a15f92..886b2f3 100644 --- a/DienstplanTV/My Project/Resources.Designer.vb +++ b/DienstplanTV/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ @@ -61,7 +61,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die Data Source=BUCHHALTUNG\SQLEXPRESS;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=sa;Password=BmWr501956; ähnelt. ''' Friend ReadOnly Property connStringAdmin() As String Get diff --git a/DienstplanTV/My Project/Resources.resx b/DienstplanTV/My Project/Resources.resx index 565f754..fb75d72 100644 --- a/DienstplanTV/My Project/Resources.resx +++ b/DienstplanTV/My Project/Resources.resx @@ -118,6 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Data Source=BUCHHALTUNG\SQLEXPRESS;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=sa;Password=BmWr501956; \ No newline at end of file diff --git a/MailSender/App.config b/MailSender/App.config index bae5d6d..9d2c7ad 100644 --- a/MailSender/App.config +++ b/MailSender/App.config @@ -1,6 +1,6 @@ - + diff --git a/MailSender/MAILSender.vb b/MailSender/MAILSender.vb index 18ba4df..67eaa95 100644 --- a/MailSender/MAILSender.vb +++ b/MailSender/MAILSender.vb @@ -11,32 +11,33 @@ Module Mail Dim last_sent As String = sPath & "last_sent.txt" '" & Now.ToString("ddMMyyyyHHmmss") & ".csv" Dim betragOpTr = 1000 Sub Main() + Try + VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL - - 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 - PARAM = parameter(1) - 'For i = 1 To parameter.Count - 1 - ' 'If parameter(i) = "HISTORY" Then PARAM = True - ' Next - End If + 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 + PARAM = parameter(1) + 'For i = 1 To parameter.Count - 1 + ' 'If parameter(i) = "HISTORY" Then PARAM = True + ' Next + End If - System.Console.WriteLine("MailSender gestartet ...") - ' If IO.File.Exists(options) Then + System.Console.WriteLine("MailSender gestartet ...") + ' If IO.File.Exists(options) Then - 'If Not IO.File.Exists(last_sent) Then - 'IO.File.Create(last_sent) - ' End If + 'If Not IO.File.Exists(last_sent) Then + 'IO.File.Create(last_sent) + ' End If - ' Dim o As String = getOption() - If PARAM = "" Then - System.Console.WriteLine("OPTION nicht erkannt!") - Exit Sub - End If - Dim cnt = 0 - ' MsgBox(DoesProcessExists("MailSender")) - While DoesProcessExists("MailSender") Or cnt > 20 + ' Dim o As String = getOption() + If PARAM = "" Then + System.Console.WriteLine("OPTION nicht erkannt!") + Exit Sub + End If + 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 @@ -177,7 +178,13 @@ Module Mail System.Console.WriteLine("Programm beendet in 2") Threading.Thread.Sleep(1000) System.Console.WriteLine("Programm beendet in 1") - Threading.Thread.Sleep(1000) + Threading.Thread.Sleep(1000) + + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + + End Try End Sub Function getOption() As String @@ -940,11 +947,22 @@ Module Mail Dim von = CDate("01." & Now.AddMonths(-1).Month & "." & Now.AddMonths(-1).Year) Dim bis = CDate("01." & Now.Month & "." & Now.Year).AddDays(-1) - sqlstr &= " SELECT Aviso.[Grenzstelle], SUM(Speditionsbuch.Abfertigungsanzahl) as Anzahl FROM Speditionsbuch INNER JOIN [BUCHHALTUNG\SQLEXPRESS].AVISO.dbo.AVISO on Aviso.avisoid=Speditionsbuch.AvisoID WHERE PersonalnummerQS is not null " + 'sqlstr &= " SELECT Aviso.[Grenzstelle], SUM(Speditionsbuch.Abfertigungsanzahl) as Anzahl FROM Speditionsbuch INNER JOIN [SQLGUIDE01.verag.ost.dmn].AVISO.dbo.AVISO on Aviso.avisoid=Speditionsbuch.AvisoID " + 'sqlstr &= " WHERE PersonalnummerQS is not null " + 'sqlstr &= " and FilialenNr NOT IN ( 4801,4806,5501 ) " + 'sqlstr &= " and Abfertigungsdatum between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' " & + ' " GROUP BY Aviso.[Grenzstelle]" & + ' " ORDER BY Anzahl DESC" + + sqlstr &= " SELECT [Grenzstelle], SUM(Speditionsbuch.Abfertigungsanzahl) as Anzahl FROM Speditionsbuch " + sqlstr &= " WHERE FilialenNrAbklaerung ='4803' " 'QS SUB + ' sqlstr &= " WHERE Filiale " sqlstr &= " and FilialenNr NOT IN ( 4801,4806,5501 ) " + sqlstr &= " and Abfertigungsdatum between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' " & - " GROUP BY Aviso.[Grenzstelle]" & + " GROUP BY [Grenzstelle]" & " ORDER BY Anzahl DESC" + Dim dt As DataTable = loadDgvBySqlFMZOLL(sqlstr) Dim exclApp As Object 'as Application @@ -996,10 +1014,17 @@ Module Mail Dim von = CDate("01." & Now.AddMonths(-1).Month & "." & Now.AddMonths(-1).Year) Dim bis = CDate("01." & Now.Month & "." & Now.Year).AddDays(-1) - sqlstr &= " SELECT Aviso.[Grenzstelle], SUM(Speditionsbuch.Abfertigungsanzahl) as Anzahl FROM Speditionsbuch INNER JOIN [BUCHHALTUNG\SQLEXPRESS].AVISO.dbo.AVISO on Aviso.avisoid=Speditionsbuch.AvisoID WHERE Abfertigungsart IN (26,28) " - sqlstr &= " AND Aviso.[Grenzstelle] <> 'SFD' and FilialenNr NOT IN ( 4801,4806 ) " + 'sqlstr &= " SELECT Aviso.[Grenzstelle], SUM(Speditionsbuch.Abfertigungsanzahl) as Anzahl FROM Speditionsbuch INNER JOIN [SQLGUIDE01.verag.ost.dmn].AVISO.dbo.AVISO on Aviso.avisoid=Speditionsbuch.AvisoID WHERE Abfertigungsart IN (26,28) " + 'sqlstr &= " AND Aviso.[Grenzstelle] <> 'SFD' and FilialenNr NOT IN ( 4801,4806 ) " + 'sqlstr &= " and Abfertigungsdatum between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' " & + ' " GROUP BY Aviso.[Grenzstelle]" & + ' " ORDER BY Anzahl DESC" + + + sqlstr &= " SELECT [Grenzstelle], SUM(Speditionsbuch.Abfertigungsanzahl) as Anzahl FROM Speditionsbuch WHERE Abfertigungsart IN (26,28) " + sqlstr &= " AND [Grenzstelle] <> 'SFD' and FilialenNr NOT IN ( 4801,4806 ) " sqlstr &= " and Abfertigungsdatum between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' " & - " GROUP BY Aviso.[Grenzstelle]" & + " GROUP BY [Grenzstelle]" & " ORDER BY Anzahl DESC" Dim dt As DataTable = loadDgvBySqlFMZOLL(sqlstr) @@ -1084,7 +1109,7 @@ Module Mail sqlstr &= " SELECT count(*)" sqlstr &= " FROM tblEABelegnummer as EAB inner join tblEABelegposition as POS on EAB.Mandant=POS.Mandant and EAB.[Niederlassung]=POS.[Niederlassung] and EAB.[Benutzer]=POS.[Benutzer] and EAB.[BelegDat]=POS.[BelegDat] and EAB.[BelegNr]=POS.[BelegNr]" - sqlstr &= " where LeistungsNr=480 and [EAB].BelegDat between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' and gebucht=1 and storniert=0 " + sqlstr &= " where LeistungsNr=480 and [EAB].BelegDat between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' and gebucht=1 and storniert=0 and EAB.Mandant='IMEX' " Dim anzahl = 0 @@ -1303,9 +1328,9 @@ Module Mail Public Function loadDgvBySqlFMZOLL(ByVal sql As String) As DataTable Try Dim myTable = New DataTable() - Dim conn As New SqlConnection - conn.ConnectionString = "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;" - conn.Open() + Dim conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL + 'conn.ConnectionString = "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;" + 'conn.Open() Using cmd As New SqlCommand(sql, conn) Dim dr As SqlDataReader = cmd.ExecuteReader() @@ -1324,9 +1349,9 @@ Module Mail Public Function loadDgvBySqlSDL(ByVal sql As String) As DataTable Try Dim myTable = New DataTable() - Dim conn As New SqlConnection - conn.ConnectionString = "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=SDL;Integrated Security=false;User ID=test;Password=BmWr501956;" - conn.Open() + Dim conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL + 'conn.ConnectionString = "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=SDL;Integrated Security=false;User ID=test;Password=BmWr501956;" + 'conn.Open() Using cmd As New SqlCommand(sql, conn) Dim dr As SqlDataReader = cmd.ExecuteReader() diff --git a/MailSender/MailSender.vbproj b/MailSender/MailSender.vbproj index c747202..9887acc 100644 --- a/MailSender/MailSender.vbproj +++ b/MailSender/MailSender.vbproj @@ -11,12 +11,12 @@ MailSender 512 Console - v4.6.1 + v4.7 - AnyCPU + x86 true full true @@ -151,8 +151,6 @@ {6eb4d3a4-3cf2-4651-9af9-ad5f727df403} ADMIN - True - False diff --git a/ServerListender/AtlasAufschubDatenEinlesen.vb b/ServerListender/AtlasAufschubDatenEinlesen.vb index 3607321..437797a 100644 --- a/ServerListender/AtlasAufschubDatenEinlesen.vb +++ b/ServerListender/AtlasAufschubDatenEinlesen.vb @@ -141,7 +141,7 @@ Module AtlasAufschubDatenEinlesen Dim cn As New SqlConnection() - cn.ConnectionString = "Data Source=BUCHHALTUNG\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" + cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" cn.Open() Using cn Using cmd As New SqlCommand(sql, cn) diff --git a/UID/Mitarbeiter/frmMitarbDetails.vb b/UID/Mitarbeiter/frmMitarbDetails.vb index 3c05e76..9cf6b33 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.vb @@ -711,7 +711,7 @@ End Try Try - cboEZOLL_SB.fillWithSQL("SELECT [PersonalID],[UserID] FROM [ezoll].[dbo].[zzPersonal] ORDER BY UserID ", False, "EZOLL", True) + cboEZOLL_SB.fillWithSQL("SELECT [PersonalID],[UserID] FROM [zzPersonal] ORDER BY UserID ", False, "EZOLL", True) Catch ex As Exception MsgBox("EZOLL Problem") tbcntr.SelectedIndex = 0 diff --git a/UID/My Project/AssemblyInfo.vb b/UID/My Project/AssemblyInfo.vb index 069a3c0..3311ae4 100644 --- a/UID/My Project/AssemblyInfo.vb +++ b/UID/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/UID/My Project/Resources.Designer.vb b/UID/My Project/Resources.Designer.vb index 4936cd9..fabdff5 100644 --- a/UID/My Project/Resources.Designer.vb +++ b/UID/My Project/Resources.Designer.vb @@ -375,6 +375,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. + ''' + Friend ReadOnly Property hjhjkghjklghjkhz678678568() As String + Get + Return ResourceManager.GetString("hjhjkghjklghjkhz678678568", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -395,15 +404,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. - ''' - Friend ReadOnly Property llllllll() As String - Get - Return ResourceManager.GetString("llllllll", resourceCulture) - End Get - End Property - ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -644,7 +644,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 1.9.7 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 1.9.9 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/UID/My Project/Resources.resx b/UID/My Project/Resources.resx index c3fe943..6e15519 100644 --- a/UID/My Project/Resources.resx +++ b/UID/My Project/Resources.resx @@ -188,7 +188,7 @@ Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956; - 1.9.7 + 1.9.9 ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -298,7 +298,7 @@ ..\Resources\gear.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/usrctlProcedures.vb b/UID/usrctlProcedures.vb index ba45695..b718c3a 100644 --- a/UID/usrctlProcedures.vb +++ b/UID/usrctlProcedures.vb @@ -734,7 +734,7 @@ Public Class usrctlProcedures Dim dr As SqlDataReader Dim cn As New SqlConnection() - cn.ConnectionString = "Data Source=BUCHHALTUNG\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;" + cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;" cn.Open() @@ -788,7 +788,7 @@ Public Class usrctlProcedures Try Dim cn As New SqlConnection() - cn.ConnectionString = "Data Source=BUCHHALTUNG\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;" + cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;" cn.Open() Using cmd As New SqlCommand("SELECT COUNT(*) FROM [AVISO].[dbo].[Aviso] where [Ankunft] between @DatVon and @DatBis and Grenzstelle='SUB'", cn) @@ -1032,7 +1032,7 @@ Public Class usrctlProcedures Dim sql = "DELETE FROM Firmen WHERE FirmaID = '" & Blatt.Range("A" & index).Value.ToString & "'" Dim cn As New SqlConnection() - cn.ConnectionString = "Data Source=BUCHHALTUNG\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;" + cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;" cn.Open() Using cmd As New SqlCommand(sql, cn) Try diff --git a/VERAGMonitoring/App.config b/VERAGMonitoring/App.config index 3a327fa..5f70bbd 100644 --- a/VERAGMonitoring/App.config +++ b/VERAGMonitoring/App.config @@ -1,6 +1,6 @@ - + diff --git a/VERAGMonitoring/AtlasAufschubDatenEinlesen.vb b/VERAGMonitoring/AtlasAufschubDatenEinlesen.vb index 738863a..fef144a 100644 --- a/VERAGMonitoring/AtlasAufschubDatenEinlesen.vb +++ b/VERAGMonitoring/AtlasAufschubDatenEinlesen.vb @@ -105,7 +105,7 @@ Module AtlasAufschubDatenEinlesen Dim cn As New SqlConnection() - cn.ConnectionString = "Data Source=BUCHHALTUNG\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" + cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" cn.Open() Using cn Using cmd As New SqlCommand(sql, cn) diff --git a/VERAGMonitoring/My Project/Application.Designer.vb b/VERAGMonitoring/My Project/Application.Designer.vb index c530249..5bb92e1 100644 --- a/VERAGMonitoring/My Project/Application.Designer.vb +++ b/VERAGMonitoring/My Project/Application.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.34209 +' Laufzeitversion:4.0.30319.42000 ' ' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn ' der Code erneut generiert wird. @@ -14,8 +14,8 @@ Option Explicit On Namespace My - 'HINWEIS: Diese Datei wird automatisch generiert. Ändern Sie sie nicht direkt. Zum Ändern - ' oder bei in dieser Datei auftretenden Buildfehlern wechseln Sie zum Projekt-Designer. + 'HINWEIS: Diese Datei wird automatisch generiert und darf nicht direkt bearbeitet werden. Wenn Sie Änderungen vornehmen möchten + ' oder in dieser Datei Buildfehler auftreten, wechseln Sie zum Projekt-Designer. ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Mein Projekt" im ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor. ' diff --git a/VERAGMonitoring/My Project/Resources.Designer.vb b/VERAGMonitoring/My Project/Resources.Designer.vb index 024fea2..6048927 100644 --- a/VERAGMonitoring/My Project/Resources.Designer.vb +++ b/VERAGMonitoring/My Project/Resources.Designer.vb @@ -71,7 +71,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 1.2.7 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 1.3.1 ähnelt. ''' Friend ReadOnly Property version() As String Get diff --git a/VERAGMonitoring/My Project/Resources.resx b/VERAGMonitoring/My Project/Resources.resx index 876030b..2ef9b89 100644 --- a/VERAGMonitoring/My Project/Resources.resx +++ b/VERAGMonitoring/My Project/Resources.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 1.2.7 + 1.3.1 diff --git a/VERAGMonitoring/My Project/Settings.Designer.vb b/VERAGMonitoring/My Project/Settings.Designer.vb index eefeba5..af0b39a 100644 --- a/VERAGMonitoring/My Project/Settings.Designer.vb +++ b/VERAGMonitoring/My Project/Settings.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.34209 +' Laufzeitversion:4.0.30319.42000 ' ' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn ' der Code erneut generiert wird. @@ -15,21 +15,21 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) -#Region "Funktion zum automatischen Speichern von My.Settings" +#Region "Automatische My.Settings-Speicherfunktion" #If _MyType = "WindowsForms" Then Private Shared addedHandler As Boolean Private Shared addedHandlerLockObject As New Object _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) If My.Application.SaveMySettingsOnExit Then My.Settings.Save() End If diff --git a/VERAGMonitoring/VERAGMonitoring.vbproj b/VERAGMonitoring/VERAGMonitoring.vbproj index a9c8cca..fdc23e7 100644 --- a/VERAGMonitoring/VERAGMonitoring.vbproj +++ b/VERAGMonitoring/VERAGMonitoring.vbproj @@ -11,7 +11,7 @@ VERAGMonitoring 512 WindowsForms - v4.0 + v4.7 @@ -23,6 +23,7 @@ bin\Debug\ VERAGMonitoring.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + false AnyCPU @@ -33,6 +34,7 @@ bin\Release\ VERAGMonitoring.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + false On @@ -208,7 +210,12 @@ - + + + {a3b497bd-842c-4a2b-b398-ed1976849df1} + VERAG_PROG_ALLGEMEIN + + {2DF8D04C-5BFA-101B-BDE5-00AA0044DE52} diff --git a/VERAGMonitoring/cSqlDb.vb b/VERAGMonitoring/cSqlDb.vb index 86423aa..e639601 100644 --- a/VERAGMonitoring/cSqlDb.vb +++ b/VERAGMonitoring/cSqlDb.vb @@ -4,38 +4,38 @@ Imports System.Data.SqlClient Public Class cSqlDb - Public Shared Function GetNewOpenConnection() As SqlConnection - Dim cn As New SqlConnection() - cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" 'BUCHHALTUNG - cn.Open() - Return cn - End Function - Public Shared Function GetNewOpenConnectionFMZOLL() As SqlConnection - Dim cn As New SqlConnection() - cn.ConnectionString = "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;" ' FMZOLL - 'cn.ConnectionString = "Data Source=192.168.0.50\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;" 'DEVELOPER - cn.Open() - Return cn - End Function - Public Shared Function GetNewOpenConnectionZOLARIS() As SqlConnection - Dim cn As New SqlConnection() - cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=ezoll;Integrated Security=false;User ID=sa;Password=BmWr501956;" 'BUCHHALTUNG - cn.Open() - Return cn - End Function + ' Public Shared Function GetNewOpenConnectionADMIN() As SqlConnection + ' Dim cn As New SqlConnection() + ' cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" 'BUCHHALTUNG + ' cn.Open() + ' Return cn + ' End Function + ' Public Shared Function GetNewOpenConnectionFMZOLL() As SqlConnection + ' Dim cn As New SqlConnection() + ' cn.ConnectionString = "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;" ' FMZOLL + ' 'cn.ConnectionString = "Data Source=192.168.0.50\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;" 'DEVELOPER + ' cn.Open() + ' Return cn + ' End Function + ' Public Shared Function GetNewOpenConnectionZOLARIS() As SqlConnection + ' Dim cn As New SqlConnection() + ' cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=ezoll;Integrated Security=false;User ID=sa;Password=BmWr501956;" 'BUCHHALTUNG + ' cn.Open() + ' Return cn + ' End Function - Public Shared Function GetNewOpenConnectionAtlasSUB() As SqlConnection - Dim cn As New SqlConnection() - cn.ConnectionString = "Data Source=192.168.0.95\SQLATLAS;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=sa;" 'VERAG-ATLAS1 - cn.Open() - Return cn - End Function - Public Shared Function GetNewOpenConnectionAtlasSBG() As SqlConnection - Dim cn As New SqlConnection() - cn.ConnectionString = "Data Source=192.168.133.98;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=????;" 'verag-atlas3 - cn.Open() - Return cn - End Function + ' Public Shared Function GetNewOpenConnectionAtlasSUB() As SqlConnection + ' Dim cn As New SqlConnection() + ' cn.ConnectionString = "Data Source=192.168.0.95\SQLATLAS;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=sa;" 'VERAG-ATLAS1 + ' cn.Open() + ' Return cn + ' End Function + ' Public Shared Function GetNewOpenConnectionAtlasSBG() As SqlConnection + ' Dim cn As New SqlConnection() + ' cn.ConnectionString = "Data Source=192.168.133.98;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=????;" 'verag-atlas3 + ' cn.Open() + ' Return cn + ' End Function End Class @@ -49,7 +49,7 @@ Public Class cLogin Public Function getAktuelleVersion() As String Dim sql As String = "SELECT prog_aktuelleVersion FROM tblProgramme WHERE prog_codename=@codename" Dim dr As SqlDataReader - Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN() Using cmd As New SqlCommand(sql, conn) cmd.Parameters.AddWithValue("@codename", "MONITORING") dr = cmd.ExecuteReader() @@ -126,7 +126,7 @@ Public Class cBrgDb While True 'Endlosschleife; wird verlassen durch Return oder Application.Exit() Try Dim myTable = New DataTable() - Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN() Using cmd As New SqlCommand(sql & where, conn) cmd.Parameters.AddWithValue("@datumVon", datumVon) cmd.Parameters.AddWithValue("@datumBis", datumBis) @@ -150,7 +150,7 @@ Public Class cBrgDb Public Function loadDgv(sql As String) As DataTable Try Dim myTable = New DataTable() - Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN() Using cmd As New SqlCommand(sql, conn) Dim dr As SqlDataReader = cmd.ExecuteReader() myTable.Load(dr) @@ -170,7 +170,7 @@ Public Class cBrgDb Public Function delBrgAufschubEinzahlung(id As String) As Boolean Try Dim myTable = New DataTable() - Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN() Using cmd As New SqlCommand("DELETE FROM tblBrgAufschub WHERE brgak_id= '" & id & "'", conn) cmd.ExecuteReader() Return True @@ -193,7 +193,7 @@ Public Class cBrgDb While True 'Endlosschleife; wird verlassen durch Return oder Application.Exit() Try Dim myTable = New DataTable() - Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN() Using cmd As New SqlCommand(sql, conn) Dim dr As SqlDataReader = cmd.ExecuteReader() myTable.Load(dr) @@ -219,7 +219,7 @@ Public Class cBrgDb While True 'Endlosschleife; wird verlassen durch Return oder Application.Exit() Try Dim myTable = New DataTable() - Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL() Using cmd As New SqlCommand(sql, conn) Dim dr As SqlDataReader = cmd.ExecuteReader() myTable.Load(dr) @@ -243,7 +243,7 @@ Public Class cBrgDb While True 'Endlosschleife; wird verlassen durch Return oder Application.Exit() Try Dim myTable = New DataTable() - Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL() Using cmd As New SqlCommand(sql, conn) Dim dr As SqlDataReader = cmd.ExecuteReader() myTable.Load(dr) @@ -269,7 +269,7 @@ Public Class cBrgDb While True 'Endlosschleife; wird verlassen durch Return oder Application.Exit() Try Dim myTable = New DataTable() - Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL() Using cmd As New SqlCommand(sql, conn) Dim dr As SqlDataReader = cmd.ExecuteReader() myTable.Load(dr) @@ -298,7 +298,36 @@ Public Class cBrgDb While True 'Endlosschleife; wird verlassen durch Return oder Application.Exit() Try Dim myTable = New DataTable() - Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand(sql, conn) + Dim dr As SqlDataReader = cmd.ExecuteReader() + myTable.Load(dr) + dr.Close() + End Using + conn.Close() + End Using + Return myTable 'While Schleife wird hier verlassen + Catch ex As Exception + Dim antwort As MsgBoxResult = MsgBox(ex.Message, CType(MsgBoxStyle.RetryCancel + MsgBoxStyle.Exclamation, MsgBoxStyle), + "Problem in Function 'loadDgvBySqlZOLARIS'") + End Try + End While + + Return Nothing + End Function + + + + Public Function loadDgvBySqlFromBrgKt_NCTS_TR_Details(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 DataTable + Dim sql As String = "SELECT ncts_MRN,ncts_Status,(nctsSA_AbgabenBetrag), ncts_dyaAnmID, ncts_ArtAnmeldung,nctsSA_GRN,ncts_Empfaenger_eori,ncts_Empfaenger_NLNR,ncts_Empfaenger_Name,ncts_Bearbeiter" + sql &= " ,[ncts_ObjectName],[ncts_Trans_DatumZeit] as Transaktionsdatum,[ncts_dyaArt],[ncts_ANR],[ncts_MRN],[ncts_ObjectAlias],[ncts_GesamtRohmasse],[ncts_GesamtAnzahlPackstuecke] " + sql &= " from tblNCTS_TR_Sicherheitsangaben inner join tblNCTS_TR on ncts_Id = nctsSA_NctsId" + sql &= " where ncts_Status between '" & statusVon & "' and '" & statusBis & "' AND nctsSA_GRN='" & buergschaft & "' " & where + 'MsgBox(sql) + While True 'Endlosschleife; wird verlassen durch Return oder Application.Exit() + Try + Dim myTable = New DataTable() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL() Using cmd As New SqlCommand(sql, conn) Dim dr As SqlDataReader = cmd.ExecuteReader() myTable.Load(dr) @@ -325,7 +354,7 @@ Public Class cBrgDb While True 'Endlosschleife; wird verlassen durch Return oder Application.Exit() Try Dim myTable = New DataTable() - Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL() Using cmd As New SqlCommand(sql, conn) Dim dr As SqlDataReader = cmd.ExecuteReader() myTable.Load(dr) @@ -346,7 +375,7 @@ Public Class cBrgDb Public Function checkUser(pcname, brgusr_name) As Boolean Dim sql As String = " SELECT * FROM tblBrgUser WHERE brgusr_name = @brgusr_name " Dim dr As SqlDataReader - Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN() Using cmd As New SqlCommand(sql, conn) cmd.Parameters.AddWithValue("@brgusr_name", pcname & "\" & brgusr_name) dr = cmd.ExecuteReader() @@ -374,7 +403,7 @@ Public Class cBrgDb Public Function insertBrgAufschubEinzahlung(brgak_datum, brgak_betrag, brgak_brgaktoId, brgak_filename, brgak_atc) As Boolean Try - Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN() Using cmd As New SqlCommand("INSERT INTO tblBrgAufschub " & " (brgak_datum, brgak_betrag, brgak_brgaktoId, brgak_filename, brgak_atc, brgak_art) VALUES" & " (@brgak_datum, @brgak_betrag, @brgak_brgaktoId, @brgak_filename, @brgak_atc,'einzahlung') ", conn) @@ -401,7 +430,7 @@ Public Class cBrgDb Public Function insertBrgAufschubAusgleichsbetrag(brgak_datum, brgak_betrag, brgak_brgaktoId, brgak_filename, brgak_atc) As Boolean Try - Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN() Using cmd As New SqlCommand("INSERT INTO tblBrgAufschub " & " (brgak_datum, brgak_betrag, brgak_brgaktoId, brgak_filename, brgak_atc, brgak_art) VALUES" & " (@brgak_datum, @brgak_betrag, @brgak_brgaktoId, @brgak_filename, @brgak_atc,'Ausgleichsbetrag') ", conn) @@ -429,7 +458,7 @@ Public Class cBrgDb Public Function deleteBrgAufschubAusgleichsbetrag(brgak_brgaktoId) As Boolean Try - Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN() Using cmd As New SqlCommand("DELETE FROM tblBrgAufschub " & " WHERE brgak_art='Ausgleichsbetrag' AND brgak_brgaktoId=@brgak_brgaktoId", conn) cmd.Parameters.AddWithValue("@brgak_brgaktoId", brgak_brgaktoId) @@ -451,7 +480,7 @@ Public Class cBrgDb Public Function insertBrgAufschubZuBelastung(brgak_datum, brgak_betrag, brgak_brgaktoId, brgak_filename, brgak_atc) As Boolean Try - Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN() Using cmd As New SqlCommand("INSERT INTO tblBrgAufschub " & " (brgak_datum, brgak_betrag, brgak_brgaktoId, brgak_filename, brgak_atc, brgak_art) VALUES" & " (@brgak_datum, @brgak_betrag, @brgak_brgaktoId, @brgak_filename, @brgak_atc,'belastung') ", conn) @@ -492,6 +521,16 @@ Public Class cBrgDb End Function + + + Public Function getBrgSumFromFMZOLL_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 + + Dim tmp_DY As String = getBrgSumFrom_NCTS_TR(datumVon, datumBis, statusVon, statusBis, buergschaft, where) + Return CDbl(tmp_DY) + + + End Function + Public Function getBrgSumFromFMZOLL_Zabis_SUBEN(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(veoerz_sicbtg) " & @@ -500,7 +539,7 @@ Public Class cBrgDb ' Dim daten As New List(Of cEntry) Dim dr As SqlDataReader Dim daten As New List(Of cBuergschaft) - Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL() Using cmd As New SqlCommand(sql, conn) dr = cmd.ExecuteReader() Try @@ -532,7 +571,39 @@ Public Class cBrgDb 'MsgBox(sql) Dim dr As SqlDataReader Dim daten As New List(Of cBuergschaft) - Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL() + 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 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 @@ -564,7 +635,7 @@ Public Class cBrgDb 'MsgBox(sql) Dim dr As SqlDataReader Dim daten As New List(Of cBuergschaft) - Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL() Using cmd As New SqlCommand(sql, conn) dr = cmd.ExecuteReader() Try @@ -595,7 +666,7 @@ Public Class cBrgDb ' Dim daten As New List(Of cEntry) Dim dr As SqlDataReader Dim daten As New List(Of cBuergschaft) - Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL() Using cmd As New SqlCommand(sql, conn) dr = cmd.ExecuteReader() Try @@ -628,7 +699,7 @@ Public Class cBrgDb ' Dim daten As New List(Of cEntry) Dim dr As SqlDataReader Dim daten As New List(Of cBuergschaft) - Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN() Using cmd As New SqlCommand(sql, conn) dr = cmd.ExecuteReader() Try @@ -696,7 +767,7 @@ Public Class cBrgDb ' Dim daten As New List(Of cEntry) Dim dr As SqlDataReader Dim daten As New List(Of cBuergschaft) - Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN() Using cmd As New SqlCommand(sql, conn) cmd.Parameters.AddWithValue("@datumVon", datumVon) cmd.Parameters.AddWithValue("@datumBis", datumBis) @@ -734,7 +805,7 @@ Public Class cBrgDb Dim dr As SqlDataReader Dim daten As New List(Of cBuergschaft) Dim cMonitoringBrg As New cMonitoringBrg - Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN() Using cmd As New SqlCommand(sql, conn) dr = cmd.ExecuteReader() Try @@ -810,7 +881,7 @@ Public Class cBrgDb " brgusrset_aufschub_imex_de_summe=@brgusrset_aufschub_imex_de_summe,brgusrset_aufschub_imex_de_warn1=@brgusrset_aufschub_imex_de_warn1,brgusrset_aufschub_imex_de_warn2=@brgusrset_aufschub_imex_de_warn2,brgusrset_gvvAt_imex_de_summe =@brgusrset_gvvAt_imex_de_summe,brgusrset_gvvAt_imex_tag_warn1=@brgusrset_gvvAt_imex_tag_warn1,brgusrset_gvvAt_imex_tag_warn2=@brgusrset_gvvAt_imex_tag_warn2,brgusrset_gvvAt_imex_woche_warn1=@brgusrset_gvvAt_imex_woche_warn1,brgusrset_gvvAt_imex_woche_warn2=@brgusrset_gvvAt_imex_woche_warn2 " & " WHERE brgusrset_id=@brgusrset_id " - Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN() Using cmd As New SqlCommand(sql, conn) 'msgbo cmd.Parameters.AddWithValue("@brgusrset_id", d.brgusrset_id) @@ -871,7 +942,7 @@ Public Class cBrgDb ' Dim daten As New List(Of cEntry) Dim dr As SqlDataReader Dim daten As New List(Of cBuergschaft) - Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL() Using cmd As New SqlCommand(sql, conn) dr = cmd.ExecuteReader() Try @@ -910,9 +981,11 @@ Public Class cBrgDb " End " & " commit tran " - Dim cn As New SqlConnection() - cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" - cn.Open() + 'Dim cn As New SqlConnection() + 'cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" + 'cn.Open() + + Dim cn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN Using cn Using cmd As New SqlCommand(sql, cn) cmd.Parameters.AddWithValue("@brgmld_date", brgmld_date) @@ -935,7 +1008,7 @@ Public Class cBrgDb Dim sql As String = " SELECT * FROM tblBrgMeldungen WHERE brgmld_date = @brgmld_date AND brgmld_kto=@brgmld_kto AND brgmld_user=@brgmld_user AND brgmld_stufe=@brgmld_stufe " Dim dr As SqlDataReader - Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN() Using cmd As New SqlCommand(sql, conn) cmd.Parameters.AddWithValue("@brgmld_date", brgmld_date) cmd.Parameters.AddWithValue("@brgmld_kto", brgmld_kto) diff --git a/VERAGMonitoring/frmBelastAufheben.vb b/VERAGMonitoring/frmBelastAufheben.vb index aabb160..874e217 100644 --- a/VERAGMonitoring/frmBelastAufheben.vb +++ b/VERAGMonitoring/frmBelastAufheben.vb @@ -68,7 +68,7 @@ Public Class frmBelastAufheben " SET brgAT_Aufgehoben=@brgAT_Aufgehoben, brgAT_AufgehobenDatum=@brgAT_AufgehobenDatum " & " WHERE brgAT_id=@brgAT_id " ', brgAT_Aufgehoben_mitID=@brgAT_Aufgehoben_mitID " & - Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN Using cmd As New SqlCommand(sql, conn) 'msgbo diff --git a/VERAGMonitoring/frmKtoStandAkt.vb b/VERAGMonitoring/frmKtoStandAkt.vb index 5f36d08..e02460a 100644 --- a/VERAGMonitoring/frmKtoStandAkt.vb +++ b/VERAGMonitoring/frmKtoStandAkt.vb @@ -29,6 +29,9 @@ Dim bis As Date = CDate(datKto.Value) Dim betrag As Double = 0.0 Dim oItem As MyListItem = CType(cboBrg.SelectedItem, MyListItem) + + + If BRG.deleteBrgAufschubAusgleichsbetrag(oItem.Value) Then Select Case DirectCast(cboBrg.SelectedItem, MyListItem).Value Case 1 diff --git a/VERAGMonitoring/frmMain.vb b/VERAGMonitoring/frmMain.vb index 3a25a78..e0fc7fe 100644 --- a/VERAGMonitoring/frmMain.vb +++ b/VERAGMonitoring/frmMain.vb @@ -16,7 +16,10 @@ Public Class frmMain Try : ico.Visible = Not Visible : Catch : End Try End Sub + Private Sub Form1_Load(sender As Object, e As EventArgs) Handles Me.Load + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" 'auf UPDATES prüfen: Dim LOGIN As New cLogin If CInt(LOGIN.getAktuelleVersion().Replace(".", "")) > CInt(My.Resources.version.Replace(".", "")) Then @@ -202,6 +205,8 @@ Public Class frmMain Dim AtWoche_zolaris As Double = BRG.getBrgSumFromFMZOLL_Zolaris(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_AT) 'TELOTEC AT WOCHE Dim AtWoche_TELOTEC As Double = BRG.getBrgSumFromFMZOLL_TELOTEC(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_AT) + 'TELOTEC AT WOCHE + Dim AtWoche_nctsTR As Double = BRG.getBrgSumFromFMZOLL_NCTS_TR(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_AT) 'AT WOCHE Dim woche_at As Double = AtWoche_atlas + AtWoche_zolaris + AtWoche_TELOTEC setLabel(lblAtWoche, String.Format("{0:C}", CDbl(woche_at))) @@ -212,8 +217,10 @@ Public Class frmMain Dim AtTag_atlas As Double = BRG.getBrgSumFromFMZOLL_Zabis(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_AT) 'TELOTEC AT TAG Dim AtTag_telotec As Double = BRG.getBrgSumFromFMZOLL_TELOTEC(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_AT) + 'NCTS_TR AT TAG + Dim AtTag_nctsTR As Double = BRG.getBrgSumFromFMZOLL_NCTS_TR(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_AT) 'AT TAG - Dim tag_at As Double = AtTag_zolaris + AtTag_atlas + AtTag_telotec + Dim tag_at As Double = AtTag_zolaris + AtTag_atlas + AtTag_telotec + AtTag_nctsTR setLabel(lblAtTag, String.Format("{0:C}", CDbl(tag_at))) Else setLabel(lblAtWoche, "0.0") @@ -379,6 +386,7 @@ Public Class frmMain 'betragBrg += zolaris 'MsgBox(zolaris) setLabel(lblAufschubBrg_at_VeragCS, String.Format("{0:C}", CDbl(betragBrg))) + ' MsgBox(betragBrg & " - " & cMonitoringBrg.brgusrset_aufschub_CS_at_warn1) setAlarm2("Aufschubkonto AT - VERAG Customs Sercvie GmbH - HZA Salzburg", "3", Me.lblAufschubBrg_at_VeragCS, cMonitoringBrg.brgusrset_aufschub_CS_at_warn1, cMonitoringBrg.brgusrset_aufschub_CS_at_warn2, cMonitoringBrg.brgusrset_aufschub_CS_at_summe, lblAufschubStatus_at_VeragCS) @@ -548,7 +556,7 @@ Public Class frmMain stufe = 2 End If - If wert < 0 Then + If wert < summe Then lblStatus.Text = "ÜBER" lblStatus.ForeColor = Color.White lblStatus.BackColor = Color.DarkRed @@ -584,6 +592,7 @@ Public Class frmMain End If End If Next + Return False End Function diff --git a/VERAGMonitoring/frmShowData.Designer.vb b/VERAGMonitoring/frmShowData.Designer.vb index 30da200..9609800 100644 --- a/VERAGMonitoring/frmShowData.Designer.vb +++ b/VERAGMonitoring/frmShowData.Designer.vb @@ -31,10 +31,11 @@ Partial Class frmShowData Me.TabPage2 = New System.Windows.Forms.TabPage() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.TabPage4 = New System.Windows.Forms.TabPage() Me.Button1 = New System.Windows.Forms.Button() Me.Label2 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() - Me.TabPage4 = New System.Windows.Forms.TabPage() + Me.NCTS_TR = New System.Windows.Forms.TabPage() CType(Me.dgv, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.tbcntr.SuspendLayout() @@ -92,6 +93,7 @@ Partial Class frmShowData Me.tbcntr.Controls.Add(Me.TabPage1) Me.tbcntr.Controls.Add(Me.TabPage3) Me.tbcntr.Controls.Add(Me.TabPage4) + Me.tbcntr.Controls.Add(Me.NCTS_TR) Me.tbcntr.Location = New System.Drawing.Point(0, 31) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 @@ -127,6 +129,16 @@ Partial Class frmShowData Me.TabPage3.Text = "EZOLL" Me.TabPage3.UseVisualStyleBackColor = True ' + 'TabPage4 + ' + Me.TabPage4.Location = New System.Drawing.Point(4, 22) + Me.TabPage4.Name = "TabPage4" + Me.TabPage4.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage4.Size = New System.Drawing.Size(1045, 0) + Me.TabPage4.TabIndex = 3 + Me.TabPage4.Text = "TELOTEC" + Me.TabPage4.UseVisualStyleBackColor = True + ' 'Button1 ' Me.Button1.Location = New System.Drawing.Point(599, 5) @@ -157,15 +169,15 @@ Partial Class frmShowData Me.Label1.TabIndex = 0 Me.Label1.Text = "Datensätze:" ' - 'TabPage4 + 'NCTS_TR ' - Me.TabPage4.Location = New System.Drawing.Point(4, 22) - Me.TabPage4.Name = "TabPage4" - Me.TabPage4.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage4.Size = New System.Drawing.Size(1045, 0) - Me.TabPage4.TabIndex = 3 - Me.TabPage4.Text = "TELOTEC" - Me.TabPage4.UseVisualStyleBackColor = True + Me.NCTS_TR.Location = New System.Drawing.Point(4, 22) + Me.NCTS_TR.Name = "NCTS_TR" + Me.NCTS_TR.Padding = New System.Windows.Forms.Padding(3) + Me.NCTS_TR.Size = New System.Drawing.Size(1045, 0) + Me.NCTS_TR.TabIndex = 4 + Me.NCTS_TR.Text = "NCTS_TR" + Me.NCTS_TR.UseVisualStyleBackColor = True ' 'frmShowData ' @@ -196,4 +208,5 @@ Partial Class frmShowData Friend WithEvents datBIS As System.Windows.Forms.DateTimePicker Friend WithEvents datVON As System.Windows.Forms.DateTimePicker Friend WithEvents TabPage4 As TabPage + Friend WithEvents NCTS_TR As TabPage End Class diff --git a/VERAGMonitoring/frmShowData.vb b/VERAGMonitoring/frmShowData.vb index 8a01342..f26e241 100644 --- a/VERAGMonitoring/frmShowData.vb +++ b/VERAGMonitoring/frmShowData.vb @@ -119,6 +119,16 @@ Public Class frmShowData dgv.Columns("Betrag").DefaultCellStyle.Format = "N2" dgv.Columns("Betrag").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight End If + Case 4 'NCTS_TR TELOTEC + dgv.DataSource = BRG.loadDgvBySqlFromBrgKt_NCTS_TR_Details(datVON.Value.ToShortDateString, datBIS.Value.ToShortDateString, "50", "50", BRG_GRN) + If dgv.Columns.Count > 0 Then + dgv.Columns("nctsSA_AbgabenBetrag").DefaultCellStyle.Format = "N2" + dgv.Columns("ncts_GesamtRohmasse").DefaultCellStyle.Format = "N2" + dgv.Columns("ncts_GesamtAnzahlPackstuecke").DefaultCellStyle.Format = "N0" + dgv.Columns("nctsSA_AbgabenBetrag").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + dgv.Columns("ncts_GesamtRohmasse").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + dgv.Columns("ncts_GesamtAnzahlPackstuecke").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + End If End Select Case "AUFSCHUB" End Select diff --git a/cNCTSPartnerWorker/MAVI/cMAVIGetMsgType.vb b/cNCTSPartnerWorker/MAVI/cMAVIGetMsgType.vb index 67425bc..6457ee6 100644 --- a/cNCTSPartnerWorker/MAVI/cMAVIGetMsgType.vb +++ b/cNCTSPartnerWorker/MAVI/cMAVIGetMsgType.vb @@ -39,7 +39,17 @@ Public Class cMAVIGetMsgType Shared Function isTRNCTS_BestaetigungZollXML_ARR_INF(doc As XmlDocument) As Boolean If doc.HasChildNodes Then - If doc.GetElementsByTagName("ARR_INF").Count > 0 Then + If doc.GetElementsByTagName("ARR_INF").Count > 0 Or doc.GetElementsByTagName("ARRINF").Count > 0 Then + Return True + End If + End If + Return False + End Function + + + Shared Function isTRNCTS_BestaetigungZollXML_GUA_INF(doc As XmlDocument) As Boolean + If doc.HasChildNodes Then + If doc.GetElementsByTagName("GUA_INF").Count > 0 Or doc.GetElementsByTagName("GUAINF").Count > 0 Then Return True End If End If diff --git a/cNCTSPartnerWorker/cNCTS_TR.vb b/cNCTSPartnerWorker/cNCTS_TR.vb index 3b016d7..dd919d3 100644 --- a/cNCTSPartnerWorker/cNCTS_TR.vb +++ b/cNCTSPartnerWorker/cNCTS_TR.vb @@ -174,7 +174,7 @@ Public Class cNCTS_TR Function GET_SHIPMENTS(Partnersystem, VorpapierArt, VorpapierNr) As List(Of VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL) GET_SHIPMENTS = New List(Of VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL) Dim dt = SQL.loadDgvBySql("Select [shTr_id] FROM [tblTR_Shipment] where shTr_Partnersystem='" & Partnersystem & "' AND [PrePaperCode]='" & VorpapierArt & "' and [PrePaperNr]='" & VorpapierNr & "'", "FMZOLL") - MsgBox("Select [shTr_id] FROM [tblTR_Shipment] where shTr_Partnersystem='" & Partnersystem & "' AND [PrePaperCode]='" & VorpapierArt & "' and [PrePaperNr]='" & VorpapierNr & "'") + ' MsgBox("Select [shTr_id] FROM [tblTR_Shipment] where shTr_Partnersystem='" & Partnersystem & "' AND [PrePaperCode]='" & VorpapierArt & "' and [PrePaperNr]='" & VorpapierNr & "'") If dt IsNot Nothing Then For Each r In dt.Rows Dim SH As New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL(CInt(r("shTr_id"))) @@ -431,6 +431,8 @@ Public Class cNCTS_TR End Function + + Shared Function LOADByAnmIDFull(ncts_dyaAnmID As String, loadALL As Boolean) As cNCTS_TR Try Dim NCTS As New cNCTS_TR @@ -527,13 +529,14 @@ Public Class cNCTS_TR End Function Shared Function LOADByBezugsNr_or_GUID_or_MRN(bezugsNr As String, GUID As String, MRN As String, loadALL As Boolean, Optional checkValidStatus As Boolean = False, Optional Partnersystem As String = "") As cNCTS_TR - LOADByBezugsNr_or_GUID_or_MRN = New cNCTS_TR + LOADByBezugsNr_or_GUID_or_MRN = Nothing If bezugsNr <> "" Then LOADByBezugsNr_or_GUID_or_MRN = LOADByBezugsNr(bezugsNr, loadALL, checkValidStatus, Partnersystem) - If LOADByBezugsNr_or_GUID_or_MRN.ncts_Id <= 0 Then + + If LOADByBezugsNr_or_GUID_or_MRN Is Nothing Then If GUID <> "" Then LOADByBezugsNr_or_GUID_or_MRN = LOADByGUID(GUID, loadALL, checkValidStatus, Partnersystem) End If - If LOADByBezugsNr_or_GUID_or_MRN.ncts_Id <= 0 Then + If LOADByBezugsNr_or_GUID_or_MRN Is Nothing Then If MRN <> "" Then LOADByBezugsNr_or_GUID_or_MRN = LOADByMRN(MRN, loadALL, checkValidStatus, Partnersystem) End If End Function @@ -588,7 +591,7 @@ Public Class cNCTS_TR ' Using cmd As New SqlCommand("SELECT TOP 1 * FROM (SELECT * FROM tblNCTS_TR WHERE ncts_ObjectName LIKE @bezugsNr " & If(checkValidStatus, " AND ncts_status BETWEEN 40 and 90 ", "") & " ) AS T order by ncts_status desc, (SELECT top 1 dySt_ts FROM [tblDakosy_Statusmeldungen] WHERE ncts_dyaAnmID=ncts_dyaAnmID order by dySt_ts desc) desc,ncts_LetzteBearbeitung desc ", conn) 'Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblNCTS_TR WHERE ncts_ObjectName LIKE @bezugsNr " & If(checkValidStatus, " AND ncts_status BETWEEN 40 and 90 ", "") & " order by ncts_status desc, (SELECT top 1 dySt_ts FROM [tblDakosy_Statusmeldungen] WHERE ncts_dyaAnmID=ncts_dyaAnmID order by dySt_ts desc) desc,ncts_LetzteBearbeitung desc ", conn) Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblNCTS_TR WHERE ncts_ObjectName LIKE @bezugsNr " & If(checkValidStatus, " AND ncts_status BETWEEN 40 and 90 ", "") & If(Partnersystem <> "", " AND ncts_Partnersystem ='" & Partnersystem & "' ", "") & " order by ncts_LetzteBearbeitung desc", conn) - 'MsgBox("SELECT TOP 1 * FROM tblNCTS_TR WHERE ncts_ObjectName LIKE " & bezugsNr & " " & If(checkValidStatus, " AND ncts_status BETWEEN 40 and 90 ", "") & " order by ncts_status desc, (SELECT top 1 dySt_ts FROM [tblDakosy_Statusmeldungen] inner join tblDakosy_Zollanmeldungen on dy_id = dySt_dyId WHERE ncts_dyaAnmID=dy_id order by dySt_ts desc) desc,ncts_LetzteBearbeitung desc ") + ' MsgBox("SELECT TOP 1 * FROM tblNCTS_TR WHERE ncts_ObjectName LIKE '" & bezugsNr & "' " & If(checkValidStatus, " AND ncts_status BETWEEN 40 and 90 ", "") & If(Partnersystem <> "", " AND ncts_Partnersystem ='" & Partnersystem & "' ", "") & " order by ncts_LetzteBearbeitung desc") cmd.Parameters.AddWithValue("@bezugsNr", bezugsNr) Dim dr = cmd.ExecuteReader() If dr.Read Then diff --git a/initATLASAufschubkonten/AtlasAufschubDatenEinlesen.vb b/initATLASAufschubkonten/AtlasAufschubDatenEinlesen.vb index 4034b6c..7675d6e 100644 --- a/initATLASAufschubkonten/AtlasAufschubDatenEinlesen.vb +++ b/initATLASAufschubkonten/AtlasAufschubDatenEinlesen.vb @@ -132,9 +132,9 @@ Module AtlasAufschubDatenEinlesen - Dim cn As New SqlConnection() - cn.ConnectionString = "Data Source=BUCHHALTUNG\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" - cn.Open() + Dim cn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN + 'cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" + 'cn.Open() Using cn Using cmd As New SqlCommand(sql, cn) cmd.Parameters.AddWithValue("@brgak_datum", brgak_datum) diff --git a/initATLASAufschubkonten/EZollAufschubEinlesen.vb b/initATLASAufschubkonten/EZollAufschubEinlesen.vb index 329e617..38addc0 100644 --- a/initATLASAufschubkonten/EZollAufschubEinlesen.vb +++ b/initATLASAufschubkonten/EZollAufschubEinlesen.vb @@ -146,7 +146,7 @@ Public Class EZollAufschubEinlesen End While Return daten Catch ex As Exception - writeLog("ERROR", "Fehler beim Laden der DB aus EZOLL: " & ex.Message) + writeLog("ERROR", "Fehler beim Laden der DB aus EZOLL: " & ex.Message & ex.StackTrace) Finally dr.Close() End Try @@ -156,7 +156,7 @@ Public Class EZollAufschubEinlesen Return daten End While Catch ex As Exception - writeLog("ERROR", "Fehler bei der Verbindung zur DB EZOLL: " & ex.Message) + writeLog("ERROR", "Fehler bei der Verbindung zur DB EZOLL: " & ex.Message & ex.StackTrace) End Try Return Nothing End Function @@ -178,7 +178,7 @@ Public Class EZollAufschubEinlesen " End " & " commit tran " - Using conn As SqlConnection = GetNewOpenConnectionADMIN() + Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN ' GetNewOpenConnectionADMIN() Using cmd As New SqlCommand(sql, conn) Select Case daten.Abgabenart @@ -216,9 +216,9 @@ Public Class EZollAufschubEinlesen cn.Open() Return cn End Function - Public Shared Function GetNewOpenConnectionADMIN() As SqlConnection + Public Shared Function GetNewOpenConnectionADMIN_OLD() As SqlConnection Dim cn As New SqlConnection() - cn.ConnectionString = "Data Source=BUCHHALTUNG\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" + cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" cn.Open() Return cn End Function diff --git a/initATLASAufschubkonten/cBuergschaften.vb b/initATLASAufschubkonten/cBuergschaften.vb index 6ebe21f..ddb6493 100644 --- a/initATLASAufschubkonten/cBuergschaften.vb +++ b/initATLASAufschubkonten/cBuergschaften.vb @@ -152,10 +152,10 @@ Public Class cBuergschaften 'MsgBox("start") Dim cnt As Integer = 0 Dim dr As SqlDataReader - Dim sql As String = "SELECT * FROM ezoll.dbo.vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme" + Dim sql As String = "SELECT * FROM ezoll.dbo.vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme" If Not history Then sql &= " WHERE [AnmeldungsDatum] > DATEADD(DAY, - 10, GETDATE())" 'letzten 10 Tage - Dim sqlConn As SqlConnection = GetNewOpenConnectionBUCHHALTUNG() + Dim sqlConn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionEZOLL ' setLabel(frmAtlasAufschub.lbBrgAtlasSuben, "einlesen ...") Using conn As SqlConnection = sqlConn diff --git a/initATLASAufschubkonten/cMAVIWorker.vb b/initATLASAufschubkonten/cMAVIWorker.vb index a2743b7..13b4cb8 100644 --- a/initATLASAufschubkonten/cMAVIWorker.vb +++ b/initATLASAufschubkonten/cMAVIWorker.vb @@ -178,6 +178,38 @@ Public Class cMAVIWorker End If + + + Dim Eroeffnung = Nothing + If doc.GetElementsByTagName("AccDatHEA158").Count > 0 Then + Try + Eroeffnung = Date.ParseExact(doc.GetElementsByTagName("AccDatHEA158")(0).InnerText, "yyyyMMdd", System.Globalization.DateTimeFormatInfo.InvariantInfo) + Catch ex As Exception + End Try + End If + + + + Dim ncts_Befoerderungsmittel_KennzeichenAbgang = Nothing + If doc.GetElementsByTagName("IdeOfMeaOfTraAtDHEA78").Count > 0 Then + ncts_Befoerderungsmittel_KennzeichenAbgang = doc.GetElementsByTagName("IdeOfMeaOfTraAtDHEA78")(0).InnerText + End If + Dim ncts_Befoerderungsmittel_KennzeichenGrenzueberschreitend = Nothing + If doc.GetElementsByTagName("IdeOfMeaOfTraCroHEA85").Count > 0 Then + ncts_Befoerderungsmittel_KennzeichenGrenzueberschreitend = doc.GetElementsByTagName("IdeOfMeaOfTraCroHEA85")(0).InnerText + End If + + + Dim Wiedergestellungsdatum = Nothing + If doc.GetElementsByTagName("DatLimERS69").Count > 0 Then + Try + Wiedergestellungsdatum = Date.ParseExact(doc.GetElementsByTagName("DatLimERS69")(0).InnerText, "yyyyMMdd", System.Globalization.DateTimeFormatInfo.InvariantInfo) + Catch ex As Exception + End Try + End If + + + readNCTS_BestaetigungZollXML_CC029B = LRN @@ -192,8 +224,11 @@ Public Class cMAVIWorker NCTS.ncts_ObjectName = LRN NCTS.ncts_Partnersystem = "MAVI" - NCTS.ncts_Eroeffnung = Now.ToShortDateString - + NCTS.ncts_MRN = MRN + NCTS.ncts_Eroeffnung = If(Eroeffnung Is Nothing, Now.ToShortDateString, Eroeffnung) + NCTS.ncts_Wiedergestellungsdatum = Wiedergestellungsdatum + NCTS.ncts_Befoerderungsmittel_KennzeichenAbgang = ncts_Befoerderungsmittel_KennzeichenAbgang + NCTS.ncts_Befoerderungsmittel_KennzeichenGrenzueberschreitend = ncts_Befoerderungsmittel_KennzeichenGrenzueberschreitend 'If doc.GetElementsByTagName("GuaRefNumGRNREF1").Count > 0 AndAlso doc.GetElementsByTagName("AmoConREF7").Count > 0 Then ' Dim BRG As New cNCTSPartnerWorker.cNCTS_TR_Sicherheitsangaben ' BRG.nctsSA_GRN = doc.GetElementsByTagName("GuaRefNumGRNREF1")(0).InnerText @@ -274,6 +309,7 @@ Public Class cMAVIWorker ' NCTS.ncts_GUID = Guid NCTS.ncts_MRN = MRN NCTS.ncts_Erledigung = TMSTMP.ToShortDateString + readNCTS_ErledigungsmitteilungXML_CC045A=MRN NCTS.ncts_Partnersystem = "MAVI" @@ -315,7 +351,7 @@ Public Class cMAVIWorker Dim xw = New XmlTextWriter(sw) doc.WriteTo(xw) Dim XmlString = sw.ToString() - If XmlString.Contains(""), XmlString.IndexOf("") + 9 - XmlString.IndexOf("")) ' MsgBox(xmlCC015B) ' Dim p = Path.GetTempFileName @@ -340,8 +376,8 @@ Public Class cMAVIWorker NCTS.ncts_GUID = GUID NCTS.ncts_Partnersystem = "MAVI" - NCTS.ncts_Ankunft = TMSTMP.toshortdatestring - + NCTS.ncts_Ankunft = TMSTMP.ToShortDateString + readNCTS_BestaetigungZollXML_ARR_INF = GUID If If(NCTS.ncts_Status, 0) <= 53 Then NCTS.ncts_Status = DAKOSY_Worker.cDY_Statusliste.S_53 NCTS.ncts_Status_KEWILL_Equivalent = NCTS.ncts_Status @@ -374,6 +410,93 @@ Public Class cMAVIWorker End Function + Public Shared Function readNCTS_BestaetigungZollXML_GUA_INF(FORM As frmTRNCTS_NachrichtenVerarbeitung, doc As XmlDocument) As String + Try + readNCTS_BestaetigungZollXML_GUA_INF = "" + Dim sw = New StringWriter() + Dim xw = New XmlTextWriter(sw) + doc.WriteTo(xw) + Dim XmlString = sw.ToString() + If XmlString.Contains(""), XmlString.IndexOf("") + 9 - XmlString.IndexOf("")) + ' MsgBox(xmlCC015B) + ' Dim p = Path.GetTempFileName + + + Dim GUID = "" + If doc.GetElementsByTagName("GUID").Count > 0 Then + GUID = doc.GetElementsByTagName("GUID")(0).InnerText + End If + + Dim TMSTMP As Date + If doc.GetElementsByTagName("TMSTMP").Count > 0 Then + If IsDate(doc.GetElementsByTagName("TMSTMP")(0).InnerText) Then + TMSTMP = CDate(doc.GetElementsByTagName("TMSTMP")(0).InnerText) + End If + + Dim AnsprechpTMP_Email = "" + + Dim NCTS As cNCTSPartnerWorker.cNCTS_TR = cNCTSPartnerWorker.cNCTS_TR.LOADByGUID(GUID, True,, "MAVI") + If NCTS Is Nothing Then NCTS = New cNCTSPartnerWorker.cNCTS_TR + 'NCTS.ncts_ObjectName = LRN + NCTS.ncts_GUID = GUID + + NCTS.ncts_Partnersystem = "MAVI" + readNCTS_BestaetigungZollXML_GUA_INF = GUID + + 'If If(NCTS.ncts_Status, 0) <= 53 Then NCTS.ncts_Status = DAKOSY_Worker.cDY_Statusliste.S_53 + 'NCTS.ncts_Status_KEWILL_Equivalent = NCTS.ncts_Status + + + Dim GRN = "" + ' Dim CurREF8 = "" + Dim AmoConREF7 = "" + + If doc.GetElementsByTagName("GRN").Count > 0 Then + GRN = doc.GetElementsByTagName("GRN")(0).InnerText + End If + If doc.GetElementsByTagName("AmoConREF7").Count > 0 Then + AmoConREF7 = doc.GetElementsByTagName("AmoConREF7")(0).InnerText + End If + + For Each GUA In NCTS.ncts_SICHERHEITSANGABEN + If GUA.nctsSA_GRN = GRN Then + GUA.nctsSA_AbgabenBetrag = AmoConREF7 + End If + Next + + + + + If NCTS.SAVE_ALL() Then + ' If If(NCTS.ncts_Status, 0) <= 5 Then DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_TMP, DAKOSY_Worker.cDY_Statusliste.S_05,,,, statusTMP) + Else + readNCTS_BestaetigungZollXML_GUA_INF = "" + End If + + + + 'Try + ' System.IO.File.Delete(p) + 'Catch ex As Exception + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) + 'End Try + + FORM.addDGVEinarbeitung("NCTS: Garantie_Info", readNCTS_BestaetigungZollXML_GUA_INF) + + ' End Using + + 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) + readNCTS_BestaetigungZollXML_GUA_INF = "" + End Try + End Function + + + Shared Function getDatumXMLNothing(dateTmp) As Object If dateTmp IsNot Nothing AndAlso dateTmp.ToString.Trim <> "" AndAlso IsDate(dateTmp) Then diff --git a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb index bc154e2..ec98ade 100644 --- a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb @@ -43,6 +43,7 @@ Public Class frmDYNachrichtenVerarbeitung 'VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\TESTSYSTEM\Nachrichtendaten_Ablage\" Me.ERROR_PFAD = DAKOSY_Worker.cDY_Paramter.GET_PARAM_ByName("ERROR_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) 'VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\TESTSYSTEM\Nachrichtendaten_ERROR\" + If Not IO.Directory.Exists(VERARBEITUNGS_PFAD) Then IO.Directory.CreateDirectory(VERARBEITUNGS_PFAD) If Not IO.Directory.Exists(ZIEL_PFAD) Then IO.Directory.CreateDirectory(ZIEL_PFAD) If Not IO.Directory.Exists(ERROR_PFAD) Then IO.Directory.CreateDirectory(ERROR_PFAD) @@ -5082,7 +5083,8 @@ Public Class frmDYNachrichtenVerarbeitung Dim MailTo = "eu@verag.ag" Select Case EZA_TMP.eza_firma Case "IMEX" : MailTo = "info@imex-group.at" - Case "ATILLA" : MailTo = "info@imex-group.at" + Case "UNISPED" : MailTo = "office@unisped.at" + Case "ATILLA" : MailTo = "atilla@verag.ag" Case "VERAG" Select Case EZA_TMP.eza_niederlassung Case "WAI" : MailTo = "waidhaus@verag.com" @@ -5273,7 +5275,8 @@ Public Class frmDYNachrichtenVerarbeitung Dim MailTo = "eu@verag.ag" Select Case EZA_TMP.eza_firma Case "IMEX" : MailTo = "info@imex-group.at" - Case "ATILLA" : MailTo = "info@imex-group.at" + Case "ATILLA" : MailTo = "atilla@verag.ag" + Case "UNISPED" : MailTo = "office@unisped.at" Case "VERAG" Select Case EZA_TMP.eza_niederlassung Case "WAI" : MailTo = "waidhaus@verag.com" @@ -5464,7 +5467,8 @@ Public Class frmDYNachrichtenVerarbeitung Dim MailTo = "eu@verag.ag" Select Case EZA_TMP.eza_firma Case "IMEX" : MailTo = "info@imex-group.at" - Case "ATILLA" : MailTo = "info@imex-group.at" + Case "ATILLA" : MailTo = "atilla@verag.ag" + Case "UNISPED" : MailTo = "office@unisped.at" Case "VERAG" Select Case EZA_TMP.eza_niederlassung Case "WAI" : MailTo = "waidhaus@verag.com" @@ -5596,9 +5600,11 @@ Public Class frmDYNachrichtenVerarbeitung - Dim cn As New System.Data.SqlClient.SqlConnection() - cn.ConnectionString = "Data Source=BUCHHALTUNG\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" - cn.Open() + Dim cn As System.Data.SqlClient.SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN + + 'Dim cn As New System.Data.SqlClient.SqlConnection() + 'cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" + 'cn.Open() Using cn Using cmd As New System.Data.SqlClient.SqlCommand(sql, cn) cmd.Parameters.AddWithValue("@brgak_datum", brgak_datum) diff --git a/initATLASAufschubkonten/frmRoutineManager.vb b/initATLASAufschubkonten/frmRoutineManager.vb index 6f346d1..faacb18 100644 --- a/initATLASAufschubkonten/frmRoutineManager.vb +++ b/initATLASAufschubkonten/frmRoutineManager.vb @@ -101,7 +101,7 @@ Public Class frmRoutineManager setLabel(lblStatusEZOLL, "OK", "green") ' frmAtlasAufschub.lblStatusEZOLL.ForeColor = Color.Green Catch ex As Exception - writeLog("ERROR", "Fehler EZollAufschub: " & ex.Message) + writeLog("ERROR", "Fehler EZollAufschub: " & ex.Message & ex.StackTrace) setLabel(lblStatusEZOLL, "ERROR", "red") ' frmAtlasAufschub.lblStatusEZOLL.ForeColor = Color.Red Finally diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 1184944..ff03cf8 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -89,6 +89,20 @@ Public Class frmStartOptions f.Show() AddHandler f.FormClosed, AddressOf closeMe + Case "NCTSTR_EINARBEITUNG_TEST" + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True + Dim f As New frmTRNCTS_NachrichtenVerarbeitung(True) + Me.Visible = False + f.Show() + AddHandler f.FormClosed, AddressOf closeMe + Case "NCTSTR_EINARBEITUNG_PROD" + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + Dim f As New frmTRNCTS_NachrichtenVerarbeitung(True) + Me.Visible = False + f.Show() + AddHandler f.FormClosed, AddressOf closeMe + + Case "DY_EINARBEITUNG_UNISPED" VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED" @@ -185,7 +199,7 @@ Public Class frmStartOptions Sub importFileFromEZOLL(datum As Date) Dim sql As New VERAG_PROG_ALLGEMEIN.SQL - Dim dt As DataTable = sql.loadDgvBySql("SELECT [zzAktivitaet].LizenzNr,[zzAktivitaet].Operatorid,[zzAktivitaet].AnmID,MsgTyp,[zzAktivitaet].ErstelltAm,pfad,LRN,CRN FROM [ezoll].[dbo].[zzAktivitaet] INNER JOIN zsAnmRefs On zsAnmrefs.AnmID=zzAktivitaet.AnmID + Dim dt As DataTable = sql.loadDgvBySql("SELECT [zzAktivitaet].LizenzNr,[zzAktivitaet].Operatorid,[zzAktivitaet].AnmID,MsgTyp,[zzAktivitaet].ErstelltAm,pfad,LRN,CRN FROM [zzAktivitaet] INNER JOIN zsAnmRefs On zsAnmrefs.AnmID=zzAktivitaet.AnmID where MsgTyp IN ('EZ922','EZ923','TR109') and ErstelltAm>='" & datum.ToShortDateString & " 00:00:00' and pfad is not null", "EZOLL") If dt IsNot Nothing Then For Each row In dt.Rows @@ -1197,4 +1211,11 @@ Public Class frmStartOptions End Function + Private Sub LinkLabel29_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel29.LinkClicked + Me.Visible = False + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + Dim f As New frmTRNCTS_NachrichtenVerarbeitung + f.ShowDialog() + Me.Visible = True + End Sub End Class \ No newline at end of file diff --git a/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb index 006b744..6e2509b 100644 --- a/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb @@ -889,7 +889,7 @@ Public Class frmTCNachrichtenVerarbeitung Dim cn As New System.Data.SqlClient.SqlConnection() - cn.ConnectionString = "Data Source=BUCHHALTUNG\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" + cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" cn.Open() Using cn Using cmd As New System.Data.SqlClient.SqlCommand(sql, cn) diff --git a/initATLASAufschubkonten/frmTRNCTS_NachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmTRNCTS_NachrichtenVerarbeitung.vb index 321a796..ffd5e3f 100644 --- a/initATLASAufschubkonten/frmTRNCTS_NachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmTRNCTS_NachrichtenVerarbeitung.vb @@ -99,6 +99,39 @@ Public Class frmTRNCTS_NachrichtenVerarbeitung Function getNachrichtenDatenFromMAVIServices() As Integer Dim cnt = 0 Try + Dim SERVER_Path = "" + + If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then + + SERVER_Path = "\\ftps.verag.ag\FTP\MAVI\IN\" + Else + + SERVER_Path = "\\ftps.verag.ag\FTP\MAVI\IN\" + End If + + + For Each f In IO.Directory.GetFiles(SERVER_Path) + Dim fi As New IO.FileInfo(f) + If Not fi.Name.StartsWith(".") Then + Dim zielPfad = VERARBEITUNGS_PFAD & "\" & fi.Name + While IO.File.Exists(zielPfad) + zielPfad = VERARBEITUNGS_PFAD & "\" & Now.ToString("yyyyMMdd_HHmmss_") & fi.Name + End While + IO.File.Copy(f, zielPfad) + If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then + If IO.File.Exists(zielPfad) Then IO.File.Delete(f) + End If + + ListBox3.Items.Add(frmStartOptions.cut_file((New FileInfo(zielPfad)).Name)) 'zur Liste hinzufügen + + cnt += 1 + End If + Next + + + Return cnt + + Dim NCTSTR_server = "" Dim NCTSTR_name = "" Dim NCTSTR_pwd = "" @@ -120,7 +153,7 @@ Public Class frmTRNCTS_NachrichtenVerarbeitung Do While reader.Peek <> -1 Dim fName = reader.ReadLine - + MsgBox(fName) Loop End Using @@ -261,96 +294,105 @@ Public Class frmTRNCTS_NachrichtenVerarbeitung Exit Sub End If - For Each d In 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) - ' EDIFACT - ' If fi.Extension = ".edi" Then - Dim alreadyMoved = False - If fi.Extension.ToLower = ".xml" Then - Dim xmlWriterSettings As XmlWriterSettings = New XmlWriterSettings With {.Encoding = System.Text.Encoding.UTF8, .CheckCharacters = True} + For NACHRICHTENTYP = 1 To 10 'Nach Nachrichtentyp abarbeteiten - Dim doc As New XmlDocument() - Dim XML_Code = System.IO.File.ReadAllText(d, System.Text.UTF8Encoding.Default) + For Each d In 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) - doc.LoadXml(SanitizeXmlString(XML_Code)) - Dim VERSION As String = "" + ' EDIFACT + ' If fi.Extension = ".edi" Then + Dim alreadyMoved = False - '------------------------------------------------------------------------------------------------------------------------------ - ' eZOLL - '------------------------------------------------------------------------------------------------------------------------------ + Dim NACHRICHTENTYP_notfound = False + + If fi.Extension.ToLower = ".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 = "" + + '------------------------------------------------------------------------------------------------------------------------------ + ' eZOLL + '------------------------------------------------------------------------------------------------------------------------------ - '------------------------------------------ - '------------------ Anmeldung ------------------ - '------------------------------------------ - 'MAVI: CC015B - Versandanmeldung Final + '------------------------------------------ + '------------------ Anmeldung ------------------ + '------------------------------------------ + 'MAVI: CC015B - Versandanmeldung Final - 'NCTS: Versandanmeldung - If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_VersandanmeldungXML_CC015B(doc) Then - MsgBox("CC015B") - If cMAVIWorker.readNCTS_VersandanmeldungXML_CC015B(Me, doc) <> "" Then found = True - End If + Select Case NACHRICHTENTYP + Case 1 + 'NCTS: Versandanmeldung + If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_VersandanmeldungXML_CC015B(doc) Then + If cMAVIWorker.readNCTS_VersandanmeldungXML_CC015B(Me, doc) <> "" Then found = True + End If - 'NCTS: Versandanmeldung - Ergänzung GUID - If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_VersandanmeldungXML_CC015B_RES(doc) Then - MsgBox("CC015B_RES") - If cMAVIWorker.readNCTS_VersandanmeldungXML_CC015B_RES(Me, doc) <> "" Then found = True + Case 2 + 'NCTS: Versandanmeldung - Ergänzung GUID + If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_VersandanmeldungXML_CC015B_RES(doc) Then + If cMAVIWorker.readNCTS_VersandanmeldungXML_CC015B_RES(Me, doc) <> "" Then found = True + End If + Case 3 + 'NCTS: BestätigungZoll + If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_BestaetigungZollXML_CC029B(doc) Then + If cMAVIWorker.readNCTS_BestaetigungZollXML_CC029B(Me, doc) <> "" Then found = True + End If + Case 4 + 'NCTS: Guarantee + If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_BestaetigungZollXML_GUA_INF(doc) Then + If cMAVIWorker.readNCTS_BestaetigungZollXML_GUA_INF(Me, doc) <> "" Then found = True + End If + Case 5 + 'NCTS: Ankunftsanzeige + If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_BestaetigungZollXML_ARR_INF(doc) Then + If cMAVIWorker.readNCTS_BestaetigungZollXML_ARR_INF(Me, doc) <> "" Then found = True + End If + + Case 6 + 'NCTS: Erledigungsmitteilung + If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_ErledigungsmitteilungXML_CC045A(doc) Then + If cMAVIWorker.readNCTS_ErledigungsmitteilungXML_CC045A(Me, doc) <> "" Then found = True + End If + + Case 10 + NACHRICHTENTYP_notfound = True ' alle nciht zu verarbeitenden + End Select End If - - 'NCTS: BestätigungZoll - If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_BestaetigungZollXML_CC029B(doc) Then - MsgBox("CC029B") - If cMAVIWorker.readNCTS_BestaetigungZollXML_CC029B(Me, doc) <> "" Then found = True - End If - - ''NCTS: Guarantee - 'If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_BestaetigungZollXML_GUA_INF(doc) Then - ' MsgBox("GUA_INF") - ' If cMAVIWorker.readNCTS_BestaetigungZollXML_GUA_INF(Me, doc) <> "" Then found = True - 'End If - - 'NCTS: Ankunftsanzeige - If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_BestaetigungZollXML_ARR_INF(doc) Then - MsgBox("ARR_INF") - If cMAVIWorker.readNCTS_BestaetigungZollXML_ARR_INF(Me, doc) <> "" Then found = True - End If - - - 'NCTS: Erledigungsmitteilung - If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_ErledigungsmitteilungXML_CC045A(doc) Then - MsgBox("CC045A") - If cMAVIWorker.readNCTS_ErledigungsmitteilungXML_CC045A(Me, doc) <> "" Then 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) + 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") & "\") + cntDatenEingelesen += 1 + Else + If NACHRICHTENTYP_notfound Then + frmStartOptions.moveFile(d, ERROR_PFAD) ' nciht gefunden, oder durch ERROR nicht eingearbt,. + dsNichtErkannt += 1 End If + End If + ' If found Then Else dsNichtErkannt += 1 + Me.Refresh() End If + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Next + - Me.Refresh() - If found Then cntDatenEingelesen += 1 Else dsNichtErkannt += 1 - End If - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) - End Try Next + End Sub @@ -362,7 +404,6 @@ Public Class frmTRNCTS_NachrichtenVerarbeitung Dim xw = New XmlTextWriter(sw) doc.WriteTo(xw) Dim XmlString = sw.ToString() - MsgBox(XmlString) End If Return False End Function @@ -522,8 +563,8 @@ Public Class frmTRNCTS_NachrichtenVerarbeitung End If End Sub + Private Sub pnl_Paint(sender As Object, e As PaintEventArgs) Handles pnl.Paint - - + End Sub End Class