diff --git a/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb b/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb index 6ec637c..3e32483 100644 --- a/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb +++ b/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb @@ -1203,6 +1203,7 @@ Public Class cDakosy_EZA_Adressen Property ezaAd_Bewilligungsnummer As Object = Nothing ' VARCHAR (35) NULL, Property ezaAd_BewilligungsFachVerfahren As Object = Nothing ' VARCHAR (35) NULL, Property ezaAd_BewilligungsnummerEndverwender As Object = Nothing ' VARCHAR (35) NULL, + ' Property ezaAd_VERAGKdNr As Object = Nothing ' VARCHAR (35) NULL, Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -1233,6 +1234,7 @@ Public Class cDakosy_EZA_Adressen list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ezaAd_Bewilligungsnummer", ezaAd_Bewilligungsnummer)) ' VARCHAR (35) NULL, list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ezaAd_BewilligungsFachVerfahren", ezaAd_BewilligungsFachVerfahren)) ' VARCHAR (35) NULL, list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ezaAd_BewilligungsnummerEndverwender", ezaAd_BewilligungsnummerEndverwender)) ' VARCHAR (35) NULL, + 'list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ezaAd_VERAGKdNr", ezaAd_VERAGKdNr)) ' VARCHAR (35) NULL, Return list End Function diff --git a/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut.vb b/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut.vb index 279bf59..29f1d25 100644 --- a/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut.vb +++ b/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut.vb @@ -866,7 +866,7 @@ Public Class cDakosyNCTSOut SPEDITIONSBUCH.Abfertigungsart = 6 For Each s In DY.ncts_SICHERHEITSANGABEN Select Case If(s.nctsSA_GRN, "") - Case "15TR0004000020917", "12TR0004000004665" : SPEDITIONSBUCH.Abfertigungsart = 34 + Case "15TR0004000020917", "12TR0004000004665", "17TR0004000032349", "17TR0004000029518" : SPEDITIONSBUCH.Abfertigungsart = 34 Case "16DE0000000068410" : SPEDITIONSBUCH.Abfertigungsart = 33 Case "15TR0004000020908", "13TR0004000005094", "18DE0000000073276" : SPEDITIONSBUCH.Abfertigungsart = 37 End Select diff --git a/DAKOSY_Worker/DAKOSY/cDakosy_Zollanmeldungen.vb b/DAKOSY_Worker/DAKOSY/cDakosy_Zollanmeldungen.vb index 407f964..29cd769 100644 --- a/DAKOSY_Worker/DAKOSY/cDakosy_Zollanmeldungen.vb +++ b/DAKOSY_Worker/DAKOSY/cDakosy_Zollanmeldungen.vb @@ -84,7 +84,20 @@ Public Class cDakosy_Zollanmeldungen Dim split = Me.dy_BezugsNr.Split("/") If split.Length >= 2 Then srchStrFiliale = split(0) - srchStrAbf = split(1) + + 'Wenn Abfertigungsnummer korrekt gefunden wurde... + If IsNumeric(split(1)) Then + srchStrAbf = split(1) + Else + Dim tmp = "" + 'Bis zum ersten Buchstaben... + For Each s In split(1) + If IsNumeric(s) Then : tmp &= s + Else : Exit For : End If + Next + srchStrAbf = tmp + End If + ' ElseIf Then ' srchStrAbf = split(X) Else diff --git a/DAKOSY_Worker/DAKOSY_Worker_lib.vbproj b/DAKOSY_Worker/DAKOSY_Worker_lib.vbproj index e379a6f..a4a3aa1 100644 --- a/DAKOSY_Worker/DAKOSY_Worker_lib.vbproj +++ b/DAKOSY_Worker/DAKOSY_Worker_lib.vbproj @@ -10,7 +10,8 @@ DAKOSY_Worker 512 Windows - v4.5 + v4.7 + true @@ -73,6 +74,7 @@ + diff --git a/DAKOSY_Worker/My Project/Application.Designer.vb b/DAKOSY_Worker/My Project/Application.Designer.vb index 88dd01c..8ab460b 100644 --- a/DAKOSY_Worker/My Project/Application.Designer.vb +++ b/DAKOSY_Worker/My Project/Application.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ diff --git a/DAKOSY_Worker/My Project/Resources.Designer.vb b/DAKOSY_Worker/My Project/Resources.Designer.vb index c3ac3a1..70a586f 100644 --- a/DAKOSY_Worker/My Project/Resources.Designer.vb +++ b/DAKOSY_Worker/My Project/Resources.Designer.vb @@ -1,40 +1,41 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ Option Strict On Option Explicit On +Imports System Namespace My.Resources - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ + _ Friend Module Resources - + Private resourceMan As Global.System.Resources.ResourceManager - + Private resourceCulture As Global.System.Globalization.CultureInfo - + ''' - ''' Returns the cached ResourceManager instance used by this class. + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. ''' - _ + _ Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then @@ -44,17 +45,17 @@ Namespace My.Resources Return resourceMan End Get End Property - + ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. ''' - _ + _ Friend Property Culture() As Global.System.Globalization.CultureInfo Get Return resourceCulture End Get - Set(ByVal value As Global.System.Globalization.CultureInfo) + Set resourceCulture = value End Set End Property diff --git a/DAKOSY_Worker/My Project/Settings.Designer.vb b/DAKOSY_Worker/My Project/Settings.Designer.vb index 4c13763..ad4ccf8 100644 --- a/DAKOSY_Worker/My Project/Settings.Designer.vb +++ b/DAKOSY_Worker/My Project/Settings.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ @@ -13,42 +13,42 @@ 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 "My.Settings Auto-Save Functionality" + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) + +#Region "Automatische My.Settings-Speicherfunktion" #If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean + Private Shared addedHandler As Boolean - Private Shared addedHandlerLockObject As New Object + Private Shared addedHandlerLockObject As New Object - _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub + _ + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - + #If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If #End If Return defaultInstance End Get diff --git a/DAKOSY_Worker/cIMPORT_Codelisten.vb b/DAKOSY_Worker/cIMPORT_Codelisten.vb index d6d44c1..0622d9e 100644 --- a/DAKOSY_Worker/cIMPORT_Codelisten.vb +++ b/DAKOSY_Worker/cIMPORT_Codelisten.vb @@ -27,6 +27,8 @@ Public Class cIMPORT_Codelisten Return Import_I0400(TESTSYSTEM) Case "I0200" Return Import_I0200(TESTSYSTEM) + Case "I0700" + Return Import_I0700(TESTSYSTEM) End Select Return False End Function @@ -469,6 +471,60 @@ Public Class cIMPORT_Codelisten End Function + + Shared Function Import_I0700(TESTSYSTEM) As Boolean + Dim MyData As String = "" + Try + System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 + + Using WC As New System.Net.WebClient() + ' C0008_URL() + WC.Encoding = ASCIIEncoding.UTF8 + Dim URL = cDY_Paramter.GET_PARAM_ByName("I0700_URL", TESTSYSTEM) + If URL = String.Empty Then Return False + ' MsgBox(URL) + MyData = WC.DownloadString(URL) + Dim doc As New XmlDocument() + doc.LoadXml(MyData) + + Dim LC As New cMasseinheit + If doc.HasChildNodes Then + If doc.GetElementsByTagName("Codelist").Count > 0 Then + If doc.GetElementsByTagName("Codelist")(0).HasChildNodes Then + For Each Entry As XmlNode In doc.GetElementsByTagName("Codelist")(0).ChildNodes + ' MsgBox(Entry.SelectNodes("Code")(0).InnerText) + Dim Code = "" + Dim Qualifier = "" + Dim CodeQualifier = "" + Dim Description = "" + Dim StartDate = Nothing + Dim EndDate = Nothing + If Entry.SelectNodes("Code").Count > 0 Then Code = Entry.SelectNodes("Code")(0).InnerText + If Entry.SelectNodes("Qualifier").Count > 0 Then Qualifier = Entry.SelectNodes("Qualifier")(0).InnerText + If Entry.SelectNodes("Description").Count > 0 Then Description = Entry.SelectNodes("Description")(0).InnerText + If Entry.SelectNodes("StartDate").Count > 0 Then StartDate = CDate(Entry.SelectNodes("StartDate")(0).InnerText) + If Entry.SelectNodes("EndDate").Count > 0 Then EndDate = CDate(Entry.SelectNodes("EndDate")(0).InnerText) + + LC.Add(New cMasseinheit.cMasseinheitI0700(Code, Qualifier, Code & Qualifier, Description, StartDate, EndDate)) + + Next + End If + End If + End If + If LC.Count > 0 Then + Return LC.INSERT_DB(TESTSYSTEM) + End If + End Using + + Catch ex As Exception + MsgBox(ex.Message) + End Try + Return False + + End Function + + + End Class @@ -513,6 +569,54 @@ Class cWaehrungsliste End Class +Class cMasseinheit + Inherits List(Of cMasseinheitI0700) + + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + Function INSERT_DB(TESTSSYSTEM) As Boolean + + If SQL.doSQL("DELETE FROM [tbl_DY_ZollDE_I0700_Masseinheiten]", , , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSSYSTEM)) Then + Dim ok = True + For Each l In Me + Dim List As New List(Of VERAG_PROG_ALLGEMEIN.MyListItem2) + List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("Code", l.Code)) + List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("Qualifier", l.Qualifier)) + List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("CodeQualifier", l.CodeQualifier)) + List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("Description", l.Description)) + List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("StartDate", l.StartDate)) + List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("EndDate", l.EndDate)) + If Not SQL.doSQL("INSERT INTO [tbl_DY_ZollDE_I0700_Masseinheiten] (Code, Qualifier,CodeQualifier,Description, StartDate, EndDate) VALUES (@Code,@Qualifier,@CodeQualifier,@Description, @StartDate, @EndDate); ", "FMZOLL", , List, SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSSYSTEM)) Then + ok = False + End If + Next + Return ok + End If + Return False + End Function + + Class cMasseinheitI0700 + Property Code As String = "" + Property Qualifier As String = "" + Property CodeQualifier As String = "" + + Property Description As String = "" + Property StartDate As Object = Nothing + Property EndDate As Object = Nothing + + Sub New(Code, Qualifier, CodeQualifier, Description, StartDate, EndDate) + Me.Code = Code + Me.Qualifier = Qualifier + Me.CodeQualifier = CodeQualifier + Me.Description = Description + Me.StartDate = StartDate + Me.EndDate = EndDate + End Sub + End Class + + + +End Class Class cEZA_Unterlagearten Inherits List(Of cEZA_UnterlageartenI0200) diff --git a/DAKOSY_Worker/cZOLL_IMPORT.vb b/DAKOSY_Worker/cZOLL_IMPORT.vb index bddf522..d3f0ae3 100644 --- a/DAKOSY_Worker/cZOLL_IMPORT.vb +++ b/DAKOSY_Worker/cZOLL_IMPORT.vb @@ -253,7 +253,7 @@ Public Class cZOLL_IMPORT End Function 'Zollsystem 0,1 - Public Function IMPORT(SPEDITIONSBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, avisoLinkId As Integer, SendungId As Integer, strManNr As String, strManNl As String, Zollsystem As String, EZA_Nr As String, NCTS_Nr As String, ByRef notFound As Boolean, Optional autoImport As Boolean = False) As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch + Public Function IMPORT(SPEDITIONSBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, avisoLinkId As Integer, SendungId As Integer, strManNr As String, strManNl As String, Zollsystem As String, EZA_Nr As String, NCTS_Nr As String, ByRef notFound As Boolean, Optional autoImport As Boolean = False, Optional Personalnummer As Integer = -1) As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch Me.SPEDITIONSBUCH = SPEDITIONSBUCH Me.strManNr = strManNr @@ -497,28 +497,28 @@ Public Class cZOLL_IMPORT 'Wenn Packstücke im Aviso eingegeben wurden, werden diese in das Speditionbuch gespeichert If packstueckeAVISO_TMP.Trim <> "" Then - SPEDITIONSBUCH.Packstücke = packstueckeAVISO_TMP - If packstueckeZOLL_TMP.Trim <> "" Then SPEDITIONSBUCH.Bemerkungen = packstueckeZOLL_TMP + SPEDITIONSBUCH.Packstücke = packstueckeAVISO_TMP + If packstueckeZOLL_TMP.Trim <> "" Then SPEDITIONSBUCH.Bemerkungen = packstueckeZOLL_TMP + Else + If packstueckeZOLL_TMP.Trim <> "" Then SPEDITIONSBUCH.Packstücke = packstueckeZOLL_TMP + End If + + 'Wenn Gewicht im Aviso eingegeben ist, aber keine Rohmasse von ATLAS/EZOLL + If IsNull(SPEDITIONSBUCH.Rohmasse) And Not IsNull(RohmasseAviso) Then + If IsNumeric(RohmasseAviso) Then + SPEDITIONSBUCH.Rohmasse = CInt(RohmasseAviso) + End If + End If + + ' If autoImport And Not notFound Then + If SENDUNG IsNot Nothing AndAlso SENDUNG.tblSnd_Abfertigungsart_ID > 0 Then + If (SENDUNG.tblSnd_Abfertigungsart_ID = 26 Or SENDUNG.tblSnd_Abfertigungsart_ID = 28) And NCTS_Nr <> "" Then + 'Überstellungs-T + SPEDITIONSBUCH.Abfertigungsart = 5 Else - If packstueckeZOLL_TMP.Trim <> "" Then SPEDITIONSBUCH.Packstücke = packstueckeZOLL_TMP - End If - - 'Wenn Gewicht im Aviso eingegeben ist, aber keine Rohmasse von ATLAS/EZOLL - If IsNull(SPEDITIONSBUCH.Rohmasse) And Not IsNull(RohmasseAviso) Then - If IsNumeric(RohmasseAviso) Then - SPEDITIONSBUCH.Rohmasse = CInt(RohmasseAviso) - End If - End If - - ' If autoImport And Not notFound Then - If SENDUNG IsNot Nothing AndAlso SENDUNG.tblSnd_Abfertigungsart_ID > 0 Then - If (SENDUNG.tblSnd_Abfertigungsart_ID = 26 Or SENDUNG.tblSnd_Abfertigungsart_ID = 28) And NCTS_Nr <> "" Then - 'Überstellungs-T - SPEDITIONSBUCH.Abfertigungsart = 5 - Else - SPEDITIONSBUCH.Abfertigungsart = SENDUNG.tblSnd_Abfertigungsart_ID - End If + SPEDITIONSBUCH.Abfertigungsart = SENDUNG.tblSnd_Abfertigungsart_ID End If + End If ' End If @@ -531,7 +531,7 @@ Public Class cZOLL_IMPORT If SPEDITIONSBUCH.Währungsschlüssel Is Nothing OrElse (IsNumeric(SPEDITIONSBUCH.Währungsschlüssel) AndAlso SPEDITIONSBUCH.Währungsschlüssel <= 0) Then SPEDITIONSBUCH.Währungsschlüssel = 900 - + If Personalnummer > 0 Then SPEDITIONSBUCH.Personalnummer = Personalnummer 'notFound = Me.notFound If autoImport AndAlso Not checkIfAutoOK() Then @@ -609,7 +609,7 @@ Public Class cZOLL_IMPORT - Function checkIfAutoOK() As Boolean + Public Function checkIfAutoOK() As Boolean Try If If(SPEDITIONSBUCH.Personalnummer, "") = "" Then Return False diff --git a/DAKOSY_Worker/cZollsysteme_Aktenbeschriftung.vb b/DAKOSY_Worker/cZollsysteme_Aktenbeschriftung.vb new file mode 100644 index 0000000..9c29bc6 --- /dev/null +++ b/DAKOSY_Worker/cZollsysteme_Aktenbeschriftung.vb @@ -0,0 +1,649 @@ +Public Class cZollsysteme_Aktenbeschriftung + + Property Praeferenznachweis As String + Property Handelsrechnung As String + Property PräferenzAufRechnung As String + + Property Colli As String + Property Gewicht As String + Property Rechnungspreis As String + Property Warenbezeichung As String + + Property AbgabenKonto As String + Property Garantie As String + + Property Absender As String + Property Empfaenger As String + Property Anmelder As String + Property Vertreter As String + Property Sachbearbeiter As String + + Property VerBestLandZst As String + + Property ATCMRN As String + + Shared SQL As New VERAG_PROG_ALLGEMEIN.SQL + + 'Sub New(BezugsNr, Abfertigungsart) + ' getDataByBezugsnummer(BezugsNr, Abfertigungsart) + 'End Sub + + Function getDataByBezugsnummer(BezugsNr As String, Abfertigungsart As String) As Boolean + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "IMEX" + Case "UNISPED" + Case Else + Select Case Abfertigungsart + Case 38, 26 'AT + ' getADFrom_EZOLL + Case 1, 2, 3, 28 + If load_EZA_FromDAKOSY(BezugsNr) Then Return True + '... and Systeme + + Case 5, 6 + If load_NCTS_FromDAKOSY(BezugsNr) Then Return True + End Select + End Select + Return False + End Function + + Function addIfNotExists(ByRef LIST As List(Of String), addstring As String) As List(Of String) + If addstring = "" Then Return LIST + For Each s In LIST + If s = addstring Then Return LIST + Next + LIST.Add(addstring) + Return LIST + End Function + + Function listToString(ByRef LIST As List(Of String)) As String + listToString = "" + For Each s In LIST + listToString &= ", " & s + Next + If listToString <> "" Then listToString = listToString.Substring(2) + End Function + + Function load_EZA_FromDAKOSY(BezugsNr) As Boolean + Dim EZA = DAKOSY_Worker.cDakosyEZA.LOADByBezugsNr(BezugsNr, True) + If EZA Is Nothing Then Return False + Return load_EZA_FromDAKOSY(EZA) + End Function + + Function load_EZA_FromDAKOSY(EZA As DAKOSY_Worker.cDakosyEZA) As Boolean + Try + If EZA Is Nothing Then Return Nothing + EZA.LOAD_Warenposition() + + ' + If IsNumeric(If(EZA.eza_GesamtRohmasse, "")) Then Me.Gewicht = CDbl(EZA.eza_GesamtRohmasse).ToString("N1") & " kg" + If IsNumeric(If(EZA.eza_Rechnungspreis, "")) Then Me.Rechnungspreis = CDbl(EZA.eza_Rechnungspreis).ToString("N2") + Me.Rechnungspreis &= " " & If(EZA.eza_Rechnungswaehrung, "") + ATCMRN = If(EZA.eza_ANR, "") + + ' Me.Rechnungspreis &= " " & If(EZA.eza_Rechnungswaehrung, "") + 'Property Absender As String + 'Property Empfaenger As String + 'Property Anmelder As String + + Dim RG_List As New List(Of String) + Dim ATR_List As New List(Of String) + Dim PAR_List As New List(Of String) ' präfAufRg + Dim Colli As Integer = 0 + Dim cnt As Integer = 0 + If EZA.eza_WARENPOS.Count > 0 Then + Me.Warenbezeichung = EZA.eza_WARENPOS.Count & " POS: " + Me.Warenbezeichung &= If(EZA.eza_WARENPOS.Count = 1, If(EZA.eza_WARENPOS(0).ezaWP_Warenbezeichnung, ""), "* diverse *") + For Each POS In EZA.eza_WARENPOS + For Each UL In POS.ezaWP_UNTERLAGEN + If UL.ezaWpUl_Art IsNot Nothing Then + Select Case UL.ezaWpUl_Art + Case "N380", "N325" : addIfNotExists(RG_List, (If(UL.ezaWpUl_DatumAusstellung, "") & " " & If(UL.ezaWpUl_Nummer, "")).trim) + Case "N018", "N954" : addIfNotExists(ATR_List, (If(UL.ezaWpUl_DatumAusstellung, "") & " " & If(UL.ezaWpUl_Nummer, "")).trim) + Case "N864" : addIfNotExists(PAR_List, (If(UL.ezaWpUl_DatumAusstellung, "") & " " & If(UL.ezaWpUl_Nummer, "")).trim) + End Select + End If + Next + If IsNumeric(If(POS.ezaWP_PackstueckAnzahl, "")) Then Colli += POS.ezaWP_PackstueckAnzahl + cnt += 1 + Next + End If + Me.Colli = Colli & " Pk." + + For Each AD In EZA.eza_ADRESSEN + If AD.ezaAd_AdressTyp IsNot Nothing Then + Dim Anschrift = (If(AD.ezaAd_TeilnehmerEORI, "") & " " & If(AD.ezaAd_NameFirma1, "") & " " & If(AD.ezaAd_LandCode, "") & " " & If(AD.ezaAd_Ort, "")).ToString.Trim + Select Case AD.ezaAd_AdressTyp + Case "CZ" : Absender = Anschrift + Case "CN" : Empfaenger = Anschrift + Case "DT" : Anmelder = Anschrift + Case "CB" : Vertreter = Anschrift + End Select + End If + Next + Sachbearbeiter = If(EZA.eza_Bearbeiter, "") + + VerBestLandZst = If(EZA.eza_VersendungsLandCode, "") & " --> " & If(EZA.eza_Bestimmungsland, "") + If VerBestLandZst.Trim.StartsWith("-->") Then VerBestLandZst = VerBestLandZst.Replace("-->", "") + If If(EZA.eza_Bestimmungsland, "") = "DE" Then + If If(EZA.eza_AdressierteZollstelle, "") <> "" Then VerBestLandZst &= ", DE00" & EZA.eza_AdressierteZollstelle + Else + If If(EZA.eza_AdressierteZollstelle, "") <> "" Then VerBestLandZst &= ", " & EZA.eza_AdressierteZollstelle + End If + + + Handelsrechnung = listToString(RG_List) + Praeferenznachweis = listToString(ATR_List) + PräferenzAufRechnung = listToString(PAR_List) + + Dim AUFSCHUB_List As New List(Of String) + For Each AB In EZA.eza_AUFSCHUB + addIfNotExists(AUFSCHUB_List, (If(AB.ezaAfb_KontoNr, "")).Trim) + Next + + AbgabenKonto = listToString(AUFSCHUB_List) + + + Return True + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Return Nothing + End Try + Return False + End Function + + Function load_NCTS_FromDAKOSY(BezugsNr) As Boolean + Dim NCTS = DAKOSY_Worker.cDakosyNCTSOut.LOADByBezugsNr(BezugsNr, True) + If NCTS Is Nothing Then Return False + Return load_NCTS_FromDAKOSY(NCTS) + End Function + + Function load_NCTS_FromDAKOSY(NCTS As DAKOSY_Worker.cDakosyNCTSOut) As Boolean + Try + If NCTS Is Nothing Then Return Nothing + NCTS.LOAD_Warenposition() + + ' + If IsNumeric(If(NCTS.ncts_GesamtRohmasse, "")) Then Me.Gewicht = CDbl(NCTS.ncts_GesamtRohmasse).ToString("N1") & " kg" + + ' Me.Rechnungspreis &= " " & If(NCTS.NCTS_Rechnungswaehrung, "") + 'Property Absender As String + 'Property Empfaenger As String + 'Property Anmelder As String + + Dim RG_List As New List(Of String) + Dim ATR_List As New List(Of String) + Dim PAR_List As New List(Of String) ' präfAufRg + Dim Colli As Integer = 0 + Dim cnt As Integer = 0 + Dim Warenwert As Double = 0 + Dim WarenwertWaehrung As String = "" + + If NCTS.ncts_WARENPOS.Count > 0 Then + Me.Warenbezeichung = NCTS.ncts_WARENPOS.Count & " POS: " + Me.Warenbezeichung &= If(NCTS.ncts_WARENPOS.Count = 1, If(NCTS.ncts_WARENPOS(0).nctsWP_Warenbezeichnung, ""), "* diverse *") + For Each POS In NCTS.ncts_WARENPOS + For Each UL In POS.nctsWP_UNTERLAGEN + If UL.nctsWpUl_Typ IsNot Nothing Then + Select Case UL.nctsWpUl_Typ + Case "380" : addIfNotExists(RG_List, If(UL.nctsWpUl_Referenz, "")) + End Select + End If + Next + For Each UL In POS.nctsWP_PACKSTUECKE + If IsNumeric(If(UL.nctsWpPk_PackstueckeAnzahl, "")) Then Colli += UL.nctsWpPk_PackstueckeAnzahl + Next + + If cnt = 0 Then WarenwertWaehrung = If(POS.nctsWP_WarenwertWaehrung, "") + If IsNumeric(If(POS.nctsWP_Warenwert, "")) Then Warenwert += POS.nctsWP_Warenwert + + cnt += 1 + Next + End If + Me.Colli = Colli & " Pk." + Me.Rechnungspreis = Warenwert.ToString("N2") & " " & WarenwertWaehrung + + + Absender = (If(NCTS.ncts_Versender_EORI, "") & " " & If(NCTS.ncts_Versender_Name, "") & " " & If(NCTS.ncts_Versender_Land, "") & " " & If(NCTS.ncts_Versender_Ort, "")).ToString.Trim + Empfaenger = (If(NCTS.ncts_Empfaenger_EORI, "") & " " & If(NCTS.ncts_Empfaenger_Name, "") & " " & If(NCTS.ncts_Empfaenger_Land, "") & " " & If(NCTS.ncts_Empfaenger_Ort, "")).ToString.Trim + Anmelder = (If(NCTS.ncts_Hauptverpflichteter_EORI, "") & " " & If(NCTS.ncts_Hauptverpflichteter_Name, "") & " " & If(NCTS.ncts_Hauptverpflichteter_Land, "") & " " & If(NCTS.ncts_Hauptverpflichteter_Ort, "")).ToString.Trim + Sachbearbeiter = If(NCTS.ncts_Bearbeiter, "") + + + ATCMRN = If(If(NCTS.ncts_MRN, "") = "", If(NCTS.ncts_ANR, ""), If(NCTS.ncts_MRN, "")) + + VerBestLandZst = If(NCTS.ncts_VersendungsLandCode, "") & " --> " + If VerBestLandZst.Trim.StartsWith("-->") Then VerBestLandZst = VerBestLandZst.Replace("-->", "") + If If(NCTS.ncts_SumA_BefoerderungsrouteLand1, "") <> "" Then VerBestLandZst &= "" & NCTS.ncts_SumA_BefoerderungsrouteLand1 + If If(NCTS.ncts_SumA_BefoerderungsrouteLand2, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_SumA_BefoerderungsrouteLand2 + If If(NCTS.ncts_SumA_BefoerderungsrouteLand3, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_SumA_BefoerderungsrouteLand3 + If If(NCTS.ncts_SumA_BefoerderungsrouteLand4, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_SumA_BefoerderungsrouteLand4 + If If(NCTS.ncts_SumA_BefoerderungsrouteLand5, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_SumA_BefoerderungsrouteLand5 + If If(NCTS.ncts_SumA_BefoerderungsrouteLand6, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_SumA_BefoerderungsrouteLand6 + If If(NCTS.ncts_SumA_BefoerderungsrouteLand7, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_SumA_BefoerderungsrouteLand7 + If If(NCTS.ncts_SumA_BefoerderungsrouteLand8, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_SumA_BefoerderungsrouteLand8 + If If(NCTS.ncts_SumA_BefoerderungsrouteLand9, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_SumA_BefoerderungsrouteLand9 + If If(NCTS.ncts_SumA_BefoerderungsrouteLand10, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_SumA_BefoerderungsrouteLand10 + If If(NCTS.ncts_SumA_BefoerderungsrouteLand11, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_SumA_BefoerderungsrouteLand11 + If If(NCTS.ncts_SumA_BefoerderungsrouteLand12, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_SumA_BefoerderungsrouteLand12 + VerBestLandZst &= " --> " & If(NCTS.ncts_BestimmungslandCode, "") & ", " + + VerBestLandZst &= If(NCTS.ncts_AbgangsDienststellennummer, "") & " --> " + If If(NCTS.ncts_DurchgangszollstelleDienststellnummer1, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_DurchgangszollstelleDienststellnummer1 + If If(NCTS.ncts_DurchgangszollstelleDienststellnummer2, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_DurchgangszollstelleDienststellnummer2 + If If(NCTS.ncts_DurchgangszollstelleDienststellnummer3, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_DurchgangszollstelleDienststellnummer3 + If If(NCTS.ncts_DurchgangszollstelleDienststellnummer4, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_DurchgangszollstelleDienststellnummer4 + If If(NCTS.ncts_DurchgangszollstelleDienststellnummer5, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_DurchgangszollstelleDienststellnummer5 + If If(NCTS.ncts_DurchgangszollstelleDienststellnummer6, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_DurchgangszollstelleDienststellnummer6 + If If(NCTS.ncts_DurchgangszollstelleDienststellnummer7, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_DurchgangszollstelleDienststellnummer7 + If If(NCTS.ncts_DurchgangszollstelleDienststellnummer8, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_DurchgangszollstelleDienststellnummer8 + If If(NCTS.ncts_DurchgangszollstelleDienststellnummer9, "") <> "" Then VerBestLandZst &= ", " & NCTS.ncts_DurchgangszollstelleDienststellnummer9 + + If If(NCTS.ncts_BestimmungsstelleDienststellennummer, "") <> "" Then VerBestLandZst &= " --> " & NCTS.ncts_BestimmungsstelleDienststellennummer + + VerBestLandZst = VerBestLandZst.Replace(" --> --> ", " --> ") + + Handelsrechnung = listToString(RG_List) + Praeferenznachweis = listToString(ATR_List) + PräferenzAufRechnung = listToString(PAR_List) + + Dim AUFSCHUB_List As New List(Of String) + Dim GRNBetrag As Double = 0 + For Each AB In NCTS.ncts_SICHERHEITSANGABEN + addIfNotExists(AUFSCHUB_List, (If(AB.nctsSA_GRN, "")).Trim) + If IsNumeric(If(AB.nctsSA_AbgabenBetrag, "")) Then GRNBetrag += AB.nctsSA_AbgabenBetrag + Next + + Garantie = listToString(AUFSCHUB_List) + Garantie &= ", " & GRNBetrag.ToString("C2") + + Return True + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Return Nothing + End Try + Return False + End Function + + Function load_NCTS_FromDAKOSY(NCTS_TMP As DAKOSY_Worker.cDakosyNCTSOut, DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen, ByRef UniqueId As String) As Boolean + Try + If DY_TMP Is Nothing Then Return Nothing + If NCTS_TMP Is Nothing Then Return Nothing + NCTS_TMP.LOAD_Warenposition() + + Me.Colli = If(NCTS_TMP.ncts_GesamtAnzahlPackstuecke, "") & " Pk." + If IsNumeric(If(NCTS_TMP.ncts_GesamtRohmasse, "")) Then Me.Gewicht = CDbl(NCTS_TMP.ncts_GesamtRohmasse).ToString("N1") & " kg" + + + Dim RG_List As New List(Of String) + Dim ATR_List As New List(Of String) + Dim NAR_List As New List(Of String) + + For Each POS In NCTS_TMP.ncts_WARENPOS + For Each UL In POS.nctsWP_UNTERLAGEN + If UL.nctsWpUl_Typ = 380 Then addIfNotExists(RG_List, UL.nctsWpUl_Referenz) + If UL.nctsWpUl_Typ = 380 Then addIfNotExists(ATR_List, UL.nctsWpUl_Referenz) + If UL.nctsWpUl_Typ = 380 Then addIfNotExists(NAR_List, UL.nctsWpUl_Referenz) + Next + Next + + Return True + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Return Nothing + End Try + Return False + End Function + + Shared Function genVERAG_OUT_NCTS_FromEZOLLByLRN(LRN As String, ByRef UniqueId As String) As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts + + Dim dEZOLL As DataTable = SQL.loadDgvBySql("SELECT LizenzNr, OperatorID, VorgangID, AnmID, GeaendertAm, GeaendertVon, CRN, LRN" & + " FROM zsAnmRefs" & + " WHERE (VorgangID = 'AV') AND (LRN = '" & LRN & "')" & + " ORDER BY GeaendertAm DESC", "EZOLL") + If dEZOLL Is Nothing Then Return Nothing + If dEZOLL.Rows.Count = 0 Then Return Nothing + + Dim r As DataRow = dEZOLL.Rows(0) + + Return genVERAG_OUT_NCTS_FromEZOLLByAnmId(r.Item("AnmID"), UniqueId) + End Function + + Shared Function genVERAG_OUT_NCTS_FromEZOLLByAnmId(AnmID As String, ByRef UniqueId As String) As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts + Dim VERAG_NCTS As New VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts + Dim LRN = "" + Try + + ' VERAG_NCTS.Version = "1.0.2" Automaitsch, weil default + + Dim Bestimmungszollstelle = "" + Dim Bürgschaft = "" + + Dim dEZOLL As DataTable = SQL.loadDgvBySql("SELECT LizenzNr, OperatorID, VorgangID, AnmID, GeaendertAm, GeaendertVon, CRN, LRN" & + " FROM zsAnmRefs" & + " WHERE (VorgangID = 'AV') AND (AnmID = '" & AnmID & "')" & + " ORDER BY GeaendertAm DESC", "EZOLL") + + If dEZOLL Is Nothing Then Return Nothing + If dEZOLL.Rows.Count = 0 Then Return Nothing + + 'TextBox2.ForeColor = Color.Green + Dim r As DataRow = dEZOLL.Rows(0) + + LRN = r.Item("LRN") + + If Not SQL.IsNull(r.Item("OperatorID")) Then + Select Case r.Item("OperatorID") + Case "1" + VERAG_NCTS.Company = "VERAG" + VERAG_NCTS.Department = "SUB" + Case "2" + VERAG_NCTS.Company = "VERAG" + VERAG_NCTS.Department = "SBG" + + Case "3" + VERAG_NCTS.Company = "VERAG" + VERAG_NCTS.Department = "NKD" + Case "4", "5" + VERAG_NCTS.Company = "ATILLA" + VERAG_NCTS.Department = "SUB" + Case "6" + If LRN.StartsWith("4801") Then + VERAG_NCTS.Company = "ATILLA" + Else + VERAG_NCTS.Company = "VERAG" + End If + VERAG_NCTS.Department = "SUB" + Case "8" + VERAG_NCTS.Company = "DURMAZ" + VERAG_NCTS.Department = "SBG" + Return Nothing + Case Else + VERAG_NCTS.Company = "ATILLA" + VERAG_NCTS.Department = "SUB" + + End Select + End If + + + VERAG_NCTS.ProcessData.TransactionDate = CDate(r.Item("GeaendertAm")) 'default + + VERAG_NCTS.ProcessData.MRN = r.Item("CRN") + VERAG_NCTS.ProcessData.ReferenzNumber = LRN + + Select Case (SQL.getValueTxtBySql("SELECT ErledigungsTypID FROM zsAnmDHFRefs WHERE AnmID=" & AnmID & " ORDER BY GeaendertAm DESC", "EZOLL")) + Case "F" + VERAG_NCTS.ProcessData.Status = 50 + Case "FB" + VERAG_NCTS.ProcessData.Status = 60 + Case Else + VERAG_NCTS.ProcessData.Status = 0 + End Select + + Dim DTzsAnmHea As DataTable = SQL.loadDgvBySql("SELECT * FROM zsAnmHea WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ")", "EZOLL") + If DTzsAnmHea.Rows().Count > 0 Then + Dim rDTzsAnmHea = DTzsAnmHea.Rows(0) + VERAG_NCTS.ProcessData.ProcedureCode = rDTzsAnmHea("DecTy") + VERAG_NCTS.NCTS_Data.SumGrossWeight = rDTzsAnmHea("TotGross") 'If(NCTS_TMP.ncts_GesamtRohmasse, "0") + VERAG_NCTS.ProcessData.TransactionDate = CDate(rDTzsAnmHea("DecDT")) + End If + + + VERAG_NCTS.NCTS_Data.DepartureCustomsOffice = SQL.isleernothing(SQL.getValueTxtBySql("SELECT Ref FROM zsAnmDepCO WHERE AnmID=" & AnmID & " ORDER BY GeaendertAm DESC", "EZOLL")) + VERAG_NCTS.NCTS_Data.DatDeterminationLimit = SQL.isleernothing(SQL.getValueTxtBySql("SELECT DLimit FROM zsAnmCtrlRslt WHERE AnmID=" & AnmID & " ORDER BY GeaendertAm DESC", "EZOLL")) + + 'BestimmungsstelleDienststelle + Dim DTzsAnmDestCo As DataTable = SQL.loadDgvBySql("SELECT Ref FROM zsAnmDestCo WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ")", "EZOLL") + If DTzsAnmDestCo.Rows().Count > 0 Then + If Not SQL.IsNull(DTzsAnmDestCo.Rows(0).Item("ref")) Then VERAG_NCTS.NCTS_Data.DestinationCustomsOffice = DTzsAnmDestCo.Rows(0).Item("ref") + End If + + ' Kennzeichen + Dim DTzsAnmTransp As DataTable = SQL.loadDgvBySql("SELECT DepIdnt FROM zsAnmTransp WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ")", "EZOLL") + If DTzsAnmTransp.Rows().Count > 0 Then + If Not SQL.IsNull(DTzsAnmTransp.Rows(0).Item("DepIdnt")) Then + VERAG_NCTS.NCTS_Data.LicensePlate = DTzsAnmTransp.Rows(0).Item("DepIdnt") + End If + End If + + 'Versender + Dim DTzsAnmSender As DataTable = SQL.loadDgvBySql("SELECT * FROM [zsAnmConorTra] WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ")", "EZOLL") + If DTzsAnmSender.Rows().Count > 0 Then + VERAG_NCTS.NCTS_Data.Sender.Name = DTzsAnmSender.Rows(0).Item("Na") + If Not SQL.IsNull(DTzsAnmSender.Rows(0).Item("Pst")) Then VERAG_NCTS.NCTS_Data.Sender.Adress.Postcode = DTzsAnmSender.Rows(0).Item("Pst") + If Not SQL.IsNull(DTzsAnmSender.Rows(0).Item("Strt")) Then VERAG_NCTS.NCTS_Data.Sender.Adress.Street = DTzsAnmSender.Rows(0).Item("Strt") + If Not SQL.IsNull(DTzsAnmSender.Rows(0).Item("Cty")) Then VERAG_NCTS.NCTS_Data.Sender.Adress.City = DTzsAnmSender.Rows(0).Item("Cty") + If Not SQL.IsNull(DTzsAnmSender.Rows(0).Item("Ctry")) Then + VERAG_NCTS.NCTS_Data.Sender.Adress.Country = DTzsAnmSender.Rows(0).Item("Ctry") + VERAG_NCTS.NCTS_Data.DepartureCountry = DTzsAnmSender.Rows(0).Item("Ctry") + End If + If Not SQL.IsNull(DTzsAnmSender.Rows(0).Item("TIN")) Then VERAG_NCTS.NCTS_Data.Sender.EORI = DTzsAnmSender.Rows(0).Item("TIN") + 'VERAG_NCTS.NCTS_Data.Sender.EORI_NL = If(NCTS_TMP.ncts_Empfaenger_NLNR, "") + 'VERAG_NCTS.NCTS_Data.Sender.UID_Nr = If(NCTS_TMP.ncts_Empfaenger_NLNR, "") + End If + + + 'Empfänger + Dim DTzsAnmConeeTra As DataTable = SQL.loadDgvBySql("SELECT * FROM zsAnmConeeTra WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ")", "EZOLL") + If DTzsAnmConeeTra.Rows().Count > 0 Then + VERAG_NCTS.NCTS_Data.Consignee.Name = DTzsAnmConeeTra.Rows(0).Item("Na") + If Not SQL.IsNull(DTzsAnmConeeTra.Rows(0).Item("Pst")) Then VERAG_NCTS.NCTS_Data.Consignee.Adress.Postcode = DTzsAnmConeeTra.Rows(0).Item("Pst") + If Not SQL.IsNull(DTzsAnmConeeTra.Rows(0).Item("Strt")) Then VERAG_NCTS.NCTS_Data.Consignee.Adress.Street = DTzsAnmConeeTra.Rows(0).Item("Strt") + If Not SQL.IsNull(DTzsAnmConeeTra.Rows(0).Item("Cty")) Then VERAG_NCTS.NCTS_Data.Consignee.Adress.City = DTzsAnmConeeTra.Rows(0).Item("Cty") + If Not SQL.IsNull(DTzsAnmConeeTra.Rows(0).Item("Ctry")) Then + VERAG_NCTS.NCTS_Data.Consignee.Adress.Country = DTzsAnmConeeTra.Rows(0).Item("Ctry") + VERAG_NCTS.NCTS_Data.DestinationCountry = DTzsAnmConeeTra.Rows(0).Item("Ctry") + End If + If Not SQL.IsNull(DTzsAnmConeeTra.Rows(0).Item("TIN")) Then VERAG_NCTS.NCTS_Data.Consignee.EORI = DTzsAnmConeeTra.Rows(0).Item("TIN") + 'VERAG_NCTS.NCTS_Data.Consignee.EORI_NL = If(NCTS_TMP.ncts_Empfaenger_NLNR, "") + 'VERAG_NCTS.NCTS_Data.Consignee.UID_Nr = If(NCTS_TMP.ncts_Empfaenger_NLNR, "") + End If + + + 'Frächter + 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 + VERAG_NCTS.NCTS_Data.Carrier.Name = DTzsAnmCarrier.Rows(0).Item("Na") + If Not SQL.IsNull(DTzsAnmCarrier.Rows(0).Item("Pst")) Then VERAG_NCTS.NCTS_Data.Carrier.Adress.Postcode = DTzsAnmCarrier.Rows(0).Item("Pst") + If Not SQL.IsNull(DTzsAnmCarrier.Rows(0).Item("Strt")) Then VERAG_NCTS.NCTS_Data.Carrier.Adress.Street = DTzsAnmCarrier.Rows(0).Item("Strt") + If Not SQL.IsNull(DTzsAnmCarrier.Rows(0).Item("Cty")) Then VERAG_NCTS.NCTS_Data.Carrier.Adress.City = DTzsAnmCarrier.Rows(0).Item("Cty") + If Not SQL.IsNull(DTzsAnmCarrier.Rows(0).Item("Ctry")) Then VERAG_NCTS.NCTS_Data.Carrier.Adress.Country = DTzsAnmCarrier.Rows(0).Item("Ctry") + If Not SQL.IsNull(DTzsAnmCarrier.Rows(0).Item("TIN")) Then VERAG_NCTS.NCTS_Data.Carrier.EORI = DTzsAnmCarrier.Rows(0).Item("TIN") + 'VERAG_NCTS.NCTS_Data.Carrier.EORI_NL = If(NCTS_TMP.ncts_Empfaenger_NLNR, "") + 'VERAG_NCTS.NCTS_Data.Carrier.UID_Nr = If(NCTS_TMP.ncts_Empfaenger_NLNR, "") + End If + + + ' Tabelle zsAnmGrteeGrteeRef lesen. + Dim DTzsAnmGrteeGrteeRef As DataTable = SQL.loadDgvBySql("SELECT GRN, GVal" & + " FROM zsAnmGrteeGrteeRef" & + " WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ")" & + " ORDER BY GrteeID, GrteeRefID", "EZOLL") + + If DTzsAnmGrteeGrteeRef.Rows().Count > 0 Then + VERAG_NCTS.NCTS_Data.Guarantee.Amount = 0 + For Each DTzsAnmGrteeGrteeRef_row In DTzsAnmGrteeGrteeRef.Rows() + If Not SQL.IsNull(DTzsAnmGrteeGrteeRef_row.item("GRN")) Then VERAG_NCTS.NCTS_Data.Guarantee.GRN = DTzsAnmGrteeGrteeRef_row.item("GRN") + If Not SQL.IsNull(DTzsAnmGrteeGrteeRef_row.item("GVal")) Then VERAG_NCTS.NCTS_Data.Guarantee.Amount += DTzsAnmGrteeGrteeRef_row.item("GVal") + Next + End If + + 'POSITIONEN + Dim cntPos = 1 + Dim DTzsAnmGdsitem As DataTable = SQL.loadDgvBySql("SELECT * FROM zsAnmGdsitem WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ") ORDER BY GdsItemID", "EZOLL") + If DTzsAnmGdsitem.Rows().Count > 0 Then + For Each DTzsAnmGdsitem_row In DTzsAnmGdsitem.Rows() + Dim V_POS As New VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_nctsNCTS_DataPosition + V_POS.PosNr = cntPos + Dim pkGes = 0 + Dim pkArt = "" + + Dim DTzsAnmGdsitemPk As DataTable = SQL.loadDgvBySql("SELECT * FROM [zsAnmGdsItemPack] WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ") AND GdsItemID='" & DTzsAnmGdsitem_row.Item("GdsItemID") & "' ORDER BY GdsItemID", "EZOLL") + If DTzsAnmGdsitemPk.Rows().Count > 0 Then + For Each DTzsAnmGdsitemPk_row In DTzsAnmGdsitemPk.Rows() + If Not SQL.IsNull(DTzsAnmGdsitemPk_row.item("Kind")) Then pkArt = DTzsAnmGdsitemPk_row.item("Kind") + If Not SQL.IsNull(DTzsAnmGdsitemPk_row.item("Nr")) Then pkGes += DTzsAnmGdsitemPk_row.item("Nr") + Next + End If + + V_POS.Quantity = pkGes + V_POS.Packaging = pkArt + If Not SQL.IsNull(DTzsAnmGdsitem_row.item("Gross")) Then V_POS.GrossWeight = DTzsAnmGdsitem_row.item("Gross") + + V_POS.GoodsDescription = DTzsAnmGdsitem_row.item("GdsDes") + + VERAG_NCTS.NCTS_Data.Position.Add(V_POS) + cntPos += 1 + Next + End If + + UniqueId = AnmID + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine & "BezugsNr: " & LRN, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Return Nothing + End Try + Return VERAG_NCTS + + End Function + + Shared Function getGRTY_fromEZOLL(LRN As String) As String + Try + Return SQL.getValueTxtBySql("SELECT TOP 1 GRN FROM zsAnmRefs inner join zsAnmGrteeGrteeRef on zsAnmGrteeGrteeRef.AnmID=zsAnmRefs.AnmID WHERE (zsAnmRefs.VorgangID = 'AV') AND (LRN = '" & LRN & "')", "EZOLL") + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine & "BezugsNr: " & LRN, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return "" + End Function + + Shared Function genVERAG_OUT_NCTS_FromTELOTEC(NCTS_TMP As TELOTEC_Worker.cTelotec_Anmeldung, ByRef UniqueId As String) As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts + Dim VERAG_NCTS As New VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts + Try + If NCTS_TMP Is Nothing Then Return Nothing + If NCTS_TMP.telanm_BezugsNr Is Nothing Then Return Nothing + If NCTS_TMP.Hea_DecTy Is Nothing Then Return Nothing + If NCTS_TMP.Hea_DecTy <> "T1" And NCTS_TMP.Hea_DecTy <> "T2" And NCTS_TMP.Hea_DecTy <> "T2L" And NCTS_TMP.Hea_DecTy <> "T-" Then Return Nothing + + ' VERAG_NCTS.Version = "1.0.2" Automaitsch, weil default + + If NCTS_TMP.telanm_firma <> "" Then + VERAG_NCTS.Company = NCTS_TMP.telanm_firma + Else + VERAG_NCTS.Company = "IMEX" + End If + VERAG_NCTS.Department = NCTS_TMP.telanm_niederlassung + + + 'VERAG_NCTS.InternalReference.OfficeCode = If( + 'VERAG_NCTS.InternalReference.PositionNumber = NCTS_TMP.ncts_niederlassung + Select Case NCTS_TMP.telanm_Status + Case < 50 + VERAG_NCTS.ProcessData.Status = 0 + Case 50, 53 + VERAG_NCTS.ProcessData.Status = 50 + Case 60 + VERAG_NCTS.ProcessData.Status = 60 + End Select + + VERAG_NCTS.ProcessData.TransactionDate = NCTS_TMP.dec_CreateDate + + VERAG_NCTS.ProcessData.MRN = If(NCTS_TMP.telanm_CRN, "") + VERAG_NCTS.ProcessData.ReferenzNumber = If(NCTS_TMP.telanm_BezugsNr, "") + VERAG_NCTS.ProcessData.ProcedureCode = If(NCTS_TMP.telanm_ART, "") + + VERAG_NCTS.NCTS_Data.DatDeterminationLimit = If(NCTS_TMP.CtrlRslt_DLimit, "") + VERAG_NCTS.NCTS_Data.LicensePlate = If(NCTS_TMP.Transp_DepIdnt, "") + VERAG_NCTS.NCTS_Data.DepartureCustomsOffice = If(NCTS_TMP.DepCO_Ref, "") + VERAG_NCTS.NCTS_Data.DestinationCustomsOffice = If(NCTS_TMP.DestCO_Ref, "") + VERAG_NCTS.NCTS_Data.DepartureCountry = NCTS_TMP.Locs_Disp + VERAG_NCTS.NCTS_Data.DestinationCountry = If(NCTS_TMP.Locs_Dest, "") + + 'Versender + VERAG_NCTS.NCTS_Data.Sender.Name = If(NCTS_TMP.ConorTra_Na, "") + VERAG_NCTS.NCTS_Data.Sender.EORI = If(NCTS_TMP.ConorTra_TIN, "") + 'VERAG_NCTS.NCTS_Data.Sender.EORI_NL = If(NCTS_TMP.ncts_Versender_NLNR, "") + VERAG_NCTS.NCTS_Data.Sender.UID_Nr = If(NCTS_TMP.ConorTra_UIDCtry, "") & If(NCTS_TMP.ConorTra_UID, "") + VERAG_NCTS.NCTS_Data.Sender.Adress.Country = If(NCTS_TMP.ConorTra_Ctry, "") + VERAG_NCTS.NCTS_Data.Sender.Adress.Postcode = If(NCTS_TMP.ConorTra_Pst, "") + VERAG_NCTS.NCTS_Data.Sender.Adress.Street = If(NCTS_TMP.ConorTra_Strt, "") + VERAG_NCTS.NCTS_Data.Sender.Adress.City = If(NCTS_TMP.ConorTra_Cty, "") + + 'Empfänger + VERAG_NCTS.NCTS_Data.Consignee.Name = If(NCTS_TMP.ConeeTra_Na, "") + VERAG_NCTS.NCTS_Data.Consignee.EORI = If(NCTS_TMP.ConeeTra_TIN, "") + 'VERAG_NCTS.NCTS_Data.Consignee.EORI_NL = If(NCTS_TMP.ncts_Versender_NLNR, "") + VERAG_NCTS.NCTS_Data.Consignee.UID_Nr = If(NCTS_TMP.ConeeTra_UIDCtry, "") & If(NCTS_TMP.ConeeTra_UID, "") + VERAG_NCTS.NCTS_Data.Consignee.Adress.Country = If(NCTS_TMP.ConeeTra_Ctry, "") + VERAG_NCTS.NCTS_Data.Consignee.Adress.Postcode = If(NCTS_TMP.ConeeTra_Pst, "") + 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 + 'VERAG_NCTS.NCTS_Data.Carrier.Name = If(NCTS_TMP.ConorTra_Na, "") + 'VERAG_NCTS.NCTS_Data.Carrier.EORI = If(NCTS_TMP.ConorTra_TIN, "") + ''VERAG_NCTS.NCTS_Data.Carrier.EORI_NL = If(NCTS_TMP.ncts_Versender_NLNR, "") + 'VERAG_NCTS.NCTS_Data.Carrier.UID_Nr = If(NCTS_TMP.ConorTra_UIDCtry, "") & If(NCTS_TMP.ConorTra_UID, "") + 'VERAG_NCTS.NCTS_Data.Carrier.Adress.Country = If(NCTS_TMP.ConorTra_Ctry, "") + '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, "") + + 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") + End If + + VERAG_NCTS.NCTS_Data.SumGrossWeight = If(NCTS_TMP.Hea_TotGross, "0") + Dim cntPos = 1 + If NCTS_TMP.POSITIONSDATEN IsNot Nothing Then + For Each POS In NCTS_TMP.POSITIONSDATEN + Dim V_POS As New VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_nctsNCTS_DataPosition + V_POS.PosNr = cntPos + Dim pkGes = 0 + Dim pkArt = "" + If POS.PACKSTUECKE IsNot Nothing Then + For Each PK In POS.PACKSTUECKE + If PK.Pack_Nr IsNot Nothing Then pkGes += PK.Pack_Nr 'verpackt + If PK.Pack_Piec IsNot Nothing Then pkGes += PK.Pack_Piec 'unverpackt + If PK.Pack_Kind IsNot Nothing Then pkArt = PK.Pack_Kind + Next + End If + V_POS.Quantity = pkGes + V_POS.Packaging = pkArt + V_POS.GrossWeight = POS.Item_Gross + V_POS.GoodsDescription = POS.Item_GdsDes + + VERAG_NCTS.NCTS_Data.Position.Add(V_POS) + cntPos += 1 + Next + End If + UniqueId = NCTS_TMP.telanm_id + + 'If XMLFilePath = "" Then + ' Dim dir = "\\192.168.0.91\Datenarchiv\ZOLL_SCHNITTSTELLEN\VERAG\NCTS_OUT\TC\" & Now.Year & "\" & Now.ToShortDateString & "\" + ' If Not IO.Directory.Exists(dir) Then IO.Directory.CreateDirectory(dir) + ' XMLFilePath = dir & "VERAG_NCTS_OUT_" & Now.ToString("ddMMyyyHHmmss") & "_TC_" & NCTS_TMP.telanm_id & ".xml" + 'End If + + + 'VERAG_NCTS.SaveToFile(XMLFilePath) + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine & "BezugsNr: " & NCTS_TMP.telanm_BezugsNr, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Return Nothing + End Try + Return VERAG_NCTS + + End Function + + + Shared Function insertFTPLOG(filePath As String, user As String, NCTS_VERAG_OUT As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts, vorsystem As String) + Return SQL.doSQL("INSERT INTO tblFTP_Log (ftp_filepath,ftp_user,ftp_BezugsNr,ftp_art,ftp_status,ftp_vorsystem) VALUES ('" & filePath & "','" & user & "','" & NCTS_VERAG_OUT.ProcessData.ReferenzNumber & "','" & NCTS_VERAG_OUT.ProcessData.ProcedureCode & "','" & NCTS_VERAG_OUT.ProcessData.Status & "','" & vorsystem & "')", "FMZOLL") + End Function + + + Shared Function insertFTPLOG(filePath, user, ftp_BezugsNr, ftp_art, ftp_status, ftp_vorsystem) + Return SQL.doSQL("INSERT INTO tblFTP_Log (ftp_filepath,ftp_user,ftp_BezugsNr,ftp_art,ftp_status,ftp_vorsystem) VALUES ('" & filePath & "','" & user & "','" & ftp_BezugsNr & "','" & ftp_art & "','" & ftp_status & "','" & ftp_vorsystem & "')", "FMZOLL") + End Function + + + End Class diff --git a/MDM_Worker/MDM_Worker_lib.vbproj b/MDM_Worker/MDM_Worker_lib.vbproj index 4fa2e30..46b84f4 100644 --- a/MDM_Worker/MDM_Worker_lib.vbproj +++ b/MDM_Worker/MDM_Worker_lib.vbproj @@ -10,8 +10,9 @@ MDM_Worker 512 Windows - v4.5 + v4.7 true + true diff --git a/MDM_Worker/My Project/Application.Designer.vb b/MDM_Worker/My Project/Application.Designer.vb index 88dd01c..8ab460b 100644 --- a/MDM_Worker/My Project/Application.Designer.vb +++ b/MDM_Worker/My Project/Application.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ diff --git a/MDM_Worker/My Project/Resources.Designer.vb b/MDM_Worker/My Project/Resources.Designer.vb index ec4b825..a64133c 100644 --- a/MDM_Worker/My Project/Resources.Designer.vb +++ b/MDM_Worker/My Project/Resources.Designer.vb @@ -1,40 +1,41 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ Option Strict On Option Explicit On +Imports System Namespace My.Resources - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ + _ Friend Module Resources - + Private resourceMan As Global.System.Resources.ResourceManager - + Private resourceCulture As Global.System.Globalization.CultureInfo - + ''' - ''' Returns the cached ResourceManager instance used by this class. + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. ''' - _ + _ Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then @@ -44,17 +45,17 @@ Namespace My.Resources Return resourceMan End Get End Property - + ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. ''' - _ + _ Friend Property Culture() As Global.System.Globalization.CultureInfo Get Return resourceCulture End Get - Set(ByVal value As Global.System.Globalization.CultureInfo) + Set resourceCulture = value End Set End Property diff --git a/MDM_Worker/My Project/Settings.Designer.vb b/MDM_Worker/My Project/Settings.Designer.vb index c1b594e..94af05c 100644 --- a/MDM_Worker/My Project/Settings.Designer.vb +++ b/MDM_Worker/My Project/Settings.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ @@ -13,42 +13,42 @@ 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 "My.Settings Auto-Save Functionality" + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) + +#Region "Automatische My.Settings-Speicherfunktion" #If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean + Private Shared addedHandler As Boolean - Private Shared addedHandlerLockObject As New Object + Private Shared addedHandlerLockObject As New Object - _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub + _ + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - + #If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If #End If Return defaultInstance End Get diff --git a/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj b/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj index bceec03..0531370 100644 --- a/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj +++ b/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj @@ -10,7 +10,7 @@ TELOTEC_Worker 512 Windows - v4.5 + v4.7 true diff --git a/TELOTEK_Worker_lib/cTelokec.vb b/TELOTEK_Worker_lib/cTelokec.vb index b3c2f89..3d79fc8 100644 --- a/TELOTEK_Worker_lib/cTelokec.vb +++ b/TELOTEK_Worker_lib/cTelokec.vb @@ -408,6 +408,42 @@ Public Class cTelotec_Anmeldung End Try End Sub + Public Shared Function LOAD_ByBezugsNr(BezugsNr, Optional loadALL = True) As cTelotec_Anmeldung + Try + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Dim TC As New cTelotec_Anmeldung + TC.POSITIONSDATEN.Clear() + TC.SICHERHEIT.Clear() + + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("SELECT * FROM tblTelotec_Anmeldung WHERE telanm_BezugsNr=@BezugsNr AND [telnam_aktuellsteNachricht]=1 ", conn) + cmd.Parameters.AddWithValue("@BezugsNr", BezugsNr) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + For Each l In TC.getParameterList() + Dim propInfo As PropertyInfo = TC.GetType.GetProperty(l.Scalarvariable) + + If dr.Item(l.Text) Is DBNull.Value Then + propInfo.SetValue(TC, Nothing) + Else + propInfo.SetValue(TC, dr.Item(l.Text)) + End If + + Next + If loadALL Then + TC.LOAD_Positionsdaten() + TC.LOAD_Sicherheit() + End If + Return TC + End If + dr.Close() + End Using + End Using + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return Nothing + End Function Public Function UPDATE_Status(status As Integer) As String If telanm_id > 0 Then diff --git a/UID/ADMIN.vbproj b/UID/ADMIN.vbproj index 6338a01..af5bcd1 100644 --- a/UID/ADMIN.vbproj +++ b/UID/ADMIN.vbproj @@ -11,7 +11,7 @@ ADMIN 512 WindowsForms - v4.6.1 + v4.7 false @@ -31,7 +31,7 @@ true - AnyCPU + x86 true full true diff --git a/UID/App.config b/UID/App.config index 065f654..2ae60e5 100644 --- a/UID/App.config +++ b/UID/App.config @@ -10,7 +10,7 @@ - + diff --git a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb index 1ae4e73..eb792ae 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb @@ -61,6 +61,9 @@ Partial Class frmMitarbDetails Me.cboATLAS_SB = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label4 = New System.Windows.Forms.Label() Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.cboALIASDomain = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtALIASUser = New System.Windows.Forms.TextBox() + Me.Label52 = New System.Windows.Forms.Label() Me.lkl = New System.Windows.Forms.LinkLabel() Me.Label45 = New System.Windows.Forms.Label() Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox() @@ -158,9 +161,6 @@ Partial Class frmMitarbDetails Me.PictureBox6 = New System.Windows.Forms.PictureBox() Me.cboAdminBer = New System.Windows.Forms.ComboBox() Me.Label7 = New System.Windows.Forms.Label() - Me.Label52 = New System.Windows.Forms.Label() - Me.txtALIASUser = New System.Windows.Forms.TextBox() - Me.cboALIASDomain = New VERAG_PROG_ALLGEMEIN.MyComboBox CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.TabControl2.SuspendLayout() @@ -643,6 +643,37 @@ Partial Class frmMitarbDetails Me.GroupBox2.TabStop = False Me.GroupBox2.Text = "Firmendaten" ' + 'cboALIASDomain + ' + Me.cboALIASDomain._allowedValuesFreiText = Nothing + Me.cboALIASDomain._allowFreiText = False + Me.cboALIASDomain._value = "" + Me.cboALIASDomain.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboALIASDomain.FormattingEnabled = True + Me.cboALIASDomain.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"}) + Me.cboALIASDomain.Location = New System.Drawing.Point(409, 37) + Me.cboALIASDomain.Name = "cboALIASDomain" + Me.cboALIASDomain.Size = New System.Drawing.Size(116, 21) + Me.cboALIASDomain.TabIndex = 100 + ' + 'txtALIASUser + ' + Me.txtALIASUser.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtALIASUser.Location = New System.Drawing.Point(524, 37) + Me.txtALIASUser.Name = "txtALIASUser" + Me.txtALIASUser.Size = New System.Drawing.Size(179, 20) + Me.txtALIASUser.TabIndex = 99 + ' + 'Label52 + ' + Me.Label52.AutoSize = True + Me.Label52.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label52.Location = New System.Drawing.Point(406, 21) + Me.Label52.Name = "Label52" + Me.Label52.Size = New System.Drawing.Size(167, 13) + Me.Label52.TabIndex = 98 + Me.Label52.Text = "ALIAS-Name (Domain / AD-User):" + ' 'lkl ' Me.lkl.AutoSize = True @@ -704,7 +735,6 @@ Partial Class frmMitarbDetails Me.cboFirma.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cboFirma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cboFirma.FormattingEnabled = True - Me.cboFirma.Items.AddRange(New Object() {"VERAG", "ATILLA", "IMEX", "BEIDE"}) Me.cboFirma.Location = New System.Drawing.Point(18, 76) Me.cboFirma.Name = "cboFirma" Me.cboFirma.Size = New System.Drawing.Size(177, 21) @@ -1259,7 +1289,7 @@ Partial Class frmMitarbDetails Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" Me.TabPage3.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage3.Size = New System.Drawing.Size(715, 679) + Me.TabPage3.Size = New System.Drawing.Size(715, 700) Me.TabPage3.TabIndex = 1 Me.TabPage3.Text = "Programme" Me.TabPage3.UseVisualStyleBackColor = True @@ -1694,34 +1724,6 @@ Partial Class frmMitarbDetails Me.Label7.TabIndex = 78 Me.Label7.Text = "Berechtigung:" ' - 'Label52 - ' - Me.Label52.AutoSize = True - Me.Label52.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label52.Location = New System.Drawing.Point(406, 21) - Me.Label52.Name = "Label52" - Me.Label52.Size = New System.Drawing.Size(167, 13) - Me.Label52.TabIndex = 98 - Me.Label52.Text = "ALIAS-Name (Domain / AD-User):" - ' - 'txtALIASUser - ' - Me.txtALIASUser.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtALIASUser.Location = New System.Drawing.Point(524, 37) - Me.txtALIASUser.Name = "txtALIASUser" - Me.txtALIASUser.Size = New System.Drawing.Size(179, 20) - Me.txtALIASUser.TabIndex = 99 - ' - 'cboALIASDomain - ' - Me.cboALIASDomain.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cboALIASDomain.FormattingEnabled = True - Me.cboALIASDomain.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"}) - Me.cboALIASDomain.Location = New System.Drawing.Point(409, 37) - Me.cboALIASDomain.Name = "cboALIASDomain" - Me.cboALIASDomain.Size = New System.Drawing.Size(116, 21) - Me.cboALIASDomain.TabIndex = 100 - ' 'frmMitarbDetails ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/UID/Mitarbeiter/frmMitarbDetails.vb b/UID/Mitarbeiter/frmMitarbDetails.vb index 2f3b72d..be7b3a0 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.vb @@ -52,6 +52,9 @@ cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG")) cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA")) cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX")) + cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED")) + cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR")) + cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FRONTOFFICE")) cboALIASDomain.Items.Clear() cboALIASDomain.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) @@ -60,6 +63,17 @@ cboALIASDomain.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG-SBG", "VERAG-SBG")) cboALIASDomain.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAGNEUHAUS", "VERAGNEUHAUS")) cboALIASDomain.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG-NCTS (ATILLA)", "VERAG-NCTS")) + cboALIASDomain.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISU.AT")) + + + cboFirma.Items.Clear() + cboFirma.Items.Add("VERAG") + cboFirma.Items.Add("ATILLA") + cboFirma.Items.Add("IMEX") + cboFirma.Items.Add("UNISPED") + cboFirma.Items.Add("AMBAR") + cboFirma.Items.Add("FRONTOFFICE") + cboFirma.Items.Add("ALLE") @@ -195,14 +209,12 @@ cboALIASDomain.changeItem(mitarbeiter.mit_AliasAD_Domain) txtALIASUser.Text = mitarbeiter.mit_AliasAD_Username - If mitarbeiter.mit_firma = "VERAG" Then - cboFirma.SelectedIndex = 0 - ElseIf mitarbeiter.mit_firma = "ATILLA" Then - cboFirma.SelectedIndex = 1 - ElseIf mitarbeiter.mit_firma = "IMEX" Then - cboFirma.SelectedIndex = 2 - ElseIf mitarbeiter.mit_firma = "ALL" Then - cboFirma.SelectedIndex = 3 + + + If mitarbeiter.mit_firma = "ALL" Then + cboFirma.Text = "ALLE" + Else + cboFirma.Text = mitarbeiter.mit_firma End If cboFirmaFMZOLL.changeItem(If(mitarbeiter.mit_firmaFMZoll, "")) @@ -493,15 +505,10 @@ cboKasse.changeItem(SQL.doSQL("UPDATE [Personal] SET Standard_RKSV_KasseId='" & cboKasse._value & "' WHERE ID='" & mitarbeiter.mit_FMZollPersID & "'", "FMZOLL")) End If - - If cboFirma.SelectedIndex = 0 Then - mitarbeiter.mit_firma = "VERAG" - ElseIf cboFirma.SelectedIndex = 1 Then - mitarbeiter.mit_firma = "ATILLA" - ElseIf cboFirma.SelectedIndex = 2 Then - mitarbeiter.mit_firma = "IMEX" - ElseIf cboFirma.SelectedIndex = 3 Then + If cboFirma.Text = "ALLE" Then mitarbeiter.mit_firma = "ALL" + Else + mitarbeiter.mit_firma = cboFirma.Text End If If cbxEinsteigsDat.Checked Then mitarbeiter.mit_einstiegsdatum = datEinstiegsdatum.Text Else mitarbeiter.mit_einstiegsdatum = "" diff --git a/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb b/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb index 9037390..f17ccee 100644 --- a/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb +++ b/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb @@ -33,6 +33,12 @@ Partial Class usrCntlMitarbeiter Me.dgvVERAG = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.TabPage2 = New System.Windows.Forms.TabPage() Me.dgvATILLA = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.dgvIMEX = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.TabPage4 = New System.Windows.Forms.TabPage() + Me.dgvUNISPED = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.TabPage5 = New System.Windows.Forms.TabPage() + Me.dgvAMBAR = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel1 = New System.Windows.Forms.Panel() Me.cbx = New System.Windows.Forms.CheckBox() Me.txtSuche = New System.Windows.Forms.TextBox() @@ -40,18 +46,24 @@ Partial Class usrCntlMitarbeiter Me.Button2 = New System.Windows.Forms.Button() Me.Label1 = New System.Windows.Forms.Label() Me.Panel3 = New System.Windows.Forms.Panel() - Me.TabPage3 = New System.Windows.Forms.TabPage() - Me.dgvIMEX = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.TabPage6 = New System.Windows.Forms.TabPage() + Me.dgvFRONTOFFICE = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel2.SuspendLayout() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() CType(Me.dgvVERAG, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage2.SuspendLayout() CType(Me.dgvATILLA, System.ComponentModel.ISupportInitialize).BeginInit() - Me.Panel1.SuspendLayout() - Me.Panel3.SuspendLayout() Me.TabPage3.SuspendLayout() CType(Me.dgvIMEX, System.ComponentModel.ISupportInitialize).BeginInit() + Me.TabPage4.SuspendLayout() + CType(Me.dgvUNISPED, System.ComponentModel.ISupportInitialize).BeginInit() + Me.TabPage5.SuspendLayout() + CType(Me.dgvAMBAR, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel1.SuspendLayout() + Me.Panel3.SuspendLayout() + Me.TabPage6.SuspendLayout() + CType(Me.dgvFRONTOFFICE, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'Button6 @@ -116,6 +128,9 @@ Partial Class usrCntlMitarbeiter Me.TabControl1.Controls.Add(Me.TabPage1) Me.TabControl1.Controls.Add(Me.TabPage2) Me.TabControl1.Controls.Add(Me.TabPage3) + Me.TabControl1.Controls.Add(Me.TabPage4) + Me.TabControl1.Controls.Add(Me.TabPage5) + Me.TabControl1.Controls.Add(Me.TabPage6) Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.TabControl1.Location = New System.Drawing.Point(0, 0) Me.TabControl1.Name = "TabControl1" @@ -165,6 +180,69 @@ Partial Class usrCntlMitarbeiter Me.dgvATILLA.Size = New System.Drawing.Size(875, 616) Me.dgvATILLA.TabIndex = 25 ' + 'TabPage3 + ' + Me.TabPage3.Controls.Add(Me.dgvIMEX) + Me.TabPage3.Location = New System.Drawing.Point(4, 22) + Me.TabPage3.Name = "TabPage3" + Me.TabPage3.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage3.Size = New System.Drawing.Size(881, 622) + Me.TabPage3.TabIndex = 2 + Me.TabPage3.Text = "IMEX" + Me.TabPage3.UseVisualStyleBackColor = True + ' + 'dgvIMEX + ' + Me.dgvIMEX.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvIMEX.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvIMEX.Dock = System.Windows.Forms.DockStyle.Fill + Me.dgvIMEX.Location = New System.Drawing.Point(3, 3) + Me.dgvIMEX.Name = "dgvIMEX" + Me.dgvIMEX.Size = New System.Drawing.Size(875, 616) + Me.dgvIMEX.TabIndex = 25 + ' + 'TabPage4 + ' + Me.TabPage4.Controls.Add(Me.dgvUNISPED) + 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(881, 622) + Me.TabPage4.TabIndex = 3 + Me.TabPage4.Text = "UNISPED" + Me.TabPage4.UseVisualStyleBackColor = True + ' + 'dgvUNISPED + ' + Me.dgvUNISPED.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvUNISPED.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvUNISPED.Dock = System.Windows.Forms.DockStyle.Fill + Me.dgvUNISPED.Location = New System.Drawing.Point(3, 3) + Me.dgvUNISPED.Name = "dgvUNISPED" + Me.dgvUNISPED.Size = New System.Drawing.Size(875, 616) + Me.dgvUNISPED.TabIndex = 25 + ' + 'TabPage5 + ' + Me.TabPage5.Controls.Add(Me.dgvAMBAR) + Me.TabPage5.Location = New System.Drawing.Point(4, 22) + Me.TabPage5.Name = "TabPage5" + Me.TabPage5.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage5.Size = New System.Drawing.Size(881, 622) + Me.TabPage5.TabIndex = 4 + Me.TabPage5.Text = "AMBAR" + Me.TabPage5.UseVisualStyleBackColor = True + ' + 'dgvAMBAR + ' + Me.dgvAMBAR.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvAMBAR.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvAMBAR.Dock = System.Windows.Forms.DockStyle.Fill + Me.dgvAMBAR.Location = New System.Drawing.Point(3, 3) + Me.dgvAMBAR.Name = "dgvAMBAR" + Me.dgvAMBAR.Size = New System.Drawing.Size(875, 616) + Me.dgvAMBAR.TabIndex = 25 + ' 'Panel1 ' Me.Panel1.Controls.Add(Me.cbx) @@ -232,26 +310,26 @@ Partial Class usrCntlMitarbeiter Me.Panel3.Size = New System.Drawing.Size(889, 648) Me.Panel3.TabIndex = 27 ' - 'TabPage3 + 'TabPage6 ' - Me.TabPage3.Controls.Add(Me.dgvIMEX) - Me.TabPage3.Location = New System.Drawing.Point(4, 22) - Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage3.Size = New System.Drawing.Size(881, 622) - Me.TabPage3.TabIndex = 2 - Me.TabPage3.Text = "IMEX" - Me.TabPage3.UseVisualStyleBackColor = True + Me.TabPage6.Controls.Add(Me.dgvFRONTOFFICE) + Me.TabPage6.Location = New System.Drawing.Point(4, 22) + Me.TabPage6.Name = "TabPage6" + Me.TabPage6.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage6.Size = New System.Drawing.Size(881, 622) + Me.TabPage6.TabIndex = 5 + Me.TabPage6.Text = "FRONT-OFFICE" + Me.TabPage6.UseVisualStyleBackColor = True ' - 'dgvIMEX + 'dgvFRONTOFFICE ' - Me.dgvIMEX.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvIMEX.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvIMEX.Dock = System.Windows.Forms.DockStyle.Fill - Me.dgvIMEX.Location = New System.Drawing.Point(3, 3) - Me.dgvIMEX.Name = "dgvIMEX" - Me.dgvIMEX.Size = New System.Drawing.Size(875, 616) - Me.dgvIMEX.TabIndex = 25 + Me.dgvFRONTOFFICE.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvFRONTOFFICE.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvFRONTOFFICE.Dock = System.Windows.Forms.DockStyle.Fill + Me.dgvFRONTOFFICE.Location = New System.Drawing.Point(3, 3) + Me.dgvFRONTOFFICE.Name = "dgvFRONTOFFICE" + Me.dgvFRONTOFFICE.Size = New System.Drawing.Size(875, 616) + Me.dgvFRONTOFFICE.TabIndex = 26 ' 'usrCntlMitarbeiter ' @@ -269,11 +347,17 @@ Partial Class usrCntlMitarbeiter CType(Me.dgvVERAG, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPage2.ResumeLayout(False) CType(Me.dgvATILLA, System.ComponentModel.ISupportInitialize).EndInit() + Me.TabPage3.ResumeLayout(False) + CType(Me.dgvIMEX, System.ComponentModel.ISupportInitialize).EndInit() + Me.TabPage4.ResumeLayout(False) + CType(Me.dgvUNISPED, System.ComponentModel.ISupportInitialize).EndInit() + Me.TabPage5.ResumeLayout(False) + CType(Me.dgvAMBAR, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() Me.Panel3.ResumeLayout(False) - Me.TabPage3.ResumeLayout(False) - CType(Me.dgvIMEX, System.ComponentModel.ISupportInitialize).EndInit() + Me.TabPage6.ResumeLayout(False) + CType(Me.dgvFRONTOFFICE, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -296,5 +380,10 @@ Partial Class usrCntlMitarbeiter Friend WithEvents cbx As System.Windows.Forms.CheckBox Friend WithEvents TabPage3 As System.Windows.Forms.TabPage Friend WithEvents dgvIMEX As VERAG_PROG_ALLGEMEIN.MyDatagridview - + Friend WithEvents TabPage4 As TabPage + Friend WithEvents TabPage5 As TabPage + Friend WithEvents dgvUNISPED As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents dgvAMBAR As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents TabPage6 As TabPage + Friend WithEvents dgvFRONTOFFICE As VERAG_PROG_ALLGEMEIN.MyDatagridview End Class diff --git a/UID/Mitarbeiter/usrCntlMitarbeiter.vb b/UID/Mitarbeiter/usrCntlMitarbeiter.vb index 4e8f928..ab4d8e3 100644 --- a/UID/Mitarbeiter/usrCntlMitarbeiter.vb +++ b/UID/Mitarbeiter/usrCntlMitarbeiter.vb @@ -33,6 +33,12 @@ Public Class usrCntlMitarbeiter showVERAGATILLA("ATILLA") ElseIf TabControl1.SelectedIndex = 2 Then showVERAGATILLA("IMEX") + ElseIf TabControl1.SelectedIndex = 3 Then + showVERAGATILLA("UNISPED") + ElseIf TabControl1.SelectedIndex = 4 Then + showVERAGATILLA("AMBAR") + ElseIf TabControl1.SelectedIndex = 5 Then + showVERAGATILLA("FRONTOFFICE") End If End Sub @@ -64,7 +70,7 @@ Public Class usrCntlMitarbeiter If dgvVERAG.RowCount = 0 Then dgvVERAG.DataSource = Nothing Else - sortVERAG() + sortDGV(dgvVERAG) 'Eintraege_festlegen() 'AL: Sortierung nach Ausfahrt (Zeit) dgvVERAG.Sort(dgvVERAG.Columns(3), ListSortDirection.Ascending) @@ -79,7 +85,7 @@ Public Class usrCntlMitarbeiter If dgvATILLA.RowCount = 0 Then dgvATILLA.DataSource = Nothing Else - sortATILLA() + sortDGV(dgvATILLA) 'Eintraege_festlegen() 'AL: Sortierung nach Ausfahrt (Zeit) dgvATILLA.Sort(dgvATILLA.Columns(3), ListSortDirection.Ascending) @@ -94,111 +100,67 @@ Public Class usrCntlMitarbeiter If dgvIMEX.RowCount = 0 Then dgvIMEX.DataSource = Nothing Else - sortIMEX() + sortDGV(dgvIMEX) 'Eintraege_festlegen() 'AL: Sortierung nach Ausfahrt (Zeit) dgvIMEX.Sort(dgvIMEX.Columns(3), ListSortDirection.Ascending) End If + ElseIf firma = "UNISPED" Then + ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql) + + dgvUNISPED.SET_SQL(sql, "ADMIN") + dgvUNISPED.LOAD() + + 'Tabelle Kommt/Geht bereinigen + If dgvUNISPED.RowCount = 0 Then + dgvUNISPED.DataSource = Nothing + Else + sortDGV(dgvUNISPED) + 'Eintraege_festlegen() + 'AL: Sortierung nach Ausfahrt (Zeit) + dgvUNISPED.Sort(dgvUNISPED.Columns(3), ListSortDirection.Ascending) + End If + ElseIf firma = "AMBAR" Then + ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql) + + dgvAMBAR.SET_SQL(sql, "ADMIN") + dgvAMBAR.LOAD() + + 'Tabelle Kommt/Geht bereinigen + If dgvAMBAR.RowCount = 0 Then + dgvAMBAR.DataSource = Nothing + Else + sortDGV(dgvAMBAR) + 'Eintraege_festlegen() + 'AL: Sortierung nach Ausfahrt (Zeit) + dgvAMBAR.Sort(dgvAMBAR.Columns(3), ListSortDirection.Ascending) + End If + + ElseIf firma = "FRONTOFFICE" Then + ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql) + + dgvFRONTOFFICE.SET_SQL(sql, "ADMIN") + dgvFRONTOFFICE.LOAD() + + 'Tabelle Kommt/Geht bereinigen + If dgvFRONTOFFICE.RowCount = 0 Then + dgvFRONTOFFICE.DataSource = Nothing + Else + sortDGV(dgvFRONTOFFICE) + 'Eintraege_festlegen() + 'AL: Sortierung nach Ausfahrt (Zeit) + dgvFRONTOFFICE.Sort(dgvFRONTOFFICE.Columns(3), ListSortDirection.Ascending) + + End If End If End Sub - Private Sub sortVERAG() - With dgvVERAG - .RowTemplate.Height = 20 - .RowTemplate.DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopLeft - .AllowUserToAddRows = False - .AllowUserToDeleteRows = False - .AllowUserToOrderColumns = False - .AllowUserToResizeColumns = False - .AllowUserToResizeRows = False - .RowTemplate.ReadOnly = True - .RowHeadersVisible = False - .SelectionMode = DataGridViewSelectionMode.FullRowSelect - .AllowUserToOrderColumns = True - - .Columns(0).Visible = False 'ID nicht anzeigen - - .Columns(1).Width = 150 - .Columns(1).HeaderText = "Username" - .Columns(1).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter - - .Columns(2).Width = 100 - .Columns(2).HeaderText = "Vorname" - - .Columns(3).Width = 130 - .Columns(3).HeaderText = "Nachname" - - .Columns(4).Width = 85 - .Columns(4).HeaderText = "Niederlassung" - - .Columns(5).Width = 85 - .Columns(5).HeaderText = "Abteilung" - - .Columns(6).Width = 120 - .Columns(6).HeaderText = "Email" - - .Columns(7).Width = 120 - .Columns(7).HeaderText = "TelefonNr." - - .Columns(8).Width = 80 - .Columns(8).HeaderText = "Gekündigt" - - - End With - End Sub - - Private Sub sortATILLA() - With dgvATILLA - .RowTemplate.Height = 20 - .RowTemplate.DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopLeft - .AllowUserToAddRows = False - .AllowUserToDeleteRows = False - .AllowUserToOrderColumns = False - .AllowUserToResizeColumns = False - .AllowUserToResizeRows = False - .RowTemplate.ReadOnly = True - .RowHeadersVisible = False - .SelectionMode = DataGridViewSelectionMode.FullRowSelect - - .AllowUserToOrderColumns = True - - .Columns(0).Visible = False 'ID nicht anzeigen - - .Columns(1).Width = 150 - .Columns(1).HeaderText = "Username" - .Columns(1).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter - - .Columns(2).Width = 100 - .Columns(2).HeaderText = "Vorname" - - .Columns(3).Width = 130 - .Columns(3).HeaderText = "Nachname" - - .Columns(4).Width = 85 - .Columns(4).HeaderText = "Niederlassung" - - .Columns(5).Width = 85 - .Columns(5).HeaderText = "Abteilung" - - .Columns(6).Width = 120 - .Columns(6).HeaderText = "Email" - - .Columns(7).Width = 120 - .Columns(7).HeaderText = "TelefonNr." - - .Columns(8).Width = 80 - .Columns(8).HeaderText = "Gekündigt" - - - End With - End Sub - - Private Sub sortIMEX() - With dgvIMEX + Private Sub sortDGV(dgv As DataGridView) + With dgv .RowTemplate.Height = 20 .RowTemplate.DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopLeft .AllowUserToAddRows = False @@ -248,6 +210,9 @@ Public Class usrCntlMitarbeiter Case 0 : Firma = "VERAG" Case 1 : Firma = "ATILLA" Case 2 : Firma = "IMEX" + Case 3 : Firma = "UNISPED" + Case 4 : Firma = "AMBAR" + Case 5 : Firma = "FRONTOFFICE" End Select Dim frmMitarbDetails As New frmMitarbDetails(Firma) frmMitarbDetails.Show() @@ -285,6 +250,31 @@ Public Class usrCntlMitarbeiter Tabelle_anzeigen() Case vbNo + End Select + ElseIf TabControl1.SelectedIndex = 3 Then + Select Case MsgBox("Soll der Mitarbeiter '" & dgvUNISPED.CurrentRow.Cells(1).Value & "' wirklich gelöscht werden?", vbQuestion Or vbYesNo Or vbDefaultButton2, "Löschen?") + Case vbYes + UID.delData(Convert.ToInt32(dgvUNISPED.CurrentRow.Cells(0).Value)) + Tabelle_anzeigen() + Case vbNo + + End Select + ElseIf TabControl1.SelectedIndex = 4 Then + Select Case MsgBox("Soll der Mitarbeiter '" & dgvAMBAR.CurrentRow.Cells(1).Value & "' wirklich gelöscht werden?", vbQuestion Or vbYesNo Or vbDefaultButton2, "Löschen?") + Case vbYes + UID.delData(Convert.ToInt32(dgvAMBAR.CurrentRow.Cells(0).Value)) + Tabelle_anzeigen() + Case vbNo + + End Select + + ElseIf TabControl1.SelectedIndex = 5 Then + Select Case MsgBox("Soll der Mitarbeiter '" & dgvFRONTOFFICE.CurrentRow.Cells(1).Value & "' wirklich gelöscht werden?", vbQuestion Or vbYesNo Or vbDefaultButton2, "Löschen?") + Case vbYes + UID.delData(Convert.ToInt32(dgvFRONTOFFICE.CurrentRow.Cells(0).Value)) + Tabelle_anzeigen() + Case vbNo + End Select End If @@ -304,33 +294,13 @@ Public Class usrCntlMitarbeiter End Sub - Private Sub dgvVERAG_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvVERAG.CellDoubleClick + + Private Sub dgvIMEX_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvIMEX.CellDoubleClick, dgvUNISPED.CellDoubleClick, dgvAMBAR.CellDoubleClick, dgvVERAG.CellDoubleClick, dgvATILLA.CellDoubleClick, dgvFRONTOFFICE.CellDoubleClick Me.Cursor = Cursors.WaitCursor Dim frmMitarbDetails As New frmMitarbDetails - frmMitarbDetails.mid = dgvVERAG.CurrentRow.Cells(0).Value + frmMitarbDetails.mid = sender.CurrentRow.Cells(0).Value frmMitarbDetails.ShowDialog(Me) - dgvVERAG.RELOAD() - Me.Cursor = Cursors.Default - ' AddHandler frmMitarbDetails.FormClosing, AddressOf handleClose - End Sub - - Private Sub dgvATILLA_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvATILLA.CellDoubleClick - Me.Cursor = Cursors.WaitCursor - Dim frmMitarbDetails As New frmMitarbDetails - frmMitarbDetails.mid = dgvATILLA.CurrentRow.Cells(0).Value - frmMitarbDetails.ShowDialog(Me) - dgvATILLA.RELOAD() - Me.Cursor = Cursors.Default - ' AddHandler frmMitarbDetails.FormClosing, AddressOf handleClose - End Sub - - - Private Sub dgvIMEX_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvIMEX.CellDoubleClick - Me.Cursor = Cursors.WaitCursor - Dim frmMitarbDetails As New frmMitarbDetails - frmMitarbDetails.mid = dgvIMEX.CurrentRow.Cells(0).Value - frmMitarbDetails.ShowDialog(Me) - dgvIMEX.RELOAD() + sender.RELOAD() Me.Cursor = Cursors.Default ' AddHandler frmMitarbDetails.FormClosing, AddressOf handleClose End Sub @@ -341,25 +311,26 @@ Public Class usrCntlMitarbeiter Tabelle_anzeigen() End Sub - Private Sub dgvVERAG_CellContentClick_1(sender As Object, e As DataGridViewCellEventArgs) Handles dgvVERAG.CellContentClick - End Sub Private Sub txtSuche_KeyDown(sender As Object, e As KeyEventArgs) Handles txtSuche.KeyDown + + Dim dgv As DataGridView = Nothing + + Select Case TabControl1.SelectedIndex + Case 0 : dgv = dgvVERAG + Case 1 : dgv = dgvATILLA + Case 2 : dgv = dgvIMEX + Case 3 : dgv = dgvUNISPED + Case 4 : dgv = dgvAMBAR + Case 5 : dgv = dgvFRONTOFFICE + End Select + If e.KeyCode = Keys.Return Then - If TabControl1.SelectedIndex = 0 Then - If dgvVERAG.SelectedRows.Count > 0 Then - dgvVERAG_CellContentClick(dgvVERAG, New DataGridViewCellEventArgs(0, dgvVERAG.SelectedRows(0).Index)) - End If - ElseIf TabControl1.SelectedIndex = 1 Then - If dgvATILLA.SelectedRows.Count > 0 Then - dgvATILLA_CellContentClick(dgvATILLA, New DataGridViewCellEventArgs(0, dgvATILLA.SelectedRows(0).Index)) - End If + If dgv.SelectedRows.Count > 0 Then + dgvIMEX_CellContentClick(dgv, New DataGridViewCellEventArgs(0, dgv.SelectedRows(0).Index)) End If - ElseIf TabControl1.SelectedIndex = 1 Then - If dgvIMEX.SelectedRows.Count > 0 Then - dgvIMEX_CellContentClick(dgvIMEX, New DataGridViewCellEventArgs(0, dgvIMEX.SelectedRows(0).Index)) - End If + End If End Sub diff --git a/UID/My Project/Resources.Designer.vb b/UID/My Project/Resources.Designer.vb index 1e6b01b..7c6e919 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 jjjiioioolokoik() As String + Get + Return ResourceManager.GetString("jjjiioioolokoik", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -635,7 +644,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 1.8.5 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 1.8.8 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/UID/My Project/Resources.resx b/UID/My Project/Resources.resx index 30de367..72b1b8f 100644 --- a/UID/My Project/Resources.resx +++ b/UID/My Project/Resources.resx @@ -188,7 +188,7 @@ Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956; - 1.8.5 + 1.8.8 ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -298,4 +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/Programme/frmProgDetails.Designer.vb b/UID/Programme/frmProgDetails.Designer.vb index 4175f1b..c8ef2a7 100644 --- a/UID/Programme/frmProgDetails.Designer.vb +++ b/UID/Programme/frmProgDetails.Designer.vb @@ -113,13 +113,33 @@ Partial Class frmProgDetails Me.Button22 = New System.Windows.Forms.Button() Me.Button23 = New System.Windows.Forms.Button() Me.Label24 = New System.Windows.Forms.Label() - Me.txtInstallProdPfadNKD = New System.Windows.Forms.TextBox() + Me.txtInstallProdPfadUNI = New System.Windows.Forms.TextBox() Me.Button24 = New System.Windows.Forms.Button() Me.Button25 = New System.Windows.Forms.Button() Me.Label25 = New System.Windows.Forms.Label() - Me.txtInstallProdPfadNEU = New System.Windows.Forms.TextBox() + Me.txtInstallProdPfadAMB = New System.Windows.Forms.TextBox() Me.Button26 = New System.Windows.Forms.Button() Me.cbxZip = New System.Windows.Forms.CheckBox() + Me.cbxStandorttxtErstellenAMB = New System.Windows.Forms.CheckBox() + Me.Button27 = New System.Windows.Forms.Button() + Me.Label26 = New System.Windows.Forms.Label() + Me.txtProdPfadAMB = New System.Windows.Forms.TextBox() + Me.Button28 = New System.Windows.Forms.Button() + Me.cbxStandorttxtErstellenUNI = New System.Windows.Forms.CheckBox() + Me.Button29 = New System.Windows.Forms.Button() + Me.Label27 = New System.Windows.Forms.Label() + Me.txtProdPfadUNI = New System.Windows.Forms.TextBox() + Me.Button30 = New System.Windows.Forms.Button() + Me.Button31 = New System.Windows.Forms.Button() + Me.txtInstallProdPfadNEU = New System.Windows.Forms.TextBox() + Me.Button32 = New System.Windows.Forms.Button() + Me.Button33 = New System.Windows.Forms.Button() + Me.txtInstallProdPfadNKD = New System.Windows.Forms.TextBox() + Me.Button34 = New System.Windows.Forms.Button() + Me.Label28 = New System.Windows.Forms.Label() + Me.Label29 = New System.Windows.Forms.Label() + Me.Button35 = New System.Windows.Forms.Button() + Me.cbxIncrementalCopy = New System.Windows.Forms.CheckBox() CType(Me.picIcon, System.ComponentModel.ISupportInitialize).BeginInit() Me.grpName.SuspendLayout() Me.SuspendLayout() @@ -137,7 +157,7 @@ Partial Class frmProgDetails 'btnProdCopy ' Me.btnProdCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnProdCopy.Location = New System.Drawing.Point(487, 188) + Me.btnProdCopy.Location = New System.Drawing.Point(509, 188) Me.btnProdCopy.Name = "btnProdCopy" Me.btnProdCopy.Size = New System.Drawing.Size(100, 24) Me.btnProdCopy.TabIndex = 41 @@ -147,7 +167,7 @@ Partial Class frmProgDetails 'btnDevCopy ' Me.btnDevCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnDevCopy.Location = New System.Drawing.Point(487, 161) + Me.btnDevCopy.Location = New System.Drawing.Point(509, 161) Me.btnDevCopy.Name = "btnDevCopy" Me.btnDevCopy.Size = New System.Drawing.Size(100, 24) Me.btnDevCopy.TabIndex = 40 @@ -211,7 +231,7 @@ Partial Class frmProgDetails ' 'txtDevPfad ' - Me.txtDevPfad.Location = New System.Drawing.Point(110, 164) + Me.txtDevPfad.Location = New System.Drawing.Point(132, 164) Me.txtDevPfad.Name = "txtDevPfad" Me.txtDevPfad.Size = New System.Drawing.Size(289, 20) Me.txtDevPfad.TabIndex = 44 @@ -236,7 +256,7 @@ Partial Class frmProgDetails ' 'txtProdPfad ' - Me.txtProdPfad.Location = New System.Drawing.Point(110, 190) + Me.txtProdPfad.Location = New System.Drawing.Point(132, 190) Me.txtProdPfad.Name = "txtProdPfad" Me.txtProdPfad.Size = New System.Drawing.Size(289, 20) Me.txtProdPfad.TabIndex = 46 @@ -244,7 +264,7 @@ Partial Class frmProgDetails 'btnDevAkt ' Me.btnDevAkt.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnDevAkt.Location = New System.Drawing.Point(405, 162) + Me.btnDevAkt.Location = New System.Drawing.Point(427, 162) Me.btnDevAkt.Name = "btnDevAkt" Me.btnDevAkt.Size = New System.Drawing.Size(76, 24) Me.btnDevAkt.TabIndex = 48 @@ -254,7 +274,7 @@ Partial Class frmProgDetails 'btnProdAkt ' Me.btnProdAkt.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnProdAkt.Location = New System.Drawing.Point(405, 188) + Me.btnProdAkt.Location = New System.Drawing.Point(427, 188) Me.btnProdAkt.Name = "btnProdAkt" Me.btnProdAkt.Size = New System.Drawing.Size(76, 24) Me.btnProdAkt.TabIndex = 49 @@ -264,7 +284,7 @@ Partial Class frmProgDetails 'btnSourceAkt ' Me.btnSourceAkt.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnSourceAkt.Location = New System.Drawing.Point(405, 125) + Me.btnSourceAkt.Location = New System.Drawing.Point(427, 125) Me.btnSourceAkt.Name = "btnSourceAkt" Me.btnSourceAkt.Size = New System.Drawing.Size(76, 24) Me.btnSourceAkt.TabIndex = 53 @@ -282,7 +302,7 @@ Partial Class frmProgDetails ' 'txtSourcePfad ' - Me.txtSourcePfad.Location = New System.Drawing.Point(110, 127) + Me.txtSourcePfad.Location = New System.Drawing.Point(132, 127) Me.txtSourcePfad.Name = "txtSourcePfad" Me.txtSourcePfad.Size = New System.Drawing.Size(289, 20) Me.txtSourcePfad.TabIndex = 51 @@ -301,7 +321,7 @@ Partial Class frmProgDetails ' Me.Label7.AutoSize = True Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label7.Location = New System.Drawing.Point(20, 407) + Me.Label7.Location = New System.Drawing.Point(20, 435) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(79, 13) Me.Label7.TabIndex = 67 @@ -310,7 +330,7 @@ Partial Class frmProgDetails 'btnInstallSourceAkt ' Me.btnInstallSourceAkt.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnInstallSourceAkt.Location = New System.Drawing.Point(405, 421) + Me.btnInstallSourceAkt.Location = New System.Drawing.Point(427, 449) Me.btnInstallSourceAkt.Name = "btnInstallSourceAkt" Me.btnInstallSourceAkt.Size = New System.Drawing.Size(76, 24) Me.btnInstallSourceAkt.TabIndex = 66 @@ -320,7 +340,7 @@ Partial Class frmProgDetails 'Label8 ' Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(20, 426) + Me.Label8.Location = New System.Drawing.Point(20, 454) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(69, 13) Me.Label8.TabIndex = 65 @@ -328,7 +348,7 @@ Partial Class frmProgDetails ' 'txtInstallSourcePfad ' - Me.txtInstallSourcePfad.Location = New System.Drawing.Point(110, 423) + Me.txtInstallSourcePfad.Location = New System.Drawing.Point(132, 451) Me.txtInstallSourcePfad.Name = "txtInstallSourcePfad" Me.txtInstallSourcePfad.Size = New System.Drawing.Size(289, 20) Me.txtInstallSourcePfad.TabIndex = 64 @@ -336,7 +356,7 @@ Partial Class frmProgDetails 'btnInstallProdAkt ' Me.btnInstallProdAkt.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnInstallProdAkt.Location = New System.Drawing.Point(405, 484) + Me.btnInstallProdAkt.Location = New System.Drawing.Point(427, 512) Me.btnInstallProdAkt.Name = "btnInstallProdAkt" Me.btnInstallProdAkt.Size = New System.Drawing.Size(76, 24) Me.btnInstallProdAkt.TabIndex = 62 @@ -346,7 +366,7 @@ Partial Class frmProgDetails 'btnInstallDevAkt ' Me.btnInstallDevAkt.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnInstallDevAkt.Location = New System.Drawing.Point(405, 458) + Me.btnInstallDevAkt.Location = New System.Drawing.Point(427, 486) Me.btnInstallDevAkt.Name = "btnInstallDevAkt" Me.btnInstallDevAkt.Size = New System.Drawing.Size(76, 24) Me.btnInstallDevAkt.TabIndex = 61 @@ -356,7 +376,7 @@ Partial Class frmProgDetails 'Label9 ' Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(20, 489) + Me.Label9.Location = New System.Drawing.Point(20, 517) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(80, 13) Me.Label9.TabIndex = 60 @@ -364,7 +384,7 @@ Partial Class frmProgDetails ' 'txtInstallProdPfad ' - Me.txtInstallProdPfad.Location = New System.Drawing.Point(110, 486) + Me.txtInstallProdPfad.Location = New System.Drawing.Point(132, 514) Me.txtInstallProdPfad.Name = "txtInstallProdPfad" Me.txtInstallProdPfad.Size = New System.Drawing.Size(289, 20) Me.txtInstallProdPfad.TabIndex = 59 @@ -372,7 +392,7 @@ Partial Class frmProgDetails 'Label11 ' Me.Label11.AutoSize = True - Me.Label11.Location = New System.Drawing.Point(20, 463) + Me.Label11.Location = New System.Drawing.Point(20, 491) Me.Label11.Name = "Label11" Me.Label11.Size = New System.Drawing.Size(84, 13) Me.Label11.TabIndex = 58 @@ -380,7 +400,7 @@ Partial Class frmProgDetails ' 'txtInstallDevPfad ' - Me.txtInstallDevPfad.Location = New System.Drawing.Point(110, 460) + Me.txtInstallDevPfad.Location = New System.Drawing.Point(132, 488) Me.txtInstallDevPfad.Name = "txtInstallDevPfad" Me.txtInstallDevPfad.Size = New System.Drawing.Size(289, 20) Me.txtInstallDevPfad.TabIndex = 57 @@ -388,7 +408,7 @@ Partial Class frmProgDetails 'btnInstallProdCopy ' Me.btnInstallProdCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnInstallProdCopy.Location = New System.Drawing.Point(487, 484) + Me.btnInstallProdCopy.Location = New System.Drawing.Point(509, 512) Me.btnInstallProdCopy.Name = "btnInstallProdCopy" Me.btnInstallProdCopy.Size = New System.Drawing.Size(100, 24) Me.btnInstallProdCopy.TabIndex = 56 @@ -398,7 +418,7 @@ Partial Class frmProgDetails 'btnInstallDevCopy ' Me.btnInstallDevCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnInstallDevCopy.Location = New System.Drawing.Point(487, 457) + Me.btnInstallDevCopy.Location = New System.Drawing.Point(509, 485) Me.btnInstallDevCopy.Name = "btnInstallDevCopy" Me.btnInstallDevCopy.Size = New System.Drawing.Size(100, 24) Me.btnInstallDevCopy.TabIndex = 55 @@ -408,7 +428,7 @@ Partial Class frmProgDetails 'btnInsert ' Me.btnInsert.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnInsert.Location = New System.Drawing.Point(510, 786) + Me.btnInsert.Location = New System.Drawing.Point(532, 854) Me.btnInsert.Name = "btnInsert" Me.btnInsert.Size = New System.Drawing.Size(77, 24) Me.btnInsert.TabIndex = 68 @@ -419,7 +439,7 @@ Partial Class frmProgDetails 'Label12 ' Me.Label12.AutoSize = True - Me.Label12.Location = New System.Drawing.Point(18, 712) + Me.Label12.Location = New System.Drawing.Point(20, 783) Me.Label12.Name = "Label12" Me.Label12.Size = New System.Drawing.Size(28, 13) Me.Label12.TabIndex = 70 @@ -427,7 +447,7 @@ Partial Class frmProgDetails ' 'txtInfo ' - Me.txtInfo.Location = New System.Drawing.Point(110, 712) + Me.txtInfo.Location = New System.Drawing.Point(132, 780) Me.txtInfo.Multiline = True Me.txtInfo.Name = "txtInfo" Me.txtInfo.Size = New System.Drawing.Size(477, 68) @@ -436,7 +456,7 @@ Partial Class frmProgDetails 'btnAktInfo ' Me.btnAktInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnAktInfo.Location = New System.Drawing.Point(110, 786) + Me.btnAktInfo.Location = New System.Drawing.Point(132, 854) Me.btnAktInfo.Name = "btnAktInfo" Me.btnAktInfo.Size = New System.Drawing.Size(76, 24) Me.btnAktInfo.TabIndex = 72 @@ -491,7 +511,7 @@ Partial Class frmProgDetails 'Button1 ' Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.Location = New System.Drawing.Point(405, 213) + Me.Button1.Location = New System.Drawing.Point(427, 213) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(76, 24) Me.Button1.TabIndex = 78 @@ -509,7 +529,7 @@ Partial Class frmProgDetails ' 'txtProdPfadAtilla ' - Me.txtProdPfadAtilla.Location = New System.Drawing.Point(110, 216) + Me.txtProdPfadAtilla.Location = New System.Drawing.Point(132, 216) Me.txtProdPfadAtilla.Name = "txtProdPfadAtilla" Me.txtProdPfadAtilla.Size = New System.Drawing.Size(289, 20) Me.txtProdPfadAtilla.TabIndex = 76 @@ -517,7 +537,7 @@ Partial Class frmProgDetails 'Button2 ' Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button2.Location = New System.Drawing.Point(487, 213) + Me.Button2.Location = New System.Drawing.Point(509, 213) Me.Button2.Name = "Button2" Me.Button2.Size = New System.Drawing.Size(100, 24) Me.Button2.TabIndex = 75 @@ -527,7 +547,7 @@ Partial Class frmProgDetails 'Button3 ' Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button3.Location = New System.Drawing.Point(405, 510) + Me.Button3.Location = New System.Drawing.Point(427, 538) Me.Button3.Name = "Button3" Me.Button3.Size = New System.Drawing.Size(76, 24) Me.Button3.TabIndex = 82 @@ -537,7 +557,7 @@ Partial Class frmProgDetails 'Label15 ' Me.Label15.AutoSize = True - Me.Label15.Location = New System.Drawing.Point(20, 515) + Me.Label15.Location = New System.Drawing.Point(20, 543) Me.Label15.Name = "Label15" Me.Label15.Size = New System.Drawing.Size(80, 13) Me.Label15.TabIndex = 81 @@ -545,7 +565,7 @@ Partial Class frmProgDetails ' 'txtInstallProdPfadAtilla ' - Me.txtInstallProdPfadAtilla.Location = New System.Drawing.Point(110, 512) + Me.txtInstallProdPfadAtilla.Location = New System.Drawing.Point(132, 540) Me.txtInstallProdPfadAtilla.Name = "txtInstallProdPfadAtilla" Me.txtInstallProdPfadAtilla.Size = New System.Drawing.Size(289, 20) Me.txtInstallProdPfadAtilla.TabIndex = 80 @@ -553,7 +573,7 @@ Partial Class frmProgDetails 'Button4 ' Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button4.Location = New System.Drawing.Point(487, 510) + Me.Button4.Location = New System.Drawing.Point(509, 538) Me.Button4.Name = "Button4" Me.Button4.Size = New System.Drawing.Size(100, 24) Me.Button4.TabIndex = 79 @@ -565,7 +585,7 @@ Partial Class frmProgDetails Me.cbxStandorttxtErstellen.AutoSize = True Me.cbxStandorttxtErstellen.Checked = True Me.cbxStandorttxtErstellen.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxStandorttxtErstellen.Location = New System.Drawing.Point(593, 219) + Me.cbxStandorttxtErstellen.Location = New System.Drawing.Point(615, 219) Me.cbxStandorttxtErstellen.Name = "cbxStandorttxtErstellen" Me.cbxStandorttxtErstellen.Size = New System.Drawing.Size(126, 17) Me.cbxStandorttxtErstellen.TabIndex = 83 @@ -577,7 +597,7 @@ Partial Class frmProgDetails Me.cbxStandorttxtErstellenImex.AutoSize = True Me.cbxStandorttxtErstellenImex.Checked = True Me.cbxStandorttxtErstellenImex.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxStandorttxtErstellenImex.Location = New System.Drawing.Point(593, 245) + Me.cbxStandorttxtErstellenImex.Location = New System.Drawing.Point(615, 245) Me.cbxStandorttxtErstellenImex.Name = "cbxStandorttxtErstellenImex" Me.cbxStandorttxtErstellenImex.Size = New System.Drawing.Size(126, 17) Me.cbxStandorttxtErstellenImex.TabIndex = 88 @@ -587,7 +607,7 @@ Partial Class frmProgDetails 'Button5 ' Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button5.Location = New System.Drawing.Point(405, 239) + Me.Button5.Location = New System.Drawing.Point(427, 239) Me.Button5.Name = "Button5" Me.Button5.Size = New System.Drawing.Size(76, 24) Me.Button5.TabIndex = 87 @@ -605,7 +625,7 @@ Partial Class frmProgDetails ' 'txtProdPfadImex ' - Me.txtProdPfadImex.Location = New System.Drawing.Point(110, 242) + Me.txtProdPfadImex.Location = New System.Drawing.Point(132, 242) Me.txtProdPfadImex.Name = "txtProdPfadImex" Me.txtProdPfadImex.Size = New System.Drawing.Size(289, 20) Me.txtProdPfadImex.TabIndex = 85 @@ -613,7 +633,7 @@ Partial Class frmProgDetails 'Button6 ' Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button6.Location = New System.Drawing.Point(487, 239) + Me.Button6.Location = New System.Drawing.Point(509, 239) Me.Button6.Name = "Button6" Me.Button6.Size = New System.Drawing.Size(100, 24) Me.Button6.TabIndex = 84 @@ -623,7 +643,7 @@ Partial Class frmProgDetails 'Button7 ' Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button7.Location = New System.Drawing.Point(405, 536) + Me.Button7.Location = New System.Drawing.Point(427, 564) Me.Button7.Name = "Button7" Me.Button7.Size = New System.Drawing.Size(76, 24) Me.Button7.TabIndex = 92 @@ -633,7 +653,7 @@ Partial Class frmProgDetails 'Label17 ' Me.Label17.AutoSize = True - Me.Label17.Location = New System.Drawing.Point(20, 541) + Me.Label17.Location = New System.Drawing.Point(20, 569) Me.Label17.Name = "Label17" Me.Label17.Size = New System.Drawing.Size(84, 13) Me.Label17.TabIndex = 91 @@ -641,7 +661,7 @@ Partial Class frmProgDetails ' 'txtInstallProdPfadimex ' - Me.txtInstallProdPfadimex.Location = New System.Drawing.Point(110, 538) + Me.txtInstallProdPfadimex.Location = New System.Drawing.Point(132, 566) Me.txtInstallProdPfadimex.Name = "txtInstallProdPfadimex" Me.txtInstallProdPfadimex.Size = New System.Drawing.Size(289, 20) Me.txtInstallProdPfadimex.TabIndex = 90 @@ -649,7 +669,7 @@ Partial Class frmProgDetails 'Button8 ' Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button8.Location = New System.Drawing.Point(487, 536) + Me.Button8.Location = New System.Drawing.Point(509, 564) Me.Button8.Name = "Button8" Me.Button8.Size = New System.Drawing.Size(100, 24) Me.Button8.TabIndex = 89 @@ -659,7 +679,7 @@ Partial Class frmProgDetails 'Button9 ' Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button9.Location = New System.Drawing.Point(405, 562) + Me.Button9.Location = New System.Drawing.Point(427, 590) Me.Button9.Name = "Button9" Me.Button9.Size = New System.Drawing.Size(76, 24) Me.Button9.TabIndex = 96 @@ -669,7 +689,7 @@ Partial Class frmProgDetails 'Label18 ' Me.Label18.AutoSize = True - Me.Label18.Location = New System.Drawing.Point(20, 567) + Me.Label18.Location = New System.Drawing.Point(20, 595) Me.Label18.Name = "Label18" Me.Label18.Size = New System.Drawing.Size(80, 13) Me.Label18.TabIndex = 95 @@ -677,7 +697,7 @@ Partial Class frmProgDetails ' 'txtInstallProdPfadSBG ' - Me.txtInstallProdPfadSBG.Location = New System.Drawing.Point(110, 564) + Me.txtInstallProdPfadSBG.Location = New System.Drawing.Point(132, 592) Me.txtInstallProdPfadSBG.Name = "txtInstallProdPfadSBG" Me.txtInstallProdPfadSBG.Size = New System.Drawing.Size(289, 20) Me.txtInstallProdPfadSBG.TabIndex = 94 @@ -685,7 +705,7 @@ Partial Class frmProgDetails 'Button10 ' Me.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button10.Location = New System.Drawing.Point(487, 562) + Me.Button10.Location = New System.Drawing.Point(509, 590) Me.Button10.Name = "Button10" Me.Button10.Size = New System.Drawing.Size(100, 24) Me.Button10.TabIndex = 93 @@ -697,7 +717,7 @@ Partial Class frmProgDetails Me.cbxStandorttxtErstellenSBG.AutoSize = True Me.cbxStandorttxtErstellenSBG.Checked = True Me.cbxStandorttxtErstellenSBG.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxStandorttxtErstellenSBG.Location = New System.Drawing.Point(593, 271) + Me.cbxStandorttxtErstellenSBG.Location = New System.Drawing.Point(615, 271) Me.cbxStandorttxtErstellenSBG.Name = "cbxStandorttxtErstellenSBG" Me.cbxStandorttxtErstellenSBG.Size = New System.Drawing.Size(126, 17) Me.cbxStandorttxtErstellenSBG.TabIndex = 101 @@ -707,7 +727,7 @@ Partial Class frmProgDetails 'Button11 ' Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button11.Location = New System.Drawing.Point(405, 265) + Me.Button11.Location = New System.Drawing.Point(427, 265) Me.Button11.Name = "Button11" Me.Button11.Size = New System.Drawing.Size(76, 24) Me.Button11.TabIndex = 100 @@ -725,7 +745,7 @@ Partial Class frmProgDetails ' 'txtProdPfadSBG ' - Me.txtProdPfadSBG.Location = New System.Drawing.Point(110, 268) + Me.txtProdPfadSBG.Location = New System.Drawing.Point(132, 268) Me.txtProdPfadSBG.Name = "txtProdPfadSBG" Me.txtProdPfadSBG.Size = New System.Drawing.Size(289, 20) Me.txtProdPfadSBG.TabIndex = 98 @@ -733,7 +753,7 @@ Partial Class frmProgDetails 'Button12 ' Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button12.Location = New System.Drawing.Point(487, 265) + Me.Button12.Location = New System.Drawing.Point(509, 265) Me.Button12.Name = "Button12" Me.Button12.Size = New System.Drawing.Size(100, 24) Me.Button12.TabIndex = 97 @@ -745,7 +765,7 @@ Partial Class frmProgDetails Me.Button13.BackColor = System.Drawing.Color.SteelBlue Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button13.ForeColor = System.Drawing.Color.White - Me.Button13.Location = New System.Drawing.Point(487, 125) + Me.Button13.Location = New System.Drawing.Point(509, 125) Me.Button13.Name = "Button13" Me.Button13.Size = New System.Drawing.Size(100, 24) Me.Button13.TabIndex = 102 @@ -757,7 +777,7 @@ Partial Class frmProgDetails Me.Button14.BackColor = System.Drawing.Color.SteelBlue Me.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button14.ForeColor = System.Drawing.Color.White - Me.Button14.Location = New System.Drawing.Point(487, 421) + Me.Button14.Location = New System.Drawing.Point(509, 449) Me.Button14.Name = "Button14" Me.Button14.Size = New System.Drawing.Size(100, 24) Me.Button14.TabIndex = 103 @@ -769,7 +789,7 @@ Partial Class frmProgDetails Me.cbxStandorttxtErstellenWAI.AutoSize = True Me.cbxStandorttxtErstellenWAI.Checked = True Me.cbxStandorttxtErstellenWAI.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxStandorttxtErstellenWAI.Location = New System.Drawing.Point(593, 297) + Me.cbxStandorttxtErstellenWAI.Location = New System.Drawing.Point(615, 297) Me.cbxStandorttxtErstellenWAI.Name = "cbxStandorttxtErstellenWAI" Me.cbxStandorttxtErstellenWAI.Size = New System.Drawing.Size(126, 17) Me.cbxStandorttxtErstellenWAI.TabIndex = 108 @@ -779,7 +799,7 @@ Partial Class frmProgDetails 'Button15 ' Me.Button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button15.Location = New System.Drawing.Point(405, 291) + Me.Button15.Location = New System.Drawing.Point(427, 291) Me.Button15.Name = "Button15" Me.Button15.Size = New System.Drawing.Size(76, 24) Me.Button15.TabIndex = 107 @@ -797,7 +817,7 @@ Partial Class frmProgDetails ' 'txtProdPfadWAI ' - Me.txtProdPfadWAI.Location = New System.Drawing.Point(110, 294) + Me.txtProdPfadWAI.Location = New System.Drawing.Point(132, 294) Me.txtProdPfadWAI.Name = "txtProdPfadWAI" Me.txtProdPfadWAI.Size = New System.Drawing.Size(289, 20) Me.txtProdPfadWAI.TabIndex = 105 @@ -805,7 +825,7 @@ Partial Class frmProgDetails 'Button16 ' Me.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button16.Location = New System.Drawing.Point(487, 291) + Me.Button16.Location = New System.Drawing.Point(509, 291) Me.Button16.Name = "Button16" Me.Button16.Size = New System.Drawing.Size(100, 24) Me.Button16.TabIndex = 104 @@ -817,7 +837,7 @@ Partial Class frmProgDetails Me.cbxStandorttxtErstellenNKD.AutoSize = True Me.cbxStandorttxtErstellenNKD.Checked = True Me.cbxStandorttxtErstellenNKD.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxStandorttxtErstellenNKD.Location = New System.Drawing.Point(593, 323) + Me.cbxStandorttxtErstellenNKD.Location = New System.Drawing.Point(615, 323) Me.cbxStandorttxtErstellenNKD.Name = "cbxStandorttxtErstellenNKD" Me.cbxStandorttxtErstellenNKD.Size = New System.Drawing.Size(126, 17) Me.cbxStandorttxtErstellenNKD.TabIndex = 113 @@ -827,7 +847,7 @@ Partial Class frmProgDetails 'Button17 ' Me.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button17.Location = New System.Drawing.Point(405, 317) + Me.Button17.Location = New System.Drawing.Point(427, 317) Me.Button17.Name = "Button17" Me.Button17.Size = New System.Drawing.Size(76, 24) Me.Button17.TabIndex = 112 @@ -845,7 +865,7 @@ Partial Class frmProgDetails ' 'txtProdPfadNKD ' - Me.txtProdPfadNKD.Location = New System.Drawing.Point(110, 320) + Me.txtProdPfadNKD.Location = New System.Drawing.Point(132, 320) Me.txtProdPfadNKD.Name = "txtProdPfadNKD" Me.txtProdPfadNKD.Size = New System.Drawing.Size(289, 20) Me.txtProdPfadNKD.TabIndex = 110 @@ -853,7 +873,7 @@ Partial Class frmProgDetails 'Button18 ' Me.Button18.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button18.Location = New System.Drawing.Point(487, 317) + Me.Button18.Location = New System.Drawing.Point(509, 317) Me.Button18.Name = "Button18" Me.Button18.Size = New System.Drawing.Size(100, 24) Me.Button18.TabIndex = 109 @@ -865,7 +885,7 @@ Partial Class frmProgDetails Me.cbxStandorttxtErstellenNEU.AutoSize = True Me.cbxStandorttxtErstellenNEU.Checked = True Me.cbxStandorttxtErstellenNEU.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxStandorttxtErstellenNEU.Location = New System.Drawing.Point(593, 349) + Me.cbxStandorttxtErstellenNEU.Location = New System.Drawing.Point(615, 349) Me.cbxStandorttxtErstellenNEU.Name = "cbxStandorttxtErstellenNEU" Me.cbxStandorttxtErstellenNEU.Size = New System.Drawing.Size(126, 17) Me.cbxStandorttxtErstellenNEU.TabIndex = 118 @@ -875,7 +895,7 @@ Partial Class frmProgDetails 'Button19 ' Me.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button19.Location = New System.Drawing.Point(405, 343) + Me.Button19.Location = New System.Drawing.Point(427, 343) Me.Button19.Name = "Button19" Me.Button19.Size = New System.Drawing.Size(76, 24) Me.Button19.TabIndex = 117 @@ -893,7 +913,7 @@ Partial Class frmProgDetails ' 'txtProdPfadNEU ' - Me.txtProdPfadNEU.Location = New System.Drawing.Point(110, 346) + Me.txtProdPfadNEU.Location = New System.Drawing.Point(132, 346) Me.txtProdPfadNEU.Name = "txtProdPfadNEU" Me.txtProdPfadNEU.Size = New System.Drawing.Size(289, 20) Me.txtProdPfadNEU.TabIndex = 115 @@ -901,7 +921,7 @@ Partial Class frmProgDetails 'Button20 ' Me.Button20.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button20.Location = New System.Drawing.Point(487, 343) + Me.Button20.Location = New System.Drawing.Point(509, 343) Me.Button20.Name = "Button20" Me.Button20.Size = New System.Drawing.Size(100, 24) Me.Button20.TabIndex = 114 @@ -911,7 +931,7 @@ Partial Class frmProgDetails 'Button21 ' Me.Button21.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button21.Location = New System.Drawing.Point(405, 588) + Me.Button21.Location = New System.Drawing.Point(427, 616) Me.Button21.Name = "Button21" Me.Button21.Size = New System.Drawing.Size(76, 24) Me.Button21.TabIndex = 122 @@ -921,7 +941,7 @@ Partial Class frmProgDetails 'Label23 ' Me.Label23.AutoSize = True - Me.Label23.Location = New System.Drawing.Point(20, 593) + Me.Label23.Location = New System.Drawing.Point(20, 621) Me.Label23.Name = "Label23" Me.Label23.Size = New System.Drawing.Size(79, 13) Me.Label23.TabIndex = 121 @@ -929,7 +949,7 @@ Partial Class frmProgDetails ' 'txtInstallProdPfadWAI ' - Me.txtInstallProdPfadWAI.Location = New System.Drawing.Point(110, 590) + Me.txtInstallProdPfadWAI.Location = New System.Drawing.Point(132, 618) Me.txtInstallProdPfadWAI.Name = "txtInstallProdPfadWAI" Me.txtInstallProdPfadWAI.Size = New System.Drawing.Size(289, 20) Me.txtInstallProdPfadWAI.TabIndex = 120 @@ -937,7 +957,7 @@ Partial Class frmProgDetails 'Button22 ' Me.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button22.Location = New System.Drawing.Point(487, 588) + Me.Button22.Location = New System.Drawing.Point(509, 616) Me.Button22.Name = "Button22" Me.Button22.Size = New System.Drawing.Size(100, 24) Me.Button22.TabIndex = 119 @@ -947,7 +967,7 @@ Partial Class frmProgDetails 'Button23 ' Me.Button23.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button23.Location = New System.Drawing.Point(405, 614) + Me.Button23.Location = New System.Drawing.Point(427, 695) Me.Button23.Name = "Button23" Me.Button23.Size = New System.Drawing.Size(76, 24) Me.Button23.TabIndex = 126 @@ -957,23 +977,23 @@ Partial Class frmProgDetails 'Label24 ' Me.Label24.AutoSize = True - Me.Label24.Location = New System.Drawing.Point(20, 619) + Me.Label24.Location = New System.Drawing.Point(20, 647) Me.Label24.Name = "Label24" Me.Label24.Size = New System.Drawing.Size(81, 13) Me.Label24.TabIndex = 125 Me.Label24.Text = "Produktiv-NKD:" ' - 'txtInstallProdPfadNKD + 'txtInstallProdPfadUNI ' - Me.txtInstallProdPfadNKD.Location = New System.Drawing.Point(110, 616) - Me.txtInstallProdPfadNKD.Name = "txtInstallProdPfadNKD" - Me.txtInstallProdPfadNKD.Size = New System.Drawing.Size(289, 20) - Me.txtInstallProdPfadNKD.TabIndex = 124 + Me.txtInstallProdPfadUNI.Location = New System.Drawing.Point(132, 697) + Me.txtInstallProdPfadUNI.Name = "txtInstallProdPfadUNI" + Me.txtInstallProdPfadUNI.Size = New System.Drawing.Size(289, 20) + Me.txtInstallProdPfadUNI.TabIndex = 124 ' 'Button24 ' Me.Button24.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button24.Location = New System.Drawing.Point(487, 614) + Me.Button24.Location = New System.Drawing.Point(509, 695) Me.Button24.Name = "Button24" Me.Button24.Size = New System.Drawing.Size(100, 24) Me.Button24.TabIndex = 123 @@ -983,7 +1003,7 @@ Partial Class frmProgDetails 'Button25 ' Me.Button25.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button25.Location = New System.Drawing.Point(405, 640) + Me.Button25.Location = New System.Drawing.Point(427, 721) Me.Button25.Name = "Button25" Me.Button25.Size = New System.Drawing.Size(76, 24) Me.Button25.TabIndex = 130 @@ -993,23 +1013,23 @@ Partial Class frmProgDetails 'Label25 ' Me.Label25.AutoSize = True - Me.Label25.Location = New System.Drawing.Point(20, 645) + Me.Label25.Location = New System.Drawing.Point(20, 673) Me.Label25.Name = "Label25" Me.Label25.Size = New System.Drawing.Size(81, 13) Me.Label25.TabIndex = 129 Me.Label25.Text = "Produktiv-NEU:" ' - 'txtInstallProdPfadNEU + 'txtInstallProdPfadAMB ' - Me.txtInstallProdPfadNEU.Location = New System.Drawing.Point(110, 642) - Me.txtInstallProdPfadNEU.Name = "txtInstallProdPfadNEU" - Me.txtInstallProdPfadNEU.Size = New System.Drawing.Size(289, 20) - Me.txtInstallProdPfadNEU.TabIndex = 128 + Me.txtInstallProdPfadAMB.Location = New System.Drawing.Point(132, 723) + Me.txtInstallProdPfadAMB.Name = "txtInstallProdPfadAMB" + Me.txtInstallProdPfadAMB.Size = New System.Drawing.Size(289, 20) + Me.txtInstallProdPfadAMB.TabIndex = 128 ' 'Button26 ' Me.Button26.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button26.Location = New System.Drawing.Point(487, 640) + Me.Button26.Location = New System.Drawing.Point(509, 721) Me.Button26.Name = "Button26" Me.Button26.Size = New System.Drawing.Size(100, 24) Me.Button26.TabIndex = 127 @@ -1026,20 +1046,230 @@ Partial Class frmProgDetails Me.cbxZip.Text = "ZIP Copy" Me.cbxZip.UseVisualStyleBackColor = True ' + 'cbxStandorttxtErstellenAMB + ' + Me.cbxStandorttxtErstellenAMB.AutoSize = True + Me.cbxStandorttxtErstellenAMB.Checked = True + Me.cbxStandorttxtErstellenAMB.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxStandorttxtErstellenAMB.Location = New System.Drawing.Point(615, 401) + Me.cbxStandorttxtErstellenAMB.Name = "cbxStandorttxtErstellenAMB" + Me.cbxStandorttxtErstellenAMB.Size = New System.Drawing.Size(126, 17) + Me.cbxStandorttxtErstellenAMB.TabIndex = 141 + Me.cbxStandorttxtErstellenAMB.Text = "'Standort.txt' erstellen" + Me.cbxStandorttxtErstellenAMB.UseVisualStyleBackColor = True + ' + 'Button27 + ' + Me.Button27.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button27.Location = New System.Drawing.Point(427, 395) + Me.Button27.Name = "Button27" + Me.Button27.Size = New System.Drawing.Size(76, 24) + Me.Button27.TabIndex = 140 + Me.Button27.Text = "Aktualisieren" + Me.Button27.UseVisualStyleBackColor = True + ' + 'Label26 + ' + Me.Label26.AutoSize = True + Me.Label26.Location = New System.Drawing.Point(20, 401) + Me.Label26.Name = "Label26" + Me.Label26.Size = New System.Drawing.Size(96, 13) + Me.Label26.TabIndex = 139 + Me.Label26.Text = "Produktiv-AMBAR:" + ' + 'txtProdPfadAMB + ' + Me.txtProdPfadAMB.Location = New System.Drawing.Point(132, 398) + Me.txtProdPfadAMB.Name = "txtProdPfadAMB" + Me.txtProdPfadAMB.Size = New System.Drawing.Size(289, 20) + Me.txtProdPfadAMB.TabIndex = 138 + ' + 'Button28 + ' + Me.Button28.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button28.Location = New System.Drawing.Point(509, 395) + Me.Button28.Name = "Button28" + Me.Button28.Size = New System.Drawing.Size(100, 24) + Me.Button28.TabIndex = 137 + Me.Button28.Text = "PRODUKTIV->F" + Me.Button28.UseVisualStyleBackColor = True + ' + 'cbxStandorttxtErstellenUNI + ' + Me.cbxStandorttxtErstellenUNI.AutoSize = True + Me.cbxStandorttxtErstellenUNI.Checked = True + Me.cbxStandorttxtErstellenUNI.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxStandorttxtErstellenUNI.Location = New System.Drawing.Point(615, 375) + Me.cbxStandorttxtErstellenUNI.Name = "cbxStandorttxtErstellenUNI" + Me.cbxStandorttxtErstellenUNI.Size = New System.Drawing.Size(126, 17) + Me.cbxStandorttxtErstellenUNI.TabIndex = 136 + Me.cbxStandorttxtErstellenUNI.Text = "'Standort.txt' erstellen" + Me.cbxStandorttxtErstellenUNI.UseVisualStyleBackColor = True + ' + 'Button29 + ' + Me.Button29.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button29.Location = New System.Drawing.Point(427, 369) + Me.Button29.Name = "Button29" + Me.Button29.Size = New System.Drawing.Size(76, 24) + Me.Button29.TabIndex = 135 + Me.Button29.Text = "Aktualisieren" + Me.Button29.UseVisualStyleBackColor = True + ' + 'Label27 + ' + Me.Label27.AutoSize = True + Me.Label27.Location = New System.Drawing.Point(20, 375) + Me.Label27.Name = "Label27" + Me.Label27.Size = New System.Drawing.Size(106, 13) + Me.Label27.TabIndex = 134 + Me.Label27.Text = "Produktiv-UNISPED:" + ' + 'txtProdPfadUNI + ' + Me.txtProdPfadUNI.Location = New System.Drawing.Point(132, 372) + Me.txtProdPfadUNI.Name = "txtProdPfadUNI" + Me.txtProdPfadUNI.Size = New System.Drawing.Size(289, 20) + Me.txtProdPfadUNI.TabIndex = 133 + ' + 'Button30 + ' + Me.Button30.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button30.Location = New System.Drawing.Point(509, 369) + Me.Button30.Name = "Button30" + Me.Button30.Size = New System.Drawing.Size(100, 24) + Me.Button30.TabIndex = 132 + Me.Button30.Text = "PRODUKTIV->F" + Me.Button30.UseVisualStyleBackColor = True + ' + 'Button31 + ' + Me.Button31.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button31.Location = New System.Drawing.Point(427, 668) + Me.Button31.Name = "Button31" + Me.Button31.Size = New System.Drawing.Size(76, 24) + Me.Button31.TabIndex = 147 + Me.Button31.Text = "Aktualisieren" + Me.Button31.UseVisualStyleBackColor = True + ' + 'txtInstallProdPfadNEU + ' + Me.txtInstallProdPfadNEU.Location = New System.Drawing.Point(132, 670) + Me.txtInstallProdPfadNEU.Name = "txtInstallProdPfadNEU" + Me.txtInstallProdPfadNEU.Size = New System.Drawing.Size(289, 20) + Me.txtInstallProdPfadNEU.TabIndex = 146 + ' + 'Button32 + ' + Me.Button32.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button32.Location = New System.Drawing.Point(509, 668) + Me.Button32.Name = "Button32" + Me.Button32.Size = New System.Drawing.Size(100, 24) + Me.Button32.TabIndex = 145 + Me.Button32.Text = "PRODUKTIV->F" + Me.Button32.UseVisualStyleBackColor = True + ' + 'Button33 + ' + Me.Button33.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button33.Location = New System.Drawing.Point(427, 642) + Me.Button33.Name = "Button33" + Me.Button33.Size = New System.Drawing.Size(76, 24) + Me.Button33.TabIndex = 144 + Me.Button33.Text = "Aktualisieren" + Me.Button33.UseVisualStyleBackColor = True + ' + 'txtInstallProdPfadNKD + ' + Me.txtInstallProdPfadNKD.Location = New System.Drawing.Point(132, 644) + Me.txtInstallProdPfadNKD.Name = "txtInstallProdPfadNKD" + Me.txtInstallProdPfadNKD.Size = New System.Drawing.Size(289, 20) + Me.txtInstallProdPfadNKD.TabIndex = 143 + ' + 'Button34 + ' + Me.Button34.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button34.Location = New System.Drawing.Point(509, 642) + Me.Button34.Name = "Button34" + Me.Button34.Size = New System.Drawing.Size(100, 24) + Me.Button34.TabIndex = 142 + Me.Button34.Text = "PRODUKTIV->F" + Me.Button34.UseVisualStyleBackColor = True + ' + 'Label28 + ' + Me.Label28.AutoSize = True + Me.Label28.Location = New System.Drawing.Point(20, 726) + Me.Label28.Name = "Label28" + Me.Label28.Size = New System.Drawing.Size(96, 13) + Me.Label28.TabIndex = 149 + Me.Label28.Text = "Produktiv-AMBAR:" + ' + 'Label29 + ' + Me.Label29.AutoSize = True + Me.Label29.Location = New System.Drawing.Point(20, 700) + Me.Label29.Name = "Label29" + Me.Label29.Size = New System.Drawing.Size(106, 13) + Me.Label29.TabIndex = 148 + Me.Label29.Text = "Produktiv-UNISPED:" + ' + 'Button35 + ' + Me.Button35.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button35.Location = New System.Drawing.Point(615, 125) + Me.Button35.Name = "Button35" + Me.Button35.Size = New System.Drawing.Size(126, 24) + Me.Button35.TabIndex = 150 + Me.Button35.Text = "Update-Daten" + Me.Button35.UseVisualStyleBackColor = True + ' + 'cbxIncrementalCopy + ' + Me.cbxIncrementalCopy.AutoSize = True + Me.cbxIncrementalCopy.Checked = True + Me.cbxIncrementalCopy.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxIncrementalCopy.Location = New System.Drawing.Point(487, 72) + Me.cbxIncrementalCopy.Name = "cbxIncrementalCopy" + Me.cbxIncrementalCopy.Size = New System.Drawing.Size(105, 17) + Me.cbxIncrementalCopy.TabIndex = 151 + Me.cbxIncrementalCopy.Text = "IncrementalCopy" + Me.cbxIncrementalCopy.UseVisualStyleBackColor = True + ' 'frmProgDetails ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(716, 824) + Me.ClientSize = New System.Drawing.Size(759, 903) + Me.Controls.Add(Me.cbxIncrementalCopy) + Me.Controls.Add(Me.Button35) + Me.Controls.Add(Me.Label28) + Me.Controls.Add(Me.Label29) + Me.Controls.Add(Me.Button31) + Me.Controls.Add(Me.txtInstallProdPfadNEU) + Me.Controls.Add(Me.Button32) + Me.Controls.Add(Me.Button33) + Me.Controls.Add(Me.txtInstallProdPfadNKD) + Me.Controls.Add(Me.Button34) + Me.Controls.Add(Me.cbxStandorttxtErstellenAMB) + Me.Controls.Add(Me.Button27) + Me.Controls.Add(Me.Label26) + Me.Controls.Add(Me.txtProdPfadAMB) + Me.Controls.Add(Me.Button28) + Me.Controls.Add(Me.cbxStandorttxtErstellenUNI) + Me.Controls.Add(Me.Button29) + Me.Controls.Add(Me.Label27) + Me.Controls.Add(Me.txtProdPfadUNI) + Me.Controls.Add(Me.Button30) Me.Controls.Add(Me.cbxZip) Me.Controls.Add(Me.Button25) Me.Controls.Add(Me.Label25) - Me.Controls.Add(Me.txtInstallProdPfadNEU) + Me.Controls.Add(Me.txtInstallProdPfadAMB) Me.Controls.Add(Me.Button26) Me.Controls.Add(Me.Button23) Me.Controls.Add(Me.Label24) - Me.Controls.Add(Me.txtInstallProdPfadNKD) + Me.Controls.Add(Me.txtInstallProdPfadUNI) Me.Controls.Add(Me.Button24) Me.Controls.Add(Me.Button21) Me.Controls.Add(Me.Label23) @@ -1226,11 +1456,31 @@ Partial Class frmProgDetails Friend WithEvents Button22 As System.Windows.Forms.Button Friend WithEvents Button23 As System.Windows.Forms.Button Friend WithEvents Label24 As System.Windows.Forms.Label - Friend WithEvents txtInstallProdPfadNKD As System.Windows.Forms.TextBox + Friend WithEvents txtInstallProdPfadUNI As System.Windows.Forms.TextBox Friend WithEvents Button24 As System.Windows.Forms.Button Friend WithEvents Button25 As System.Windows.Forms.Button Friend WithEvents Label25 As System.Windows.Forms.Label - Friend WithEvents txtInstallProdPfadNEU As System.Windows.Forms.TextBox + Friend WithEvents txtInstallProdPfadAMB As System.Windows.Forms.TextBox Friend WithEvents Button26 As System.Windows.Forms.Button Friend WithEvents cbxZip As CheckBox + Friend WithEvents cbxStandorttxtErstellenAMB As CheckBox + Friend WithEvents Button27 As Button + Friend WithEvents Label26 As Label + Friend WithEvents txtProdPfadAMB As TextBox + Friend WithEvents Button28 As Button + Friend WithEvents cbxStandorttxtErstellenUNI As CheckBox + Friend WithEvents Button29 As Button + Friend WithEvents Label27 As Label + Friend WithEvents txtProdPfadUNI As TextBox + Friend WithEvents Button30 As Button + Friend WithEvents Button31 As Button + Friend WithEvents txtInstallProdPfadNEU As TextBox + Friend WithEvents Button32 As Button + Friend WithEvents Button33 As Button + Friend WithEvents txtInstallProdPfadNKD As TextBox + Friend WithEvents Button34 As Button + Friend WithEvents Label28 As Label + Friend WithEvents Label29 As Label + Friend WithEvents Button35 As Button + Friend WithEvents cbxIncrementalCopy As CheckBox End Class diff --git a/UID/Programme/frmProgDetails.vb b/UID/Programme/frmProgDetails.vb index 03f3cab..cef47f5 100644 --- a/UID/Programme/frmProgDetails.vb +++ b/UID/Programme/frmProgDetails.vb @@ -58,7 +58,13 @@ Public Class frmProgDetails txtProdPfadNEU.Text = daten.prog_prod_path_NEU txtInstallProdPfadNEU.Text = daten.prog_installer_prod_path_NEU - + + txtProdPfadUNI.Text = daten.prog_prod_path_UNI + txtInstallProdPfadUNI.Text = daten.prog_installer_prod_path_UNI + + txtProdPfadAMB.Text = daten.prog_prod_path_AMB + txtInstallProdPfadAMB.Text = daten.prog_installer_prod_path_AMB + End Sub Private Sub btnVersionAkt_Click(sender As Object, e As EventArgs) Handles btnVersionAkt.Click @@ -146,7 +152,13 @@ Public Class frmProgDetails daten.prog_installer_prod_path_NKD = txtInstallProdPfadNKD.Text daten.prog_prod_path_NEU = txtProdPfadNEU.Text daten.prog_installer_prod_path_NEU = txtInstallProdPfadNEU.Text - + + daten.prog_prod_path_UNI = txtProdPfadUNI.Text + daten.prog_installer_prod_path_UNI = txtInstallProdPfadUNI.Text + daten.prog_prod_path_AMB = txtProdPfadAMB.Text + daten.prog_installer_prod_path_AMB = txtInstallProdPfadAMB.Text + + If PROG.insertProgramm(daten) Then Me.Close() @@ -167,14 +179,14 @@ Public Class frmProgDetails Dim PROG_FUNC As New cProgramFunctions - Sub copyProgrammFiles(sender As Button, von As String, nach As String, cbx As Boolean, Optional standort As String = "") + Sub copyProgrammFiles(sender As Button, von As String, nach As String, cbx As Boolean, Optional standort As String = "", Optional LIST As List(Of VERAG_PROG_ALLGEMEIN.cProgrammeUpdate) = Nothing) sender.BackColor = Color.LightGray Application.DoEvents() Me.Refresh() If von = "" Then sender.BackColor = Color.White : Exit Sub If nach = "" Then sender.BackColor = Color.White : Exit Sub If checkSicherheitsfrage(von, nach) Then - setBG(sender, PROG_FUNC.copyProgram(von, nach, cbx)) + setBG(sender, PROG_FUNC.copyProgram(von, nach, cbx, cbxIncrementalCopy.Checked)) End If Application.DoEvents() Me.Refresh() @@ -187,6 +199,7 @@ Public Class frmProgDetails + Function checkSicherheitsfrage(von, nach) As Boolean If sicherheitsfrageUeberspringen Then Return True If vbYes = MsgBox("Möchten Sie folgende Aktion ausführen?:" & vbNewLine & vbNewLine & " Kopiere alle Files von: " & von & vbNewLine & "Nach: " & nach, vbYesNo, "Aktion ausführen?") Then @@ -320,6 +333,8 @@ Public Class frmProgDetails Button16.PerformClick() Button18.PerformClick() Button20.PerformClick() + Button30.PerformClick() + Button28.PerformClick() End If sicherheitsfrageUeberspringen = False End Sub @@ -336,6 +351,8 @@ Public Class frmProgDetails Button22.PerformClick() Button24.PerformClick() Button26.PerformClick() + Button32.PerformClick() + Button34.PerformClick() End If sicherheitsfrageUeberspringen = False End Sub @@ -361,12 +378,12 @@ Public Class frmProgDetails End Sub Private Sub Button23_Click(sender As Object, e As EventArgs) Handles Button23.Click - PROG.setParam("prog_installer_prod_path_nkd", txtInstallProdPfadNKD.Text, codename) + PROG.setParam("prog_installer_prod_path_uni", txtInstallProdPfadUNI.Text, codename) init() End Sub Private Sub Button25_Click(sender As Object, e As EventArgs) Handles Button25.Click - PROG.setParam("prog_installer_prod_path_neu", txtInstallProdPfadNEU.Text, codename) + PROG.setParam("prog_installer_prod_path_amb", txtInstallProdPfadAMB.Text, codename) init() End Sub @@ -391,12 +408,101 @@ Public Class frmProgDetails End Sub Private Sub Button24_Click(sender As Object, e As EventArgs) Handles Button24.Click - copyProgrammFiles(sender, txtInstallSourcePfad.Text, txtInstallProdPfadNKD.Text, cbxZip.Checked) + copyProgrammFiles(sender, txtInstallSourcePfad.Text, txtInstallProdPfadUNI.Text, cbxZip.Checked) End Sub Private Sub Button26_Click(sender As Object, e As EventArgs) Handles Button26.Click - copyProgrammFiles(sender, txtInstallSourcePfad.Text, txtInstallProdPfadNEU.Text, cbxZip.Checked) + copyProgrammFiles(sender, txtInstallSourcePfad.Text, txtInstallProdPfadAMB.Text, cbxZip.Checked) End Sub + + Private Sub Button30_Click(sender As Object, e As EventArgs) Handles Button30.Click + copyProgrammFiles(sender, txtSourcePfad.Text, txtProdPfadUNI.Text, cbxZip.Checked, If(cbxStandorttxtErstellenUNI.Checked, "UNISPED", "")) + End Sub + + Private Sub Button28_Click(sender As Object, e As EventArgs) Handles Button28.Click + copyProgrammFiles(sender, txtSourcePfad.Text, txtProdPfadAMB.Text, cbxZip.Checked, If(cbxStandorttxtErstellenAMB.Checked, "AMBAR", "")) + End Sub + + Private Sub Button29_Click(sender As Object, e As EventArgs) Handles Button29.Click + PROG.setParam("prog_prod_path_uni", txtProdPfadUNI.Text, codename) + init() + End Sub + + Private Sub Button27_Click(sender As Object, e As EventArgs) Handles Button27.Click + PROG.setParam("prog_prod_path_amb", txtProdPfadAMB.Text, codename) + init() + End Sub + + Private Sub Button34_Click(sender As Object, e As EventArgs) Handles Button34.Click + copyProgrammFiles(sender, txtInstallSourcePfad.Text, txtInstallProdPfadNKD.Text, cbxZip.Checked) + End Sub + + + Private Sub Button32_Click(sender As Object, e As EventArgs) Handles Button32.Click + + copyProgrammFiles(sender, txtInstallSourcePfad.Text, txtInstallProdPfadNEU.Text, cbxZip.Checked) + End Sub + + Private Sub Button33_Click(sender As Object, e As EventArgs) Handles Button33.Click + PROG.setParam("prog_installer_prod_path_nkd", txtInstallProdPfadNKD.Text, codename) + init() + End Sub + + Private Sub Button31_Click(sender As Object, e As EventArgs) Handles Button31.Click + PROG.setParam("prog_installer_prod_path_neu", txtInstallProdPfadNEU.Text, codename) + init() + End Sub + + Dim LIST As New List(Of VERAG_PROG_ALLGEMEIN.cProgrammeUpdate) + Private Sub Button35_Click(sender As Object, e As EventArgs) Handles Button35.Click + If txtSourcePfad.Text = "" Then Exit Sub + If Not IO.Directory.Exists(txtSourcePfad.Text) Then Exit Sub + Dim LIST = New List(Of VERAG_PROG_ALLGEMEIN.cProgrammeUpdate) + + Dim dirName = "" + VERAG_PROG_ALLGEMEIN.cProgrammeUpdate.RekursivGetFiles(New IO.DirectoryInfo(txtSourcePfad.Text), dirName, LIST, {}) + + For Each f In IO.Directory.GetFiles(txtSourcePfad.Text) + Dim FI As New IO.FileInfo(f) + If dirName = "" Then + dirName = FI.DirectoryName + MsgBox(dirName) + End If + + Dim UD As New VERAG_PROG_ALLGEMEIN.cProgrammeUpdate + UD.pud_fileName = FI.Name + UD.pud_filePathFolder = FI.DirectoryName.Replace(dirName, "") + If UD.pud_filePathFolder = "" Then UD.pud_filePathFolder = Nothing + UD.pud_file_Size = FI.Length + UD.pud_file_Date = FI.LastWriteTime + UD.pud_file_Verion = "" 'FI. + LIST.Add(UD) + Next + Dim daten As cProgramm = PROG.getProgrammByCodeName(codename) + If daten Is Nothing Then Exit Sub + VERAG_PROG_ALLGEMEIN.cProgrammeUpdate.SAVE_LIST(daten.prog_id, txtVersion.Text.Replace(".", ""), codename, LIST) + End Sub + + + Public Function isNewFile(ByRef file As VERAG_PROG_ALLGEMEIN.cProgrammeUpdate, LIST_DEST As List(Of VERAG_PROG_ALLGEMEIN.cProgrammeUpdate)) As Boolean + For Each l In LIST_DEST + If l.pud_filePathFolder = file.pud_filePathFolder And l.pud_fileName = file.pud_fileName And l.pud_file_Size = file.pud_file_Size And l.pud_file_Date = file.pud_file_Date Then + Return False + End If + Next + Return True + End Function + + Public Function isOldFile(ByRef file As VERAG_PROG_ALLGEMEIN.cProgrammeUpdate, LIST_SOURCE As List(Of VERAG_PROG_ALLGEMEIN.cProgrammeUpdate)) As Boolean + For Each l In LIST_SOURCE + If l.pud_filePathFolder = file.pud_filePathFolder And l.pud_fileName = file.pud_fileName And l.pud_file_Size = file.pud_file_Size And l.pud_file_Date = file.pud_file_Date Then + Return False + End If + Next + Return True + End Function + + End Class \ No newline at end of file diff --git a/UID/cClasses.vb b/UID/cClasses.vb index 0a5d87e..720de32 100644 --- a/UID/cClasses.vb +++ b/UID/cClasses.vb @@ -36,6 +36,11 @@ Public Class cProgramm Property prog_installer_prod_path_NKD As String = "" Property prog_prod_path_NEU As String = "" Property prog_installer_prod_path_NEU As String = "" + + Property prog_prod_path_UNI As String = "" + Property prog_installer_prod_path_UNI As String = "" + Property prog_prod_path_AMB As String = "" + Property prog_installer_prod_path_AMB As String = "" End Class Public Class cSeminar diff --git a/UID/cProgramFunctions.vb b/UID/cProgramFunctions.vb index f81253c..5e57551 100644 --- a/UID/cProgramFunctions.vb +++ b/UID/cProgramFunctions.vb @@ -129,8 +129,10 @@ Public Class cProgramFunctions End Try End Function - Public Function copyProgram(ByRef sourcePfad As String, ByVal destPfad As String, Optional ZIP As Boolean = False) As Boolean - If ZIP Then + Public Function copyProgram(ByRef sourcePfad As String, ByVal destPfad As String, Optional ZIP As Boolean = False, Optional incrementalCopy As Boolean = False, Optional list As List(Of VERAG_PROG_ALLGEMEIN.cProgrammeUpdate) = Nothing) As Boolean + If incrementalCopy Then + Return VERAG_PROG_ALLGEMEIN.cProgrammeUpdate.copyProgramLIST(sourcePfad, destPfad, {}) + ElseIf ZIP Then Return copyProgramZIP(sourcePfad, destPfad) Else Return copyProgramNOTZip(sourcePfad, destPfad) @@ -176,6 +178,8 @@ Public Class cProgramFunctions Return False End Function + + Private Function FileCopier(ByRef sourcePfad As String, ByVal destPfad As String) As Boolean If Not destPfad.EndsWith("\") Then destPfad = destPfad & "\" Try diff --git a/UID/cSqlDb.vb b/UID/cSqlDb.vb index 58dae57..9e2343c 100644 --- a/UID/cSqlDb.vb +++ b/UID/cSqlDb.vb @@ -819,6 +819,10 @@ Public Class cProgramme If Not dr.Item("prog_installer_prod_path_NKD") Is DBNull.Value Then daten.prog_installer_prod_path_NKD = dr.Item("prog_installer_prod_path_NKD") If Not dr.Item("prog_prod_path_NEU") Is DBNull.Value Then daten.prog_prod_path_NEU = dr.Item("prog_prod_path_NEU") If Not dr.Item("prog_installer_prod_path_NEU") Is DBNull.Value Then daten.prog_installer_prod_path_NEU = dr.Item("prog_installer_prod_path_NEU") + If Not dr.Item("prog_prod_path_UNI") Is DBNull.Value Then daten.prog_prod_path_UNI = dr.Item("prog_prod_path_UNI") + If Not dr.Item("prog_installer_prod_path_UNI") Is DBNull.Value Then daten.prog_installer_prod_path_UNI = dr.Item("prog_installer_prod_path_UNI") + If Not dr.Item("prog_prod_path_AMB") Is DBNull.Value Then daten.prog_prod_path_AMB = dr.Item("prog_prod_path_AMB") + If Not dr.Item("prog_installer_prod_path_AMB") Is DBNull.Value Then daten.prog_installer_prod_path_AMB = dr.Item("prog_installer_prod_path_AMB") Return daten End If @@ -834,8 +838,8 @@ Public Class cProgramme Public Function insertProgramm(ByVal daten As cProgramm) As Boolean Dim sql = "INSERT INTO tblProgramme " & - "(prog_codename, prog_name, prog_aktuelleVersion, prog_info, prog_source_path, prog_dev_path,prog_prod_path,prog_installer_source_path,prog_installer_dev_path,prog_installer_prod_path,prog_installer_prod_path_atilla,prog_prod_path_atilla,prog_prod_path_imex,prog_installer_prod_path_imex,prog_prod_path_SBG,prog_installer_prod_path_SBG,prog_prod_path_WAI,prog_installer_prod_path_WAI,prog_prod_path_NKD,prog_installer_prod_path_NKD,prog_prod_path_NEU,prog_installer_prod_path_NEU) VALUES " & - "(@prog_codename,@prog_name,@prog_aktuelleVersion,@prog_info,@prog_source_path,@prog_dev_path,@prog_prod_path,@prog_installer_source_path,@prog_installer_dev_path,@prog_installer_prod_path,@prog_installer_prod_path_atilla,@prog_prod_path_atilla,@prog_prod_path_imex,@prog_installer_prod_path_imex,@prog_prod_path_SBG,@prog_installer_prod_path_SBG,@prog_prod_path_WAI,@prog_installer_prod_path_WAI,@prog_prod_path_NKD,@prog_installer_prod_path_NKD,@prog_prod_path_NEU,@prog_installer_prod_path_NEU)" + "(prog_codename, prog_name, prog_aktuelleVersion, prog_info, prog_source_path, prog_dev_path,prog_prod_path,prog_installer_source_path,prog_installer_dev_path,prog_installer_prod_path,prog_installer_prod_path_atilla,prog_prod_path_atilla,prog_prod_path_imex,prog_installer_prod_path_imex,prog_prod_path_SBG,prog_installer_prod_path_SBG,prog_prod_path_WAI,prog_installer_prod_path_WAI,prog_prod_path_NKD,prog_installer_prod_path_NKD,prog_prod_path_NEU,prog_installer_prod_path_NEU,prog_installer_prod_path_UNI,prog_installer_prod_path_AMB) VALUES " & + "(@prog_codename,@prog_name,@prog_aktuelleVersion,@prog_info,@prog_source_path,@prog_dev_path,@prog_prod_path,@prog_installer_source_path,@prog_installer_dev_path,@prog_installer_prod_path,@prog_installer_prod_path_atilla,@prog_prod_path_atilla,@prog_prod_path_imex,@prog_installer_prod_path_imex,@prog_prod_path_SBG,@prog_installer_prod_path_SBG,@prog_prod_path_WAI,@prog_installer_prod_path_WAI,@prog_prod_path_NKD,@prog_installer_prod_path_NKD,@prog_prod_path_NEU,@prog_installer_prod_path_NEU,@prog_installer_prod_path_UNI,@prog_installer_prod_path_AMB)" Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() Using cmd As New SqlCommand(sql, conn) @@ -862,7 +866,11 @@ Public Class cProgramme cmd.Parameters.AddWithValue("@prog_prod_path_NEU", daten.prog_prod_path_NEU) cmd.Parameters.AddWithValue("@prog_installer_prod_path_NEU", daten.prog_installer_prod_path_NEU) - + cmd.Parameters.AddWithValue("@prog_prod_path_UNI", daten.prog_prod_path_UNI) + cmd.Parameters.AddWithValue("@prog_installer_prod_path_UNI", daten.prog_installer_prod_path_UNI) + cmd.Parameters.AddWithValue("@prog_prod_path_AMB", daten.prog_prod_path_AMB) + cmd.Parameters.AddWithValue("@prog_installer_prod_path_AMB", daten.prog_installer_prod_path_AMB) + Try cmd.ExecuteNonQuery() diff --git a/UID/frmActiveReprotViewer.vb b/UID/frmActiveReprotViewer.vb index 016a168..cc2efc1 100644 --- a/UID/frmActiveReprotViewer.vb +++ b/UID/frmActiveReprotViewer.vb @@ -74,7 +74,7 @@ Public Class frmActiveReprotViewer p.Parameters("date").Value = semiCert.datum p.Parameters("titel").Value = semiCert.titel p.Parameters("inhalt").Value = semiCert.inhalt - 'p.Parameters("referent").Value = semiCert.referent + ' p.Parameters("referent").Value = semiCert.referent If semiCert.unterzeichnender = "" Then Dim u As String = InputBox("Bitte geben Sie den Unterzeichnenden an:") p.Parameters("unterz").Value = If(u <> "", u, "Johann Luxbauer") diff --git a/UID/frmSeminarDetails.vb b/UID/frmSeminarDetails.vb index 0b59a12..b5b3cda 100644 --- a/UID/frmSeminarDetails.vb +++ b/UID/frmSeminarDetails.vb @@ -30,6 +30,7 @@ Public Class frmSeminarDetails cboReportVorlage.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Unterschr. Vorstand + Vortr.Name (Standard)", "rptSeminatZert.rpx")) cboReportVorlage.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Unterschr. Vorstand", "rptSeminatZertVorst.rpx")) cboReportVorlage.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Unterschr. Vorstand + Vortr.Allg / nur Inh. 1", "rptSeminatZertAllgUnter.rpx")) + cboReportVorlage.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Unterschr. XXX", "rptSeminatZertVorst.rpx")) cboReportVorlage.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Interne Ausbildung CS", "rptIntAusb.rpx")) '3 cboReportVorlage.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Interne Ausbildung AG", "rptIntAusbAG.rpx")) '3 cboReportVorlage.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Interne Ausbildung ATILLA", "rptIntAusbATILLA.rpx")) '3 @@ -271,7 +272,7 @@ Public Class frmSeminarDetails semiCert.teilnehmer = teilnehmer If datBis.Text = datVon.Text Then - semiCert.datum = lblBez.Text + 'semiCert.datum = lblBez.Text semiCert.datum = "hat am " & datVon.Value.ToShortDateString & " am Seminar" Else semiCert.datum = "hat vom " & datVon.Value.ToShortDateString & " bis zum " & datBis.Value.ToShortDateString & " am Seminar" @@ -281,10 +282,11 @@ Public Class frmSeminarDetails semiCert.inhalt = rtbInhalt.Text semiCert.inhalt2 = rtbInhalt2.Text semiCert.referent = txtVortragender.Text + semiCert.unterzeichnender = lblBez.Text If Not cboReportVorlage.SelectedItem Is Nothing Then frmActiveReprotViewer.report = CType(cboReportVorlage.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value 'frmActiveReprotViewer.semiCert = semiCert If cbxIntAusbildung.Checked Then - semiCert.datum = lblBez.Text + ' semiCert.datum = lblBez.Text frmActiveReprotViewer.BefüllenSeminarZertifikatIntern(semiCert) Else frmActiveReprotViewer.BefüllenSeminarZertifikat(semiCert) diff --git a/UID/rptSeminatZertVorst.rpx b/UID/rptSeminatZertVorst.rpx index c6c5ac8..16e94bd 100644 --- a/UID/rptSeminatZertVorst.rpx +++ b/UID/rptSeminatZertVorst.rpx @@ -23,7 +23,7 @@ 0D0D0004021736000089504E470D0A1A0A0000000D4948445200000404000000E50806000000C43025DB000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000001974455874536F6674776172650041646F626520496D616765526561647971C9653C0000359C49444154785EEDDD77DC354959E671C290862459441C610045F20E516150044505040105490B83844524082E0A2A220822E8828080B282C020C9258D6477869C832020C9617001252C233989D7CD7098F33EEFF59CA7ABABBAABBAFAF7C7F7F3D162DEF3DC5D7DF739557757579FE1DBDFFE3600000000005819DB080000000000FA661B010000000040DF6C230000000000E89B6D0400000000007DB38D0000000000A06FB6110000000000F4CD36020000000080BED9460000000000D037DB080000000000FA661B010000000040DF6C230000000000E89B6D0400000000007DB38D0000000000A06FB6110000000000F4CD36020000000080BED9460000000000D037DB080000000000FA661B010000000040DF6C230000000000E89B6D4C7186AB3F18000000C03A9C452E29D7933BC9EFC8A3E429F2777292BC474E967F93CF7FD7D7E4DB0BB4893F7C46E2B8DE2B6F9513E5C5F21C89E3FF63B9BFDC566E2857958BC999C4F5E5286E4E068C651B53B82405000000B068E79463E51EF24489C96F4C86BF296EE28CFD7D5D3E2C2F933F953BC88FC9A842819B930163D9C65D9484B71097E8B5C405760939EC62C1283F2C5F15D7D735DC595C9CADF8EFE2E2461FBE4FDC795FA2FF25EE18515EFC2E6DEE267D5A3E246F915748DC457AB23C5CEE26BF205790F38A3B6F5887078ACBA5163D4DDC3160F92E2431CE8FC9FFBBE55BE27200E5C4EFC40B248A2E1717775E0EE3E668C058B6711725E119E56DE292BA96A7CA61170B46395E5C1FD7F00139425C9CADA020D0370A0298530C0C5F2B8F93BBC835E44871E713FDB8A09C2A2E275AF49F12452C772C589EA3E5B7E50D12E7D69D73CCE78D12C5E2F3883B5FDFE1E668C058B6F1204AC49F1197C4B5C417582CBB39EC824192AB89EBDF5A6E2E2ECE965010E81B0501D4162BB6FEAF3C48AE25AD174991EEB1E2CE7DCBE29969772C588628341E2731F974E717F5FD873C5A2E2A879D43373F03C6B28D4328196380E212B896E7CB61170C92C49D29D7B735C4F2DA588DE2E26C090581BE5110406B3E27B171D54FCA12BE23B1DBA5241E3171E7BA75D711774C6857AC467998C4F7883BA768CF17E5F7E46CF2BD73E9E666C058B6710825E335C5256E4DC7C8F72E1624B999B83EAD2576AE7571B6868240DF2808A065FF2CF1DCE939C49D73B4EFB9E2CEED12BC5EDC31A13DF11D1193CA985CBA7389F6BD5FAE22DF39A76E6E068C651B875242C626182E696B899D3BB7BF00314CBC3EE683E2FAB486978B8BB3451404FA4641004BF049B9BBF038C1B25C5DDCF95C925F14776C68C74F49BC19C09D3F2C4BBCB6F17662E765C058B6712825643CB7DFDA0624B18C72EF972176BBA7B8BEACE57B15D005A020D0370A025892B7CB95C49D7FB4E735E2CEE392BC4FCE2CEEF850571408E3F576EEBC61D91EE0E665C058B63185923276F877C95ACBEB64EF9722F617139ECF88EBCB1A9E252ECE565110E81B05012C4D6C42F86BE27200EDB8B1B8F3B7447712778CA8275E637A92B8F3853EDCD7CDCB80316C630A25E451D2DA86383F2F7BBF1CE13D525C1FD6F00D890D965C9CADA220D0370A0258AA878ACB03D417776EE3CEBA3B6F4B748AB08F453B2E24EF1677AED0979BB9B91990CA36A6503286C76C25670BDE29ECBE7CB04B48DC4D727D58C313C4C5D9320A027DA3208025A328D0A658C1E1CED792DD4FDCB1625EB132201E1D72E708FD39552EE5E667400ADB984289182E22ADED5CFACBB2FD2589C3FDADB8BEABE14B62DFB5DA380A027DA32080A5BBBDB87C401DE794D804D29DAB25FBACF4F47DB944679297883B3FE857BC32FC4C6E8E060C651B53280937FE505CA2D6F20161C7E5FD5D435CBFD512EFC57571B68E8240DF280860E9BE2C3F2A2E2730BFDF15779E7AF047E28E19F3E839B7B0DB716E8E060C651B5328093762E0DCD2E674E18EB21D234E179B2FBA3EAB61C977162808F48D82007AF06689BB872E2F309F0BCB17C49DA31E7C4596B8D2AF0757956F8A3B2FE85FAC3A3AA79BA70143D8C6144AC06DF10C994BD45A62A39BB3CADE38D7EEE6E2FAAB96253F7B4841A06F1404D08BE3C4E505E6F33871E7A6274F1677EC984EBCF6F15DE2CE07D6E35E6E9E060C611B532801B7C52EB3FF2A2E516BF90DD91BE79A4581E443E2FAAA868FCB927727A620D0370A02E8C5D2BF6B97EE32126FD271E7A62771973A8ED5F501A6F13FC49D0BACCBC9C25E0218C536A650F2EDD5DAEEB9B18CE65CE2625DA37B89EBA75A967ED78A8240DF2808A0277713971B98DEF3C59D931E3D4F5C1FA0BC28F2F5B84925C6F9393757030E621B5328F9F68A8DFC3E282E516B7980B858D7262637F1BCBEEBA31ADE2F4BDFF8918240DF2808A027F19DCB2B79E7F7E3E2CE47CFAE26AE2F50D63DC5F53FD6E9E96EAE061CC436A650F239F1CA3F97A8B57C5E7A1AD88FF52871FD53CB2F898B73492808F48D82007A139353971F984E4B9BF8CEE51FC4F505CA898D425B7A0414F59D2A6775F3356017DB984289E7C41D88778A4BD65A96FA5ABB522E215F13D73735C4AED73DDCA9A220D0370A02E8CD13C4E507A6715371E7610D7E565C9FA08CE85FD7EF58B7EBBAF91AB08B6D4CA1C4DBCF0DC5256A2D5F948B888B750DFE565CBFD4F253E2E25C1A0A027DA32080DEC4C6BF3C36308F7824EE03E2CEC31AC48D215E77399DE3C5F53BD6ED216EBE06EC621B5328F17639515CB2D61203621767EFAE21AE3F6A79B9B83897888240DF2808A0475716972328EBEEE2FA7F4D7E555CDF204F6C26F865717D8E757B859BAF01BBD8C6144ABC5DAE252E596B8925F33F242ED65EC59DA0D69E5FBC8AB85897888240DF2808A047F71697232827DE6EF42971FDBF261F9178DDB1EB238CF78BE2FA1BF8BC9BAF01BBD8C6144ABC83BC505CC2D6F2147171F6EA16E2FAA19667898B73A92808F48D82007AF45C713982721E2CAEEFD72876C2777D84F19E2CAEAF81F0436ECE06ECC736A650D21DE4F2F29FE212B6866FCAA5C5C5DA9BA8CA4775DEF5430DDF904B898B75A92808F48D82007AF4CFE27204657CBFC4BE45AEEFD7E8DF24564CB8BEC2381F16D7D740B8819BB301FBB18D29947443FC8DB884AD2536D87371F6E63EE28EBF961E77B7A620D0370A02E8D1B7E4487179827C7F21AEDFD7ECF7C5F515D25D4C5C1F031BC7B9391BB01FDB9842493744BCF2EEEBE292B68658B1D0D373ECCEF9E473E28EBF86B85B725171B12E190581BE511040AFAE2A2E4F90E747245622BA3E5FB32FC885C4F519D2FC92B83E6EDD57E5DDF21C7994DC4F6E2D3790D8FCFAC7E42889DFDDB9C4B8F48725365ABDA6FCBCDC4EEE2B7F2ACF93B7CBD236707C909BB301FBB18D299474433D4E5CD2D6F2127171F6E2D1E28EBB96878A8B73E95A29083C42DC8F1DF2F4F47A360A02D8767B7179823C2F10D7DF35BCCAB4D5F418717D86340F13D7BFADF97779AA1C2751285BF22B28CF2C979118F33D4D5ABAE1E6FC859BB301FBB18D299474434515AEB567EAE22D082ED6A5BBA4B4B422E33312932B17EBD2B55210880DAC5C7CC0462B05811BC9DEC24B0F2E287187EB26F207F22671C7DF8A0788CB138C776D717D5DC3C7E46CF2D6ADB6DA625C122B465DDF61B8B8A1E5FAB705B102378A623F2D318976F1F720AEAD5F96F789EB87DA5EE4E66CC07E6C630A255D8AD6AA9A278A8B73E96239963BDE5A7E535C9C3DA02080A568A520F093E2E2EB51140862C9A9EB87DA221F5CCC18275613BD415C5FD7700789B8E27A73FF7B2DCF90BD7D87341F15D7B7B5BD5E6223711773AF8E90D656E48613DD9C0DD88F6D4CA1A44B1177515A5B66F333E2625DAA58F5E08EB39653E41CE262ED0105012C0505817A6E2B2DADDA0ACF16172BC6B9B9B87EAEE1BDB2BD3CBBA53BCA7107F94AB2DD77182EEE4CC7A6A0AE6F6B7AA6C4E4D8C5BC067F28AE5F6A79979BB301FBB18D299474A97E4B5CF2D612CBE97A794E388E232AB4EE386BB993B8587B4141004B4141A0AED83CCBF5472DAF151727D2C544E883E2FAB9861BCB767C71D7B6A549E4DFCB767C182E5EDDECFAB4A6574BCF8F070C11E3EFE807D73F3550104012DB984249972AEE167F425C02D7725371B12ECD2DC41D5F2DF16C55EF15630A02580A0A02F5C52B6F5D9FD4F02E713122DDAF8BEBE31A5E272EC6A788FBEF6BB9AEB838B1DBF5C4F5672DB13758ECD2EF625D9B78442C56C0B87E9ADBC96ECE06ECC736A650D28D715771095C4B4C5C97BCFB6938AB7C44DCF1D5723371B1F6848200968282407D7177AF9501E3FBC5C58834E796D84DDDF5710DB1B1A18BF307A4A557A7BD597A7A8BCB5C6E23AE3F6B79B8B838D7EA0471FD34370A0248621B5328E9C688BBC61F1697C4B52CFD154CF711775CB5C40EDB6BF8B1A72080A5A020D08693C4F5CBDC4E16171FD2B4F4ECF08BC5C5B811AFFF75FFAE96789FBE8B13FB6B69ACF735893788B938D72AE612AEAFE6F631376703F6631B5328E9C6BA95B824AE250A147197DDC5DABAF34B6B9B35AE65D04F41004B4141A00DF717D72F73FB7FE2E2C3703119FA92B8FE9D5BAC3CB982B83837CE239F16F7EF6BF880AC7923BA31FE485C5FD61077C35D8C6B7694B8BE9A1B2B0490C436A650D28D154BF4DF292E916BB99BB8585BF767E28EA796978A8BB3471404B0141404DA70ACB87E99DBE7C5C587E1FE525CDFD6F037E262DCEB9EE2FE7D2D77161727BC56BEC7C371E2625CBBCF8AEBAF3951104012DB98424997E3E7C525722D9F94A5BD22EF6869E975567197E22AE262ED1105012C050581365C585CBFCC8D82409ECBCA37C5F5EDDC620C307463B75809D9D2239BB152A5E7571397F66471FD58039B097A6F13D75F73A2208024B63185922ED76BC425732DB19CD3C5D9AAE7893B8E5A8E171767AF280860292808B421F656696122190570171F8689E7F55DBFD6F0187131EEE796E23EA796781DB58B13877BAAB83E9CDBA7C4C587363616FC67376703F6631B5328E972FD84B864AEE53312CFD9B9585BD35ADFC55D8AD845DBC5DA2B0A02580A0A02ED88BBF3AE6FE6C4A682E3B5F2D84788D7BE5D485C9CFB89A2D45BC47D5E0D713D9C4F5CAC38542BAF2E65FF80FDBD405C9FCDE99D6ECE06ECC736A650D295D052A53D2C6172153FE86F14177F2D8F17176BCF280860292808B4A38582C087C4C586DD5A9B4C8FFDEE6FA9A8111E292E4E1CAA85C966485D95B226C7C84D2BBBB69BB301FBB18D299474255C515A793773F8825C505CACADF86571B1D7127729D6F8FA190A02580A0A02EDF80F717D33A7B78A8B0DBBB5B4DC3EDE18702E71710ED1D2CD98AFC80F8A8B13A76BA520109B53BAF83013372703C6B28D295C928EF40C715F3AB53C4A5C9C2D884D813E2A2EEE5AE2FDC62ED6DE5110C05250106887EB97B9BD4A5C6CD85F6B1BF2DD4B5C9C435D4E5AD91831FC95B83871BA560A023717171F66E2E664C058B631854BD291E2D9F39676CB8F6AF50F888BB5B6DF1417732DB1EFC2F7898BB5771404B0141404DA1077745DBFCCED39E2E2C3FE5A7A655FEC0111050A17678A9884BBCFAF218A13F1F60617274ED34A41201E3971F161266E4E068C651B53B824CDF004715F3CB53C515C9C359D5FFEBFB8786B8902858B750D280860292808B4219645BB7E99DB9F898B0FDE79258ADFAE2F6BB8BDB83853C58D8F2F8BFB1B35FC9DB838719A560A02B1BAC4C58799B8391930966D4CE19234433C83DED20FD337A4B55DF36310E762ADE51459F33B845B2908205FEFEF54A620D0866B8BEB97B9ADB9903BC6C3C4F5630DFF28671217E718F1C89FFB3BB55C4B5C9C68A720D0FBEF65F3DC9C0C18CB36A670499AE9E1E2BE7C6A79BAB8386B385A5A7AAC22DC515CAC6B4141A01F1404E6B1F682C05DC5F5CBDC6E212E3E1CEE62128F11BA7EACE146E2E21C2B5EB51C1B14BABF55C349E2E2443B05818B8B8B0F33717332602CDB98C22569A67816BD8557326DC4DB0F5A591AF53C7131D6F23E39B3B858D78282403F2808CC63ED0581569ED966C9EF704F11D78735BC565C8CB95ADA1F21FC82B838D7AE958240CD7DA3E2B7DAC584439DECE66D80631B5328E1A6F00071C95D4B7C01BB38E7D4CA32D36DF1AE5317EB9A5010E807058179ACB92010EFB08FC7AC5CBFCC291E873B8BB81871A8CBCBB7C4F5630D3F212ECE5CADBD41E1DD52F2B1885E5010A020301405010C661B5328E1A610CFA47F525C82D7720D71B1CE2106916F1617572D6F1417EBDA5010E807058179ACB920705D717D32B777888B0F877B89B83EACE145E2622CE596E2FE6E2DB71317E79A5110A020301405010C661B5328E1A6727771095ECB2BC5C539875B898BA9A618D8BA58D78682403F2808CC63CD05819789EB93B9FDB9B8F870A8EB89EBBF1AE2F1C558ADE0E22C256E3EBC45DCDFAFA1D4AB157B42418082C050140430986D4CA1849B4A2C676C69F95AA831903D9BFC8BB8786AF97B71B1AE1105817E501098C75A0B02B715D71F35FC8AB81871BA981CBF4D5CFFD5F03471719616EF97777FBF967B898B73AD28085010188A820006B38D29947053BA8DB824AFE54DE2E29CD2FDC4C5524BDCA5B8B2B858D78882403F2808CC638D05819B4B2B6F8889FD03E29DFA2E4E9CEED6E2FAAF86C89DA3C4C53985178B8BA386CFC8B9C5C5B946140428080C45410083D9C6144AB829C58632B1B18C4BF45A6E2C2ED6295C405A7AE34278A6B858D78A82403F2808CC634D0581C8A9FF2DAE1F6A7985B85871BA58A6FE5171FD57435CBB2ECEA9C41B28BE292E961A1E222ECE35A220404160280A0218CC36A650C24D2DDEB7EB12BD9677C95C3BDF3E465C0CB5C45D8AA3C5C5BA561404FA4141601E3D1604E23DEE51C0BDACC4EBD21E28274AACA8727D50533CBAE08E01A7BBB7B8BEABE10B724171714EA995D763862FCA45C4C5B936140428080C45410083D9C6144AB839BC4E5CB2D7129BFCB9384BBAB4B4B2C474E371E2625D330A02FDA02080DEC5F2EBD897C6E5074E13139DCF8AEBBF1A7E5F5C9C53BBA87C495C4C3530FE380D05010A02435110C060B63185126E0ED71197ECB5C4668747888BB594E78BFBDBB54485FEFBC5C5BA661404FA414100BDFB1D71B981D3FDB1B8BEABE1DFE55CE2E29CC31F8A8BAB86B84172297171AE0905010A02435110C060B63185126E2E27884BF85AEE2C2ECE12AE2DEE6FD614030317EBDA5110E8070501F4EC13724E71B981D35C5CBE22AEFF6AF80D7171CE2536F38BA2848BAD86E3C5C5B926140428080C45410083D9C6144AB8B9C4CEF62D3D8F798A9C5D5CAC39E255476F16F7376B8965A6EC4AED5110E8070501F4ECA6E2F202A77BAAB8BEAB215E37DCC23BF87F5D5C7CB55C455C9C6B41418082C050140430986D4CA1849BD3B3C4257D2DB1F1908B3347EC4FE0FE564DF715172B2808F48482007AF564713981D35D515ABAE9D0CAE68F67910F898BB186B5BF258382000581A128086030DB98420937A7787EACA557E1947EBE2F561CC45D01F7B76A996A25442F2808F48382007AF46A69E14E73EB5E2AAEFF6A88D72DCFF536A3216E212ECE5AAE272ECE35A020404160280A0218CC36A650C2CDED89E212BF9607898B738CDF12F7376ABAA3B858711A0A02FDA02080DEBC4A6A6E4AB714D717D77FB5C4AB2B5D9CB5C4A38C6F12176B0D6F9588C9C5DA3B0A02140486A22080C16C630A25DCDCE255382D6DFAF379399FB85853C47B86E3B3DCDFA8E57D726671F1E2341404FA4141003D798AB032E0607127FE1DE2FAB086D7888BB3B6D6DEF6744B7171F68E82000581A128086030DB98420957434BAF050A8F1017678A3F17F7D935B109D5C12808F48382007A109BC0DE465C0EE070F1ACBEEBC75A7E5C5C9C2D7891B8986BF8A04CFDFAE7165110A020301405010C661B5328E16A883BF22DDD4DFF92C4CA0517EB1097916F88FBEC5ADE282E561C8A82403F280860C9BE2A51583EBFB8F38FC39D4D4E16D79F35BC505C9CADB8ACB4B48FD35DC5C5D9B3560A02171317DF1C28080C43410083D9C6144AB85A7E47DC05504B0CC45C9C43FC1F719F59D3B1E262C5A12808F483820096E893F270C9294AAFD56F8AEBD31AE20D07971317674BFE525CFC3544EE1F292ECE5EB55210A8F97B494160180A0218CC36A650C2D5724E891F037711D4F075F92171B1EED2DA7379E10471B1E2701404FA4141004BF1517982FCACB0CFCB38B1E4F973E2FA17CBF14071E7B757AD1404AE242EBE3950101886820006B38D29947035DD43DC4550CB53C5C5B99FD8253776CB759F554BDCA5A8F945BF34AD1404621F8B18E062BC965EF335050A02FD880D5F1F2B3F2D1404C67994B8BEC5B2C4E3A31710778E7BD44A41E086E2E29B0305816128086030DB9842095753ECA01C774ADC8550433C5B17CFD8B9589D5F15F739353D435CACF05A29083C585C7CC00605813EFDBBFC891C2DEEBCE3704749ECB9E0FA13CBF36871E7B947AD1404EE242EBE3950101886820006B38D299470B5DD4EDC8550CB73C5C5B9D7D9A5A5CD8C423CF6704971F1C2A32080A5A020D0B758DDF574A13070B0E827D78758A67815F598473697A89582C023C5C5378758CDE756F9B5E26DE2FA6C6E140430986D4CA184AB2DBE18DE23EE62A8E52AE262DDF65BE2FE6D4D391B23AE1505012C05058175F89A3C4462059DCB83B5BBB244F1C4F51D96EBAFC59DEFDEB452107899B8F8D0CEEB3929086030DB984209D7829B88BB186A79A9B838372E282DBD36317C512E222E5EEC8F8200968282C0BABC5D2E212E17D6EC95E2FA0BCBF62D59C25B1A72B55210F8ACF4BEEFCE584F12D76773A32080C16C630A255C2BDE20EE82A825DE1EE0E20C7127DEFD9B9AE28E928B15BB5110C0525010589F4FCBD5C4E5C31AFD8CB87E421FE2CEAC3BEF3D69A52010F86EF1E2710AD75F73A32080C16C630A255C2BAE2BEE82A8E535E2E2FC1189CD07DDBFA9E533721E71F162370A02580A0A02EB74AAC4327997136B127733DF2DAE8FD08F9F1077FE7BD15241E061E2625CBBC78BEBAFB95110C060B6318512AE25B154DF5D14B5B8D7B2BC50DC7F5BD37D646F9C18868200968282C07A7D4ABE5F5C5EACC5EDC5F50DFAF23A71E7BF17CF1477DC357C428E1017E79AC5FE0AAEBFE646410083D9C6144AB896C4667EEEA2A8E51D7246D9C4D7DA2A86708A9C4DB6FB11C35110C052501058B778767EFBF7684DCE21F15BE7FA05FDB9B1B83CE8C113C51D732DB71517E75A9D5962D5ADEBABB95110C060B6318512AE35CF167761D4720B89B86220D6CAAB48B6C584766F1F62380A02580A0A0288D7F4BADCE8DDFDC5F507FAF45EE975C3BB3F1177CCB57C4CA2E0E6625DA39F15D74F355010C060B6318512AE359796969ED17F9F44C530AAA8EE7FAFE99F845D62F35010C052501040DC255FDBEB08CF2FADBDD507D3BB83B87C58BA165F591DBBEABB58D7E824717D540305010C661B5328E15AF4647117472D7797A8A2BAFFADA65F14D77F188E820096828200C29DC4E547AF1E2DAE1FD0B7287E9D5D5C4E2C59ACF271C75BDB3DC4C5BB267711D737B55010C060B6318512AE451793AF88BB406AF88669AB2D5ED3E8FA0E6928086029280820ECF7069C1E5D42BE2EAE1FD0BFFB8ACB8B25BBBEB8636DC10365ADAB4E6F2AAD7DD75010C060B6318512AE55AD3D67D59A63C5F51BD25010C0525010C0C645C5E5486F5ADA911DF38BCDDDBE4F5C6E2CD525C51D6B2B5E2BB1C1B78BBD47B17FC243E53FC5F5474D140430986D4CA1846BD50584E706BD13C4F519D25110C0525010C046BC82CFE5484F8E1177EC589798ACB9FC58AA78CD5F4BFB64EDE7C5126F7BE875CF922834DD4B4E1677FC2DA02080C16C630A255CCB1E24EE2259B3A8625E495C7F211D05012C452B05811B490CA67A10EFF6FF61B982C46B6563F3D88748145D3F27EEF85BF0787139D293578B3B76ACCB97A4B71531F1160577AC2D8AEFC167C9DDE4B2129B6CBB636A5DAC04F871B99FBC42BE26EE785B42410083D9C6144AB8969D4B3E25EE4259AB6788EB2B8C4341004BD14A41E027C5C5D79B18F8C6F3BE2F14D70F35C5B25E17732F7E4EDC71639DFE425C9E2CD5F1E28E7309BE2AEF9238863F967B4ABC9EFBA7E4BFC9D11285D64DD1F5BCE2FA60AC9817C4E75E50A2981B2E2F5796EB48EC05709CC47E084F9497CA47A5C547020EF25E376F031CDB984209D7BADF1077A1AC516C7812CF9FB97EC238AD1404309D38C7EEDC2F0D05817A6255C4A9E2FAA3868F8B8BB307B1A9D97BC41D37D62996D8C72BA95DBE2CD17DC41D27B0EDCD6EDE0638B6318512AE75F1FC52CBCFF8CCE9B1E2FA08E35110E81F0581B2D65810087107EC5BE2FA646EF1E61B17630FE2B58AEE98B16ECF11972F4B747571C7086C7BB59BB7018E6D4CA1845B823B88BB58D6E48B726171FD83F12808F48F8240596B2D08847876DFF5490D3D6EF615CFF9FEABB8E305AE2A2E6F9626361664D36C1CE4F96EDE0638B63185126E096209E13F89BB60D6E20FC4F50DF25010E81F0581B2D65C108847B65A7916359EA375312ED96F8B3B5620BC4A5CDE2C51AC7870C7086C3CC6CDDB00C736A650C22D456C14E22E98358877F19E5B5CBF200F0581FE5110286BCD0581F01671FD32B7DE0A02B14918774D71901B88CB9FA5B98DB8E30336EEE9E66D80631B5328E196E44DE22E9ADEDD5B5C7F201F0581FE5110286BED0581478BEB97B9F556106825BFD1B677C819C5E5D092C46EF9F128A83B46201CEBE66D80631B5328E1962406A2EEA2E9D9C7A4C767455B4141A07F1404CA5A7B41205E69E5FA656E3D1504E25565F1161D779CC05EB71297474BF3D7E28E0F88EFC323DDBC0D706C630A25DCD2BC5CDCC5D3ABD850D1F503CAA020D03F0A0265ADBD20704371FD32B79E0A02CF16778C80F361398BB85C5A927877BE3B3EE0B56ECE06ECC736A650D22DCD31E22E9E1EBD57624345D70F28838240FF280894B5F682C075C4F5CBDC7A29085C4DDCF1D514FBF65C5CA28FD7EE72F25571FD54D33DC4E5D3D2BC4CDCF161DDEEEFE66CC07E6C630A25DD123D57DC05D49B9B883B7E944341A07F1404CA5A7B41A095BB7A315973F12DCD89E28EAFA6BB888B75AD1E2AAE9F6AFAA4C473F82EDE25B9A6B8E3C37AC59B6C8E727336603FB63185926E897E44BE29EE42EAC5EBC51D3BCAA220D03F0A02655110F0FD32B71E0A023712776C35BD5D589977A823E5E3E2FAABA6DF1517EFD23C53DCF1619D5EE2E66BC02EB63185126FA9FE4ADC85D48B5896EA8E1B655110E81F0581B22808F87E99DBD20B0247483C16E78EADA66B898B77ED7E455C7FD5F41F12AFAB74F12EC94585576E62E33A6EBE06EC621B5328F1962A9EEFFB8AB88B69E95E22EE98511E0581FE5110288B8280EF97B92DBD20706771C755D3D3C4C58AD39C24AEDF6AFA3371B12ECDADC51D1FD6E5043757030E621B5328F996AC95F7419714CF0E5D51DCF1A23C0A02FDA32050160501DF2F735B72412096A07F42DC71D512779B2F222E5E9C26C626AD3DAE19AF673B4A5CBC4BF35471C78875F8B25CDACDD58083D8C6144ABE258BA562A78ABBB096EAE9E28E15D3A020D03F0A02655110F0FD32B72517041E24EE986ABAAFB85871A8C789EBBF9AFE465CAC4B737679ABB86344FFEEE9E669C010B631851270E97E4FDC85B54451E9BE84B8E3C4342808F48F82405914047CBFCC6DA905810B49DC8D77C754CBFBA487F7DACFE1FC12AF6574FD584B4F2B2BE3FAF890B8E344BF8E7773346028DB984249B874F1DA994F8BBBC096E6B1E28E11D3A120D03F0A02655110F0FD32B7A51604FE5CDCF1D4740371B1C2BB9BB87EACA9A7BD977E503E2CEE38D19F57CB59DD1C0D18CA36A65012F6E0DEE22EB225F9A25C58DCF1613A1404FA4741A02C0A02BE5FE6B6C482C0A52556C2B9E3A9E5F9E262C5FECE2CEF14D79F351D2B2EDE258AA240AC5C71C7897E9C2047BAF91990C236A65022F6E0AC728AB88B6D29FE40DCB1615A1404FA4741A02C0A02BE5FE6B6C482C0F3C41D4B2DF1A6A25E36A49BDBB5C5F5694D6F1017EB529D575E2EEE58B17CF19B7E849B9B01A96C630A25632F963CB18BE7F1CE2DEEB8302D0A02FDA32050160501DF2F735B5A41E09AE28EA3A6DF17172B86395E5CBFD6745371B12E55ACC6881B46DF1277BC589E7F939BB8391930966D4CA1A4EC457C692E7579553CF2E08E09D3A320D03F0A02655110F0FD32B7A515045E2BEE386AF9173987B85831CCC5241E7774FD5B4B8C038F1017EF924541ED9FC41D3396211E978A3D54CE27764E068C651B53445276E466E22EC2969D2CF1C8833B1E4C8F8240FF2808944541C0F7CBDC965410B889B863A829C60B2E56A47980B8FEADE93871B12E5D8C15EF239F1377DC68533C9AF424B9A47CEF7CBA391930966D4CB19D9C1D38A3BC59DC05D9AADB8B3B16CC838240FF2808944541C0F7CBDC96521088BBB5EF17770CB5C473D92E56A43B9BB4B623FEC7A5E7D51FB1B740146262E9B93B7EB4E11F250A381790C3CEA39B930163D9C6142E4917EE7AE22ECC16BD47CE24EE38300F0A02FDA32050160501DF2F735B4A41E0AEE2E2AF2596EDFEA8B85831CE8DC4F5754DF717176B4F62C5C0AFCA2B843D06EAFBAAC42B047F5B0EFC8E717332602CDB98C22569075E25EE626DCD8DC5C58FF95010E81F0581B22808F87E99DB120A02E7924F8A8BBF963F11172BF2FCBDB8FEAE2596D52F6D9F8D1C17955F9317C9A9E2FA04657D5A62B5D1C3E5FA92B42AC5CDC980B16C630A97A41DB89AB88BB725AF13173BE64541A07F1404CAA220E0FB656E4B98ECFC9EB8D86B89E2C479C4C58A3C9791587DE1FABD9647888BB577B1C9F631721779A2BC4678BC609C5879117B7DFD83FC95C4A31A71332F36D4747D3F989B930163D9C6142E493B11CF58C580A95567171737E6154BEEDCF9413F7AD9B433EE3EB8E39B5B8F3B78A788C1B6EB97B9C59E392EBE96C40A01177B2D478A8B1365C4EB935DBFD7C2EB9C0F15F91F859B63E556725F79A43C459E2D27C849F22EF9884411E1F35B96FA5842AC98D81CC329127B9ABC4D4E9417C833E5F1F22089479C62C3D16BC9D132D9F8C1CDC980B16C230000000000E89B6D0400000000007DB38D0000000000A06FB6110000000000F4CD36020000000080BED9460000000000D037DB080000000000FA661B010000000040DF6C230000000000E89B6D0400000000007DB38D0000000000A06FB6110000000000F4CD36020000000080BED9460000000000D037DB080000000000FA661B010000000040DF6C230000000000E89B6D0400000000007DB38D0000000000A06FB6110000000000F4CD36020000000080BED9460000000000D037DB080000000000FA661B010000000040DF6C230000000000E89B6D0400000000007DB38D0000000000A06FB6110000000000F4CD36020000000080BED9460000805DCE70F507633ED797FFF95DCF916F2778926CFEED31E23E1F00B010EE3739876D040000D8C50D5226703EF988B889EE183129767FA73571DC11EB2BC51D47AE282A2CA52FB6F59C0F6F131763699B73BF117DEAE269C55CFD52D225C51D4B8ACF89FBEC524A9EF7BB88FB1B25C5DF707F7B972886BACF4A11E7618A6B24AE3DF7F7867A92FB5D1ECB36020000ECA201C91C4A0CE8B6C564C8FD9D56DC52A62A02EC27FA78292B077ACD879870B8F8E61479D75A81A0857E4955620219D7A3FBEC92E2BBC6FDED5451FC98BA7811C6C49B3BE9DE88CF719F3F566E0125FAFB96EE77792CDB080000B08B0624538B01A01B0CE5888194FB5BB5C5B196BCF33D464C8E4BDCD99C4ACFF930C5B1E5885C88C7545CAC736AAD5F862851642A3591DDA5D424378ED77D7E69638B2CA50AACA5BE1B73733ABEB38E71BFC9396C230000C02E1A944C29067F534D905BBA1B1E83CCB957041C64CCD2DCA9F59E0F8F10175B6D919B358B44734C8C4B2B31D19E6392BD94C24588C746DCDF1F22F2D77D66AA589DE43E3F4514D9DC67A7F84EA1CEFD26E7B08D000000BBC4A06442A597866F2B75672C57CB773F4B4C164AEA3D1F5A7F4EBE569168AEBBCF25952830CDB1043F77754C4CB4E7883344C1CCC53054A9C245CEB98D7F9BDB5FDF5BB5E37E9373D8460000805D360393094C3D516E61B2DBEA1DE16DAD14057ACF87A53C275FA39FE69A7096923BC90EA5EE680F91B3FA63CE954DF11DE06218AAD40AA33866F7F90729513C39E4111EF79B9CC336020000ECB23D382928066E534F0272969F96B0A4BB9EB977E672AD211F5A5E29B2D7D809D1187147D5C5D0B212459339F361EC447BAE470536E27BC0C591A254BFA6EEAD11C580DC62C4617FD3FD26E7B08D000000BBEC1DA01432D764B9C400738CD6F60B18A2E633F6BDE74358C26A916D73AD14987BD259428902DA9CF93026DE391F1508250B7625BE4F6272EF3EDB89EF95E2C580E07E9373D8460000805DDC2025D312EE8CE598E239F89834ED7D063EFEFF927F6BCEBBC2DB7ACF878DDCFD0376156CE2B8221F4A1756E65839325731A8A4127934E77E12638A3B7317354B6CE6B751EA718C217B6A443120F75CEEBB1AC1FD26E7B08D000000BBB8414A86B9EF3ACD31A1D956FA6EE7DE2280137D5A6AF09EBA4C3657EFF9B011930617CF50D147EE73F753F2EEF3D439917BFE53FBA605B9F9902AB58F4A7F8F0D31E4BB2E45896388BBFE07AD2ACAFDEEDD597470BFC9396C230000C02E6E909261EEBB81733E375EF259E8883B26CBEEEFECA7C46A819277E986E8391FB6E5AE8218738737F2A7C45DE894A5D3A94A5C3363FAA6B63957C56C0CFD3E99BB48B731C5234BB9CBF8C3AE42C5A4C580E07E9373D8460000805DDC2065A418FCB841D1D40EBAC35342FC8D1283CF30E4AED47E72278073DE6DED391FF6CABD5B39F6EE69A9BC1CB2747A8C127771C7F64D4D2557700C35F43187B91F1508537DEFC4EA16F7F752446CEE3B23B7003BE89A72BFC9396C230000C02E6E903242CE5DA7DCBB55259EF73D48A9017E1C6BEACA806D2506C0736C2ED87B3EEC95BB1222E79C94B80B3FD5CA8A122B44E6C8D7D2C616EE72727FC8E332250A34634CB9CAA3448EED5D3995FB7D3FB8C0E67E9373D8460000805DDC206584B183B21838E70E52870C8473C4E4D6FDDD314ADCED5CC284B9E77C7072CF89FBCC14251E279962E29DDB2FF1EFDDE7B62CEE36BB63192227F7E3CEBF8B67636C916EEA65F9B9728A8FDB3685DADCEF9FA4D536EE3739876D040000D8C50D5212E50CA0621292FBBCED547737374A4CB6420CACDDE7A7CA5DF23BE5E03CF49E0F7BE5DEA12F116F6E0CA1745EE44C8C37A6BCB33C95B1F91B7990731E0F2A9EC4E7BB7FB74B7C67B55A6CDA963B890F916BB98F39255F43EE3739876D040000D8C50D5212E4DC9DD9DCC92D317170CF809650727540A9E7B45B2E08F49E0F4EEE64A4D48A86DCBBA4A527DFB9859D3065AE4E656C3E6CF2C0FD6F43ED37F11E1B537CDE9842C2B6830A15A59458C9906354AEBADFE41CB611000060173748493076721A83B7ED495BEEA073AA65F0B993BD8D9283E2A17D1E13BC887FAF295F33D77B3E38631F8FD828156B6E1CA556B06CC404D7FD9D1453DF599EC2D8F3B0C9839CDC77B934B6A859A24011E23B616F4C5328B1BFCA58F1BDEA623A90FB4DCE611B01000076718394816210E4064743EC1DB8E62E4B2D759775AFDC89E9C6E801E382AC211F9CDC3BF3A556339458DAED3E77AC52D7CE54A6BA26C7E6C3A6F891534871793FE63C6C8A431193FBDF53CC792D967ABC2B45561EB9DFE41CB61100006017374819206729BD5B9A9C33990C53DC852AB1747D23FACBFD8D5EAC211F9CDC09534CD6DCE78E91DB67C17DEE1825AF9DA9947A8467DBD87CD85E4114C531F7DF0CB137EFC7E6C4A6385122A7DCAA85A944DEE516E85244FFB8380673BFC9396C230000C02E6E9032C0D8BB7F31587393E3DC89D5F680BA949C81F9B69293BE56AD211F9CDC0953C9BBA725EE8E962A5C95BA76A6546A65C6B6B1F9B05D14CB29A66CE7FDD822DD764EE63E8612A6E8E75D4A143186C82E0604F79B9CC336020000ECE2062907C81970ED1A44B9FF3EC5E6AE5629394B77B7CDB964B686B5E483933B612A79F7B4A5C95BA96B672A53158CC69E83BDD741CE06799BBCCF79546023FAC9FD7743D52A868E2D500E55EC3BDDFD26E7B08D000000BBB841CA0E394BC30F1A1CE60EE2764D2EC72831C10A732E999DDB9AF2C1C99D3095BC7B5A6212E43E778C12B14C29AE6D1777AEB1F9B0B77895F3DD138F428C2DD26DC711FFB7FB6F52D42A8696887D3FB112C7FDCD51DC6F720EDB080000B08B1BA4EC9033D03F6877FBDCBB8AA507F9A52635732F999DD39AF261AFDC4947F49DFBDC317296996F94BA6B5E2296A94D512C1A9B0FAEDFC74EE8C3D862C2DE3EC98961A36631748A0D068B160382FB4DCE611B010000767183947DE40C10870CA4E2CE96FBB743959AD06CE42CDBDD28FD2AB796AC2D1FF6CA7D4EBEE4DDD312CFEC972A509488656ADB77C24B197B3DB8C2D59477B81D77EE7356296CD42C86C6DF1EBB62C3295E0C08EE3739876D040000D8C50D528C9C016A0CCA860C0C4B0C824B0EF44B1404E6DAED7E6E6BCC87BD725730ECBD239BA3C4E4AD548122B75FA63655A168EC71EF97072527B30771D749EE0AA9A9FA39456E51716392624070BFC9396C230000C02E6E9062E40C0E535EEF953B082E39C92A5110986C2059D91AF361AFDC0953A96245CE3E0EDB4A2DEF2E519C98D25445BAB1F9B05F1EE4E6D750EE1A29F1D8875BF95043EE77C8A4C7E17E9373D8460000805DDC20658FD6EFF86D2B3978A320E0AD351FB6E54E984ADE3D8D1C737F23D590551B43E44EC06222EC3EB76539F9B05FBFCF719DEDD7D7251EFB98B2183754895546A50A6596FB4DCE611B010000767183942D250654732A39D12A7187AEE484D49D8B883106DE1B930E5E65CDF9B02D77C2542A2F4AAD0E28154F89FC8889B0FBEC968DCD875DC58F1293F283C4F9727FBB443162BFCF9E537C27BAD852942A9459EE3739876D040000D8C50D52B694B84B3EB75203D19824B9CF4F51F26EE79878E2FC6D8A05EE3353AD391FB6E54E984A9D8F1245AB70D01B1F862A31019BBAA83585B1F9B0ABF891BB0AE520BB723037AFA62AC4A5CAFD0E8FEF3BF7B9C5B8DFE41CB611000060173748F9AE1277896A2835D92A31B90925EE30C584CD7D760AF7B929D69E0FDB72274C258A14A5F2B3E433F5258A6893DE919DC8D87C38A8F83155016E57A1B24421A2D48A935CB98FAF4C7E1CEE3739876D040000D8C50D52A4C404B4965283B898B4B9CF4F953B218D017AEEC4203706F2E174B913A612774F4B150342A9D501217702B66BA2DAAA9C7C38A8F851A2C0E2C4A326EEEF85128F2A4C51844B55E2FB7BF2E370BFC9396C230000C02E66905262025A53C94945897E8849D2AE01F82E712E72EF46E72E7B251F0E953B61CA2950441EC51D7DF7B96394DCF4B2C4046CD712FA568DCD87217959B2F0B371D024B7C4DF2C59641AABC4714CF1B8D121DC6F720EDB080000B08B19A42C7569F8B683EEBC0D556A401E83FFD49862F2975B0C08B9CF64930F87CAED8F8326644E4CB04ABD4D60238A3C25FBA5C4B5929BAB358CCD8721C58F52AB94368614214AAC4A28995763E55E2FB3EC83E07E9373D8460000805DF60C5096BC347C5BA989450C6C4BDD1D8F01E6D077F0972A44E4DE01261F0E975BA41972D731CE7F98B21853FAEE678989E4D89534358D3DEEA13999FB18C6C6D0954AB97F6F48D1610EB9D769CE4A9EC1DC6F720EDB080000B0CBD6E02477F25B6A73B288C37D7E8A2177DF868A49BCFB1B63C5803B267BDB138238E6682B791738F70E30F970B812B1B4608A3BF1A526AE738A6BCE1D4B8AB1C73DF4DA2CF588C89063EDE5B18F12D76989DC3890FB4DCE611B01000076D91A9CE44E464BDEDD6BED2E5589BB9F738AFECB3D1FE4C3E14A2FE1AE618A62C052FB65E88A9DFD8C3DEEC867F7794E895522438B73310976FF3EC514F9952A6270B1A528BD82C672BFC9396C230000C02EDF1D98E40EA04ADF4D69ED39D6F8ACDC25A87389C946EE60967CF04A4C986A89BC986AB3B7D2AB68E6929B1363F32165397AEEB598521C6CED7B77ACDC224A4AC1268BFB4DCE611B01000076D1A0240670394BC3E3DF1E36D0C9D4E29DAA1854E7F4D31C4A1403C887FD2D6DA5C84614B34AAED8D8ABC45DECB995583532361F520A66713DBACF182AE56FC5F787FB8CA14AAFCC1A2BB7789B52B0C9E27E9373D8460000805D3428C99DE44C71D7B1C46676533CCB1A93AA56570A949AF4910FFBCB9D30D59032211CABD56B62979AF9905AB41BDBBF29FB788C7DFC61DB14DFB9A9720B28618E6BE63BDC6F720EDB080000B01F0D487297A3E6EE62BF9F1283BA1844BBCF2EA1B53BC5A506B0E4C3FE4A4C98E614E722FACD1D4B4925CE4D0DB92B46C6E6C398E5E863BE6FE2EFA4140873AFFD30DB447A8712C791BBCA6A30F7BB9CC336020000381A8CC4403EE78E67FCDB29271C25EE3A4E195F0C3C6B3F421077004B0D5EC987DD62B2E33EB33511E794E761AF1213B01A72FB686C3E8C598E3EE66FA56E9858E2B18FD926D23BE41E477C8FB9CF9D84FB6DCE611B0100001C0D46725F6795BB43F7417277B90FB977018788C1FADC8581E89BD24BF3C987DD5A5B15B22D264153F7FF7E4A9C97B99598F48DCD87F8BE709FB74BEA6A84314587DCEFB05927D23BE4160EC7F4DD68EEB739876D0400007034187183A1A1529E4D1D6BEC1DB86D734E9262825E22E6FDC44075CC646228F737875A433EE4164C72C5842BFA609B8B736EB5FB658C1293BEB1C73DF62E7A9C7FF7797BC57F37662F11F75929669D48EF905BD898F5BA72BFCD396C230000C02E6E908222B6276E4307F31B71C777F36F5B58860B0028CCFD26E7B08D0000000000A06FB6110000000000F4CD36020000000080BED9460000000000D037DB080000000000FA661B010000000040DF6C230000000000E89B6D0400000000007DB38D0000000000A06FB6110000000000F4CD36020000000080BED9460000000000D037DB080000000000FA661B010000000040DF6C230000000000E89B6D0400000000007DB38D0000000000A06FB6110000000000F4CD36020000000080BED9460000000000D037DB080000000000FA661B010000000040DF6C230000000000E8D9B7CFF05FDB1885FFF0F4EF9C0000000049454E44AE426082 - + diff --git a/UID/usrctlProcedures.Designer.vb b/UID/usrctlProcedures.Designer.vb index d0efbcb..5ad4432 100644 --- a/UID/usrctlProcedures.Designer.vb +++ b/UID/usrctlProcedures.Designer.vb @@ -100,6 +100,9 @@ Partial Class usrctlProcedures Me.Label11 = New System.Windows.Forms.Label() Me.Label12 = New System.Windows.Forms.Label() Me.Label13 = New System.Windows.Forms.Label() + Me.Label14 = New System.Windows.Forms.Label() + Me.CheckBox4 = New System.Windows.Forms.CheckBox() + Me.Button27 = New System.Windows.Forms.Button() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -525,7 +528,7 @@ Partial Class usrctlProcedures ' 'Button19 ' - Me.Button19.Location = New System.Drawing.Point(322, 88) + Me.Button19.Location = New System.Drawing.Point(219, 91) Me.Button19.Name = "Button19" Me.Button19.Size = New System.Drawing.Size(145, 49) Me.Button19.TabIndex = 20 @@ -534,7 +537,7 @@ Partial Class usrctlProcedures ' 'Label5 ' - Me.Label5.Location = New System.Drawing.Point(319, 140) + Me.Label5.Location = New System.Drawing.Point(216, 143) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(145, 13) Me.Label5.TabIndex = 21 @@ -546,7 +549,7 @@ Partial Class usrctlProcedures Me.cbxTESTSYSTEMATLAS.AutoSize = True Me.cbxTESTSYSTEMATLAS.Checked = True Me.cbxTESTSYSTEMATLAS.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxTESTSYSTEMATLAS.Location = New System.Drawing.Point(322, 62) + Me.cbxTESTSYSTEMATLAS.Location = New System.Drawing.Point(219, 65) Me.cbxTESTSYSTEMATLAS.Name = "cbxTESTSYSTEMATLAS" Me.cbxTESTSYSTEMATLAS.Size = New System.Drawing.Size(98, 17) Me.cbxTESTSYSTEMATLAS.TabIndex = 22 @@ -580,7 +583,7 @@ Partial Class usrctlProcedures Me.CheckBox2.AutoSize = True Me.CheckBox2.Checked = True Me.CheckBox2.CheckState = System.Windows.Forms.CheckState.Checked - Me.CheckBox2.Location = New System.Drawing.Point(570, 39) + Me.CheckBox2.Location = New System.Drawing.Point(389, 39) Me.CheckBox2.Name = "CheckBox2" Me.CheckBox2.Size = New System.Drawing.Size(98, 17) Me.CheckBox2.TabIndex = 26 @@ -589,7 +592,7 @@ Partial Class usrctlProcedures ' 'Label6 ' - Me.Label6.Location = New System.Drawing.Point(567, 140) + Me.Label6.Location = New System.Drawing.Point(386, 140) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(145, 13) Me.Label6.TabIndex = 25 @@ -598,7 +601,7 @@ Partial Class usrctlProcedures ' 'Button20 ' - Me.Button20.Location = New System.Drawing.Point(570, 88) + Me.Button20.Location = New System.Drawing.Point(389, 88) Me.Button20.Name = "Button20" Me.Button20.Size = New System.Drawing.Size(145, 49) Me.Button20.TabIndex = 24 @@ -608,7 +611,7 @@ Partial Class usrctlProcedures 'Label7 ' Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(573, 68) + Me.Label7.Location = New System.Drawing.Point(392, 68) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(39, 13) Me.Label7.TabIndex = 28 @@ -616,7 +619,7 @@ Partial Class usrctlProcedures ' 'TextBox3 ' - Me.TextBox3.Location = New System.Drawing.Point(621, 65) + Me.TextBox3.Location = New System.Drawing.Point(440, 65) Me.TextBox3.Name = "TextBox3" Me.TextBox3.Size = New System.Drawing.Size(91, 20) Me.TextBox3.TabIndex = 27 @@ -674,7 +677,7 @@ Partial Class usrctlProcedures ' 'Button21 ' - Me.Button21.Location = New System.Drawing.Point(322, 170) + Me.Button21.Location = New System.Drawing.Point(219, 173) Me.Button21.Name = "Button21" Me.Button21.Size = New System.Drawing.Size(145, 49) Me.Button21.TabIndex = 35 @@ -684,7 +687,7 @@ Partial Class usrctlProcedures 'Label9 ' Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(328, 156) + Me.Label9.Location = New System.Drawing.Point(225, 159) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(42, 13) Me.Label9.TabIndex = 37 @@ -692,7 +695,7 @@ Partial Class usrctlProcedures ' 'TextBox8 ' - Me.TextBox8.Location = New System.Drawing.Point(376, 153) + Me.TextBox8.Location = New System.Drawing.Point(273, 156) Me.TextBox8.Name = "TextBox8" Me.TextBox8.Size = New System.Drawing.Size(91, 20) Me.TextBox8.TabIndex = 36 @@ -718,7 +721,7 @@ Partial Class usrctlProcedures ' 'Button22 ' - Me.Button22.Location = New System.Drawing.Point(467, 170) + Me.Button22.Location = New System.Drawing.Point(364, 173) Me.Button22.Name = "Button22" Me.Button22.Size = New System.Drawing.Size(154, 49) Me.Button22.TabIndex = 40 @@ -727,7 +730,7 @@ Partial Class usrctlProcedures ' 'Button23 ' - Me.Button23.Location = New System.Drawing.Point(771, 199) + Me.Button23.Location = New System.Drawing.Point(606, 161) Me.Button23.Name = "Button23" Me.Button23.Size = New System.Drawing.Size(75, 23) Me.Button23.TabIndex = 41 @@ -735,7 +738,7 @@ Partial Class usrctlProcedures ' 'Button24 ' - Me.Button24.Location = New System.Drawing.Point(748, 88) + Me.Button24.Location = New System.Drawing.Point(583, 50) Me.Button24.Name = "Button24" Me.Button24.Size = New System.Drawing.Size(145, 49) Me.Button24.TabIndex = 42 @@ -747,7 +750,7 @@ Partial Class usrctlProcedures Me.CheckBox3.AutoSize = True Me.CheckBox3.Checked = True Me.CheckBox3.CheckState = System.Windows.Forms.CheckState.Checked - Me.CheckBox3.Location = New System.Drawing.Point(748, 62) + Me.CheckBox3.Location = New System.Drawing.Point(583, 24) Me.CheckBox3.Name = "CheckBox3" Me.CheckBox3.Size = New System.Drawing.Size(98, 17) Me.CheckBox3.TabIndex = 43 @@ -756,7 +759,7 @@ Partial Class usrctlProcedures ' 'Button25 ' - Me.Button25.Location = New System.Drawing.Point(748, 140) + Me.Button25.Location = New System.Drawing.Point(583, 102) Me.Button25.Name = "Button25" Me.Button25.Size = New System.Drawing.Size(145, 49) Me.Button25.TabIndex = 44 @@ -765,7 +768,7 @@ Partial Class usrctlProcedures ' 'Label10 ' - Me.Label10.Location = New System.Drawing.Point(744, 192) + Me.Label10.Location = New System.Drawing.Point(579, 154) Me.Label10.Name = "Label10" Me.Label10.Size = New System.Drawing.Size(145, 13) Me.Label10.TabIndex = 45 @@ -826,10 +829,43 @@ Partial Class usrctlProcedures Me.Label13.TabIndex = 28 Me.Label13.Text = "Änderung bei vorh. Kd.:" ' + 'Label14 + ' + Me.Label14.Location = New System.Drawing.Point(752, 102) + Me.Label14.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(145, 13) + Me.Label14.TabIndex = 53 + Me.Label14.Text = "0/0" + Me.Label14.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'CheckBox4 + ' + Me.CheckBox4.AutoSize = True + Me.CheckBox4.Checked = True + Me.CheckBox4.CheckState = System.Windows.Forms.CheckState.Checked + Me.CheckBox4.Location = New System.Drawing.Point(756, 24) + Me.CheckBox4.Name = "CheckBox4" + Me.CheckBox4.Size = New System.Drawing.Size(98, 17) + Me.CheckBox4.TabIndex = 51 + Me.CheckBox4.Text = "TESTSYSTEM" + Me.CheckBox4.UseVisualStyleBackColor = True + ' + 'Button27 + ' + Me.Button27.Location = New System.Drawing.Point(756, 50) + Me.Button27.Name = "Button27" + Me.Button27.Size = New System.Drawing.Size(145, 49) + Me.Button27.TabIndex = 50 + Me.Button27.Text = "UNISPED MDB Importieren" + Me.Button27.UseVisualStyleBackColor = True + ' 'usrctlProcedures ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.Label14) + Me.Controls.Add(Me.CheckBox4) + Me.Controls.Add(Me.Button27) Me.Controls.Add(Me.TextBox12) Me.Controls.Add(Me.TextBox11) Me.Controls.Add(Me.TextBox10) @@ -961,4 +997,7 @@ Partial Class usrctlProcedures Friend WithEvents Label11 As Label Friend WithEvents Label12 As Label Friend WithEvents Label13 As Label + Friend WithEvents Label14 As Label + Friend WithEvents CheckBox4 As CheckBox + Friend WithEvents Button27 As Button End Class diff --git a/UID/usrctlProcedures.vb b/UID/usrctlProcedures.vb index 839a7d4..d45b66e 100644 --- a/UID/usrctlProcedures.vb +++ b/UID/usrctlProcedures.vb @@ -14,6 +14,7 @@ Imports System.Net Imports System.Text Imports System.Xml.Serialization Imports System.Xml +Imports System.Data.OleDb 'Imports Microsoft.Office.Interop @@ -345,7 +346,7 @@ Public Class usrctlProcedures Dim font As XFont = New XFont("Verdana", 20, XFontStyle.Bold) ' Draw the text - gfx.DrawString("Hello, World!", font, XBrushes.Black, _ + gfx.DrawString("Hello, World!", font, XBrushes.Black, New XRect(0, 0, page.Width.Point, page.Height.Point), XStringFormats.Center) ' Save the document... @@ -699,8 +700,8 @@ Public Class usrctlProcedures WordDoc = WordApp.Documents.Open("C:\Users\DEVELOPER1\Desktop\test\Erstattungsschreiben DE.doc") WordDoc.MailMerge.MainDocumentType = Word.WdMailMergeMainDocType.wdFormLetters - WordDoc.MailMerge.OpenDataSource(Name:="", _ - Connection:="DSN=dbConn_DEVELOPER;DATABASE=VERAG;uid=sa;pwd=BmWr501956;", _ + WordDoc.MailMerge.OpenDataSource(Name:="", + Connection:="DSN=dbConn_DEVELOPER;DATABASE=VERAG;uid=sa;pwd=BmWr501956;", SQLStatement:="SELECT * FROM vwUstRueckerstattung ", SubType:=Microsoft.Office.Interop.Word.WdMergeSubType.wdMergeSubTypeWord2000) 'Provider=SQLOLEDB;Server=DEVELOPER\DEVSQL;Database=VERAG;uid=sa;Password=BmWr501956; @@ -939,7 +940,7 @@ Public Class usrctlProcedures ' Copy the part of the original bitmap that we want ' into the bitmap. Dim gr As Graphics = Graphics.FromImage(bm2) - gr.DrawImage(bm, 0, 0, New Rectangle(dx, dy, wid, hgt), _ + gr.DrawImage(bm, 0, 0, New Rectangle(dx, dy, wid, hgt), GraphicsUnit.Pixel) Return bm2 End Function @@ -1098,7 +1099,7 @@ Public Class usrctlProcedures '' str(0) = (Convert.ToBase64String(System.IO.File.ReadAllBytes("C:\Users\DEVELOPER1\Desktop\sample.pdf"))) ' str(1) = (Convert.ToBase64String(System.IO.File.ReadAllBytes("C:\Users\DEVELOPER1\Desktop\sample2.pdf"))) - + ' Dim strt As New ArrayOfString() ' Dim xml_serializer As New XmlSerializer(GetType(List(Of Files))) @@ -1181,7 +1182,7 @@ Public Class usrctlProcedures 'CHANGE HERE use the real path of the pdf physical path here. 'bline = System.IO.File.ReadAllBytes("C:\Users\DEVELOPER1\Desktop\sample.pdf") str = (Convert.ToBase64String(System.IO.File.ReadAllBytes("C:\Users\DEVELOPER1\Desktop\sample.pdf"))) - + xml = " " & " getTrimedString(currentRow(22), 2000) Then TextBox12.Text &= kdnr & vbNewLine End If - If cnt Mod 10 = 0 Then + If cnt Mod 10 = 0 Then Application.DoEvents() Label10.Text = (cnt + 1) @@ -2108,8 +2109,8 @@ Public Class usrctlProcedures Else 'MsgBox(currentRow(2)) End If - End If End If + End If 'For Each currentField In currentRow cnt += 1 @@ -2133,6 +2134,355 @@ Public Class usrctlProcedures VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = test End Sub + + + + + + Private Sub Button27_Click(sender As Object, e As EventArgs) Handles Button27.Click + + Dim StartZeit As Date = DateTime.Now + Dim StopZeit As Date = DateTime.Now + Dim test = VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox4.Checked + + Dim cnt = 0 + 'dim listAVISO = New List(Of cAviso) + Dim sql As New VERAG_PROG_ALLGEMEIN.SQL + Dim kdnr_tmp = "" + Try + + Dim fd As New OpenFileDialog + If fd.ShowDialog = DialogResult.OK Then + If fd.FileName.ToUpper.EndsWith(".MDB") Then + + + + 'Dim Datenbank As OleDbConnection + 'Dim DaHeadertest As OleDbDataAdapter + 'Dim DsHeadertest As DataSet + + 'Datenbank = New OleDbConnection("Provider=Microsoft.Jet.OLEDB.4.0; Data Source=" & fd.FileName) + + 'DaHeadertest = New OleDbDataAdapter("show tables", Datenbank) + 'DsHeadertest = New DataSet + 'DaHeadertest.Fill(DsHeadertest) + 'For Each dr As System.Data.DataRow In DsHeadertest.Tables("KundenKartei").Rows + ' MessageBox.Show(dr(1)) + + + + + + 'Next + + 'Exit Sub + + Dim Datenbank As OleDbConnection + Dim DaHeadertest As OleDbDataAdapter + Dim DsHeadertest As DataSet + ' MsgBox("Provider=Microsoft.ACE.OLEDB.12.0; Data Source=" & fd.FileName) + ' Datenbank = New OleDbConnection("Provider=Microsoft.ACE.OLEDB.12.0; Data Source=" & fd.FileName) + Datenbank = New OleDbConnection("Provider=Microsoft.ACE.OLEDB.12.0; Data Source=" & fd.FileName) + ' cGlobal.ConnStr = "Provider=Microsoft.ACE.OLEDB.12.0; Data Source=" & pfadDatei + 'DaHeadertest = New OleDbDataAdapter("show tables", Datenbank) + 'DsHeadertest = New DataSet + 'DaHeadertest.Fill(DsHeadertest) + 'For Each dr As System.Data.DataRow In DsHeadertest.Tables("Kunden Kartei").Rows + ' MessageBox.Show(dr(1)) + 'Next + + Dim query = "SELECT * FROM KundenKartei" + Dim Table_ = "KundenKartei" + Dim ds As New DataSet + Dim cnn As OleDbConnection = New OleDbConnection("Provider=Microsoft.Jet.OLEDB.4.0; Data Source=" & fd.FileName) + cnn.Open() + Dim cmd As New OleDbCommand(query, cnn) + Dim da As New OleDbDataAdapter(cmd) + da.Fill(ds, Table_) + cnn.Close() + Dim t1 As DataTable = ds.Tables(Table_) + Dim row As DataRow + Dim Item(2) As String + + + For Each row In t1.Rows + Dim kdnr As Integer = 2000000 + + + If IsNumeric(row("Debitorennr")) Then + kdnr += CInt(row("Debitorennr")) + Else + kdnr += CInt(row("Kundennummer")) + End If + + Dim KD As New VERAG_PROG_ALLGEMEIN.cKunde(kdnr) + If Not KD.hasEntry Then + + ' MsgBox(kdnr) + + Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(kdnr) + Dim KDE As New VERAG_PROG_ALLGEMEIN.cKundenErweitert(kdnr) + + + + AD.Auswahl = If(CBool(row("gelöscht")), "I", "A") + AD.Ordnungsbegriff = row("Kundencode").ToString.ToUpper + AD.Name_1 = getTrimedStringACCES(row("Name"), 40) + AD.Name_2 = isleernothing(getTrimedStringACCES(row("Gesellschaft"), 40)) + If AD.Name_1 = "" Then AD.Name_1 = AD.Ordnungsbegriff + + AD.Straße = isleernothing(getTrimedStringACCES(row("Straße"), 40)) + AD.Ort = isleernothing(getTrimedStringACCES(row("Ort"), 40)) + AD.PLZ = isleernothing(getTrimedStringACCES(row("PLZ"), 7)) + AD.LandKz = isleernothing(getTrimedStringACCES(row("Land"), 3)) + AD.Telefon = isleernothing(getTrimedStringACCES(row("Telefonnr"), 20)) + AD.Mobiltelefon = isleernothing(getTrimedStringACCES(row("Mobil"), 20)) + AD.Telefax = isleernothing(getTrimedStringACCES(row("Faxnr"), 20)) + AD.E_Mail = isleernothing(getTrimedStringACCES(row("Email1"), 40).ToString.Replace("mailto:", "").Replace("#", "")) + AD.E_Mail2 = isleernothing(getTrimedStringACCES(row("Email2"), 40).ToString.Replace("mailto:", "").Replace("#", "")) + ' AD. = row("Internet1") + AD.Ansprechpartner = isleernothing(getTrimedStringACCES(row("Ansprechpartner"), 40)) + KD.Währungscode = "EUR" 'getTrimedStringACCES(row("Standard FakturenWährung"), 3) + KD.Zahlungsziel = getTrimedStringACCES(row("Zahlungsziel"), 3) + ' Offerte ?? + + Dim Allg = "" + + + If getTrimedStringACCES(row("ÖVZ"), 9999) <> "" Then Allg &= "Offert ÖVZ: " & getTrimedStringACCESEUR(row("ÖVZ"), 99999) & vbNewLine + If getTrimedStringACCES(row("ÖVZ_Fiskal"), 9999) <> "" Then Allg &= "Offert ÖVZ_Fiskal: " & getTrimedStringACCESEUR(row("ÖVZ_Fiskal"), 99999) & vbNewLine + If getTrimedStringACCES(row("DVZ"), 9999) <> "" Then Allg &= "Offert DVZ: " & getTrimedStringACCESEUR(row("DVZ"), 99999) & vbNewLine + If getTrimedStringACCES(row("DVZ_Fiskal"), 9999) <> "" Then Allg &= "Offert DVZ_Fiskal: " & getTrimedStringACCESEUR(row("DVZ_Fiskal"), 99999) & vbNewLine + If getTrimedStringACCES(row("T1"), 9999) <> "" Then Allg &= "Offert T1: " & getTrimedStringACCESEUR(row("T1"), 99999) & vbNewLine + If getTrimedStringACCES(row("AE"), 9999) <> "" Then Allg &= "Offert AE: " & getTrimedStringACCESEUR(row("AE"), 99999) & vbNewLine + If getTrimedStringACCES(row("AE_ATR"), 9999) <> "" Then Allg &= "Offert AE_ATR: " & getTrimedStringACCESEUR(row("AE_ATR"), 99999) & vbNewLine + If getTrimedStringACCES(row("eZoll_Zuschlag"), 9999) <> "" Then Allg &= "Offert eZoll_Zuschlag: " & getTrimedStringACCESEUR(row("eZoll_Zuschlag"), 99999) & vbNewLine + If getTrimedStringACCES(row("Atlas_Zuschlag"), 9999) <> "" Then Allg &= "Offert Atlas_Zuschlag: " & getTrimedStringACCESEUR(row("Atlas_Zuschlag"), 99999) & vbNewLine + If getTrimedStringACCES(row("TNR_Zuschlag"), 9999) <> "" Then Allg &= "Offert TNR_Zuschlag: " & getTrimedStringACCESEUR(row("TNR_Zuschlag"), 99999) & vbNewLine + If getTrimedStringACCES(row("TNR_Zuschlag_Hinweis"), 9999) <> "" Then Allg &= "Offert TNR_Zuschlag_Hinweis: " & getTrimedStringACCESEUR(row("TNR_Zuschlag_Hinweis"), 99999) & vbNewLine + If getTrimedStringACCES(row("TNR_Zuschlag_Hinweis"), 9999) <> "" Then Allg &= "Offert TNR_Zuschlag_Hinweis: " & getTrimedStringACCESEUR(row("TNR_Zuschlag_Hinweis"), 99999) & vbNewLine + If getTrimedStringACCES(row("Porti"), 9999) <> "" Then Allg &= "Offert Porti: " & getTrimedStringACCESEUR(row("Porti"), 99999) & vbNewLine + If getTrimedStringACCES(row("SKR"), 9999) <> "" Then Allg &= "Offert SKR: " & getTrimedStringACCESEUR(row("SKR"), 99999) & vbNewLine + If getTrimedStringACCES(row("Vorlage"), 9999) <> "" Then Allg &= "Offert Vorlage: " & getTrimedStringACCESEUR(row("Vorlage"), 99999) & vbNewLine + If getTrimedStringACCES(row("Bargeldbeistellung"), 9999) <> "" Then Allg &= "Offert Bargeldbeistellung: " & getTrimedStringACCESEUR(row("Bargeldbeistellung"), 99999) & vbNewLine + If getTrimedStringACCES(row("Vorlage"), 9999) <> "" Then Allg &= "Offert Vorlage: " & getTrimedStringACCESEUR(row("Vorlage"), 99999) & vbNewLine + If getTrimedStringACCES(row("Abrechnungssätze_Anmerkungen"), 9999) <> "" Then Allg &= "Abrechnung: " & getTrimedStringACCES(row("Abrechnungssätze_Anmerkungen"), 99999) & vbNewLine + If getTrimedStringACCES(row("Abfertigungsort"), 9999) <> "" Then Allg &= "Abfertigungsort: " & getTrimedStringACCES(row("Abfertigungsort"), 99999) & vbNewLine + + + If getTrimedStringACCES(row("Handelsregisterauszug"), 9999) <> "" Then Allg &= "Handelsregisterauszug: " & getTrimedStringACCES(row("Handelsregisterauszug"), 99999) & vbNewLine + If getTrimedStringACCES(row("Passkopie"), 9999) <> "" Then Allg &= "Passkopie: " & getTrimedStringACCES(row("Passkopie"), 99999) & vbNewLine + + If (IsNumeric(getTrimedStringACCES(row("Creditreform_Rating"), 3))) Then KD.Bonität = getTrimedStringACCES(row("Creditreform_Rating"), 3) + If (IsDate(getTrimedStringACCES(row("Creditreform_Abfrage_Datum"), 99999))) Then KD.Bonitätsdatum = getTrimedStringACCES(row("Creditreform_Abfrage_Datum"), 99999) + If getTrimedStringACCES(row("Creditreform_Zahlungsziel"), 9999) <> "" Then Allg &= "Creditreform_Zahlungsziel: " & getTrimedStringACCES(row("Creditreform_Zahlungsziel"), 99999) & vbNewLine + If getTrimedStringACCES(row("Creditreform_Anmerkung"), 9999) <> "" Then Allg &= "Creditreform_Anmerkung: " & getTrimedStringACCES(row("Creditreform_Anmerkung"), 99999) & vbNewLine + If IsNumeric(getTrimedStringACCES(row("Creditreform_Höchstkredit"), 9999)) Then KD.Höchstkredit = CDbl(getTrimedStringACCES(row("Creditreform_Höchstkredit"), 9999)) + + + If getTrimedStringACCES(row("UmsatzsteuerID"), 9999).Replace(" ", "").Length > 4 Then + Dim ustTmp = getTrimedStringACCES(row("UmsatzsteuerID"), 9999).Replace(" ", "") + + Dim UST_Land = ustTmp.Substring(0, 2) + Dim UST_NR = ustTmp.Substring(2) + + AD.UstIdKz = UST_Land + AD.UstIdNr = UST_NR + + End If + + If AD.doesOrdnungsbegriffExist Then + AD.Ordnungsbegriff = getTrimedStringACCES(AD.Ordnungsbegriff, 43) & " (UNISPED)" + End If + + KD.Zollnummer = isleernothing(getTrimedStringACCES(getTrimedStringACCES(row("ZollNr"), 99).Replace(" ", ""), 7)) + KD.EORITIN = isleernothing(getTrimedStringACCES(getTrimedStringACCES(row("EORINr"), 99).Replace(" ", ""), 17)) + + + If getTrimedStringACCES(row("Abgabenkonto"), 9999) <> "" Then Allg &= "Abgabenkonto: " & getTrimedStringACCES(row("Abgabenkonto"), 99999) & vbNewLine + If getTrimedStringACCES(row("Aufschubkonto_EUST"), 9999) <> "" Then Allg &= "Aufschub-EUST: " & getTrimedStringACCES(row("Aufschubkonto_EUST"), 99999) & vbNewLine + If getTrimedStringACCES(row("Aufschubkonto_ZOLL"), 9999) <> "" Then Allg &= "Aufschub-ZOLL: " & getTrimedStringACCES(row("Aufschubkonto_ZOLL"), 99999) & vbNewLine + + If CBool(row("Aufschub_BIN")) Then Allg &= "Aufschub-BIN: JA" & vbNewLine + + + AD.Steuernummer = isleernothing(getTrimedStringACCES(row("Steuernr_AT"), 20)) + If getTrimedStringACCES(row("Steuernr_DE"), 9999) <> "" Then Allg &= "Steuernummer-DE: " & getTrimedStringACCES(row("Steuernr_DE"), 99999) & vbNewLine + + + + If getTrimedStringACCES(row("Vollmacht_ÖVZ"), 9999) <> "" Then Allg &= "Vollmacht_ÖVZ: " & getTrimedStringACCES(row("Vollmacht_ÖVZ"), 99999) & vbNewLine + If getTrimedStringACCES(row("Vollmacht_ÖVZ_Fiskal"), 9999) <> "" Then Allg &= "Vollmacht_ÖVZ_Fiskal: " & getTrimedStringACCES(row("Vollmacht_ÖVZ_Fiskal"), 99999) & vbNewLine + If getTrimedStringACCES(row("Erwerbssteuer"), 9999) <> "" Then Allg &= "Erwerbssteuer: " & getTrimedStringACCES(row("Erwerbssteuer"), 99999) & vbNewLine + If getTrimedStringACCES(row("Vollmacht_DVZ"), 9999) <> "" Then Allg &= "Vollmacht_DVZ: " & getTrimedStringACCES(row("Vollmacht_DVZ"), 99999) & vbNewLine + If getTrimedStringACCES(row("Vollmacht_DVZ_Fiskal"), 9999) <> "" Then Allg &= "Vollmacht_DVZ_Fiskal: " & getTrimedStringACCES(row("Vollmacht_DVZ_Fiskal"), 99999) & vbNewLine + If getTrimedStringACCES(row("Vollmacht_AE"), 9999) <> "" Then Allg &= "Vollmacht_AE: " & getTrimedStringACCES(row("Vollmacht_AE"), 99999) & vbNewLine + If getTrimedStringACCES(row("Vollmacht_AE_ATR"), 9999) <> "" Then Allg &= "Vollmacht_AE_ATR: " & getTrimedStringACCES(row("Vollmacht_AE_ATR"), 99999) & vbNewLine + If getTrimedStringACCES(row("Vollmachten_Anmerkungen"), 9999) <> "" Then Allg &= "Vollmachten_Anmerkungen: " & getTrimedStringACCES(row("Vollmachten_Anmerkungen"), 99999) & vbNewLine + If getTrimedStringACCES(row("Zoll_Anmerkungen"), 9999) <> "" Then Allg &= "Zoll_Anmerkungen: " & getTrimedStringACCES(row("Zoll_Anmerkungen"), 99999) & vbNewLine + If getTrimedStringACCES(row("Zoll_Anmerkungen_Fiskal"), 9999) <> "" Then Allg &= "Zoll_Anmerkungen_Fiskal: " & getTrimedStringACCES(row("Zoll_Anmerkungen_Fiskal"), 99999) & vbNewLine + If getTrimedStringACCES(row("Fiskal_Anmerkungen"), 9999) <> "" Then Allg &= "Fiskal_Anmerkungen: " & getTrimedStringACCES(row("Fiskal_Anmerkungen"), 99999) & vbNewLine + + KD.Abfertigungsverbot = CBool(row("Arbeitsverbot")) + KD.Abfertigungsverbot_Grund = isleernothing((getTrimedStringACCES(row("Arbeitsverbot_Anmerkung"), 9999) & vbNewLine & getTrimedStringACCES(row("Anmerkungen_einblenden"), 9999)).Trim) + + If CBool(row("Mahnsperre")) Then Allg &= "Mahnsperre: JA" & vbNewLine + If CBool(row("Rechnung_per_Email")) Then Allg &= "Rechnung_per_Email: JA" & vbNewLine + + + ' Rechnung_per_Email + + + If getTrimedStringACCES(row("Fiskal_Email_Monatsauswertung_Versand"), 9999) <> "" Then Allg &= "Fiskal_Email_Monatsauswertung_Versand: " & getTrimedStringACCES(row("Fiskal_Email_Monatsauswertung_Versand"), 99999) & vbNewLine + If getTrimedStringACCES(row("Fiskal_Ansprechpartner"), 9999) <> "" Then Allg &= "Fiskal_Ansprechpartner: " & getTrimedStringACCES(row("Fiskal_Ansprechpartner"), 99999) & vbNewLine + If getTrimedStringACCES(row("eZoll_AdressID"), 9999) <> "" Then Allg &= "eZoll_AdressID: " & getTrimedStringACCES(row("eZoll_AdressID"), 99999) & vbNewLine + + + If getTrimedStringACCES(row("Geschäftszweig"), 9999) <> "" Then Allg &= "Geschäftszweig: " & getTrimedStringACCES(row("Geschäftszweig"), 99999) & vbNewLine + If CBool(row("Rechnung_per_Email")) Then Allg &= "Rechnung_per_Email: JA" & vbNewLine + ' If getTrimedStringACCES(row("Rechnung_per_Email"), 9999) <> "" Then Allg &= "Rechnung_per_Email: " & getTrimedStringACCES(row("Rechnung_per_Email"), 99999) & vbNewLine + If getTrimedStringACCES(row("Email_Rechnungsversand"), 9999) <> "" Then Allg &= "Email_Rechnungsversand: " & getTrimedStringACCES(row("Email_Rechnungsversand"), 99999) & vbNewLine + + If getTrimedStringACCES(row("Steuerberater"), 9999) <> "" Then Allg &= "Steuerberater: " & getTrimedStringACCES(row("Steuerberater"), 99999) & vbNewLine + If getTrimedStringACCES(row("Verbundenheit"), 9999) <> "" Then Allg &= "Verbundenheit: " & getTrimedStringACCES(row("Verbundenheit"), 99999) & vbNewLine + If CBool(row("Unternehmerbescheinigung")) Then Allg &= "Unternehmerbescheinigung: JA" & vbNewLine + If getTrimedStringACCES(row("Unternehmerbescheinigung_Anmerkung"), 9999) <> "" Then Allg &= "Unternehmerbescheinigung_Anmerkung: " & getTrimedStringACCES(row("Unternehmerbescheinigung_Anmerkung"), 99999) & vbNewLine + If getTrimedStringACCES(row("Zahlungsbedingungen"), 9999) <> "" Then Allg &= "Zahlungsbedingungen: " & getTrimedStringACCES(row("Zahlungsbedingungen"), 99999) & vbNewLine + If getTrimedStringACCES(row("Lieferbedingungen"), 9999) <> "" Then Allg &= "Lieferbedingungen: " & getTrimedStringACCES(row("Lieferbedingungen"), 99999) & vbNewLine + ' If getTrimedStringACCES(row("KDE"), 9999) <> "" Then Allg &= "Anmerkungen_Warnhinweis: " & getTrimedStringACCES(row("Anmerkungen_Warnhinweis"), 99999) & vbNewLine + + KDE.Anmerkungen_Warnhinweis = getTrimedStringACCES(row("Anmerkungen_Warnhinweis"), 9999) + + If CBool(row("Post1")) Then Allg &= "Post1: JA" & vbNewLine + ' AD.Eingegeben_am = CDate(row("erstellt")) + If IsDate(row("zuletzt_geändert")) Then AD.Geändert_am = CDate(row("zuletzt_geändert")) + ' KD.Eingegeben_am = CDate(row("erstellt")) + If IsDate(row("zuletzt_geändert")) Then KD.Geändert_am = CDate(row("zuletzt_geändert")) + + AD.Sachbearbeiter = If(getTrimedStringACCES(row("User_zuletzt_geändert"), 99999) <> "", getTrimedStringACCES(row("User_zuletzt_geändert"), 99999), getTrimedStringACCES(row("User"), 99999)) + KD.Sachbearbeiter = If(getTrimedStringACCES(row("User_zuletzt_geändert"), 99999) <> "", getTrimedStringACCES(row("User_zuletzt_geändert"), 99999), getTrimedStringACCES(row("User"), 99999)) + + KD.KundenNrZentrale = KD.KundenNr + + KD.FilialenNr = 5601 + If KD.Sachbearbeiter = "" Then KD.Sachbearbeiter = "AUTO" + KD.Währungscode = "EUR" + KD.Eingegeben_am = Now.ToShortDateString + + ' AD.Ordnungsbegriff = getTrimedString(AD.Name_1 & "; " & AD.Ort, 50) + If AD.Sachbearbeiter = "" Then AD.Sachbearbeiter = "AUTO" + AD.Eingegeben_am = Now.ToShortDateString + + AD.LandKz = isleernothing(cProgramFunctions.getISO1Land(AD.LandKz)) + + AD.Rechnungsdruck = True + If KD.EORITIN = "" Then KD.EORITIN = Nothing + KD.Vorlageprovision = 0.01 + KD.Kreditaufwendungen = 0.02 + KD.Bankspesen = 0 + KD.SVS = True + KD.Bankspesen_Mindestbetrag = 0 + + KD.Sammelrechnung = 0 + KD.Steuerschlüssel = 10 + KD.Kreditlimit = 2600 + KD.Überwachungskunde = 0 + KD.Abfertigungsverbot = 0 + KD.Rechtsanwalt = 0 + KD.Euroeinführung = CDate("01.01.2002") + KD.UStV_Summe3470BetragEUR = 0 + KD.UStV_SummeErstattungsbetragEUR = 0 + KD.UStV_SummeVorschaubetragEUR = 0 + KD.UStV_SummeVorschaubetragEUR_IDS = 0 + KD.UStV_SummeVorschaubetragEUR_VERAG = 0 + KD.UStV_SummeUmsatzsteuerbetragEUR = 0 + KD.UStV_SummeVZBetragEUR = 0 + KD.Fiskal_Aktiv = 0 + + If Allg <> "" Then Allg &= vbNewLine & "____________________________________________________________" & vbNewLine + KD.Besonderheiten = isleernothing((Allg & getTrimedStringACCES(row("Sonstiges"), 99999)).Trim) + + + Dim KDKont As New VERAG_PROG_ALLGEMEIN.cKundenKontakte() + KDKont.kkd_KundenNr = kdnr + + KDKont.kkd_kkaId = 10 + KDKont.kkd_kkaBez = "Fiskal" + KDKont.kkd_Tel = isleernothing(getTrimedStringACCES(row("Fiskal_Telefon"), 40)) + + KDKont.kkd_Email = isleernothing(getTrimedStringACCES(row("Fiskal_Email1"), 40) & ";" & getTrimedStringACCES(row("Fiskal_Email2"), 40) & ";" & getTrimedStringACCES(row("Fiskal_Email3"), 40)) + ' If (KDKont.kkd_Email.replace(";;", "") = "") Then KDKont.kkd_Email = "" + KDKont.kkd_Email = KDKont.kkd_Email.replace(";;", ";") + KDKont.kkd_Email = isleernothing(KDKont.kkd_Email) + + KDKont.kkd_Fax = isleernothing(getTrimedStringACCES(row("Fiskal_Faxnr"), 40)) + KDKont.kkd_Mobil = isleernothing(getTrimedStringACCES(row("Fiskal_Mobil"), 40)) + KDKont.kkd_AnsprechpartnerVorname = isleernothing(getTrimedStringACCES(row("Fiskal_Ansprechpartner"), 40)) + + + + If AD.SAVE() AndAlso KD.SAVE() AndAlso KDE.SAVE() Then + VERAG_PROG_ALLGEMEIN.cKundenKontakte.DELETE_ALL_KONTAKTE(kdnr) 'alle Löschen! + + KDKont.SAVE() + + If getTrimedStringACCES(row("Email3"), 9999) <> "" Then insertKontakt(kdnr, getTrimedStringACCES(row("Email3"), 50).ToString.Replace("mailto:", "").Replace("#", ""), "Email3") + If getTrimedStringACCES(row("EmailABD1"), 9999) <> "" Then insertKontakt(kdnr, getTrimedStringACCES(row("EmailABD1"), 30), "ABD01") + If getTrimedStringACCES(row("EmailABD2"), 9999) <> "" Then insertKontakt(kdnr, getTrimedStringACCES(row("EmailABD2"), 30), "ABD02") + If getTrimedStringACCES(row("EmailABD3"), 9999) <> "" Then insertKontakt(kdnr, getTrimedStringACCES(row("EmailABD3"), 30), "ABD03") + + TextBox10.Text &= AD.AdressenNr & " " & AD.Ordnungsbegriff & vbNewLine + Else + MsgBox("FEHLER: " & kdnr) + End If + + + ' AD.XXXXXXXXX = getTrimedStringACCES(row("XXXXXXXXXXXXXXXXXX"), 99999) + + End If + + + + + 'Item(0) = row(0) + 'Item(1) = row(1) + 'Dim NextListItem As New ListViewItem(Item) + 'ListView1.Items.Add(NextListItem) + cnt += 1 + Label14.Text = cnt + Me.Refresh() + Next + + + End If + End If + + Catch ex As Exception + MessageBox.Show(ex.Message & ex.StackTrace) + Finally + + End Try + + + + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = test + End Sub + + + + Sub insertKontakt(kdnr, kkd_Email, kkd_AnsprechpartnerVorname) + Dim KDKont As New VERAG_PROG_ALLGEMEIN.cKundenKontakte() + KDKont.kkd_KundenNr = kdnr + + KDKont.kkd_kkaId = 1 + KDKont.kkd_kkaBez = "Allgemein" + + KDKont.kkd_Email = kkd_Email + KDKont.kkd_AnsprechpartnerVorname = KDKont.kkd_AnsprechpartnerVorname + + KDKont.SAVE() + End Sub Function getTrimedString(s As String, l As Integer) As String Try If s Is Nothing Then Return "" @@ -2146,6 +2496,42 @@ Public Class usrctlProcedures End Try Return "" End Function + Function getTrimedStringACCES(s As Object, l As Integer) As String + + Try + If s Is Nothing Then Return "" + If s Is DBNull.Value Then Return "" + If s.ToString.Length > l Then + Return s.Substring(0, l) + End If + Return s + + Catch ex As Exception + MsgBox("getTrimedString: " & ex.Message & ex.StackTrace) + End Try + Return "" + End Function + Function getTrimedStringACCESEUR(s As Object, l As Integer) As String + + Try + If s Is Nothing Then Return "" + If s Is DBNull.Value Then Return "" + If s.ToString.Length > l Then + Return s.Substring(0, l) + End If + + If IsNumeric(s) Then + Return CDbl(s).ToString("C2") + End If + + Return s + + Catch ex As Exception + MsgBox("getTrimedString: " & ex.Message & ex.StackTrace) + End Try + Return "" + End Function + Private Sub Button25_Click(sender As Object, e As EventArgs) Handles Button25.Click Dim StartZeit As Date = DateTime.Now @@ -2364,6 +2750,8 @@ Public Class usrctlProcedures VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = test End Sub + + 'Private Sub Button26_Click(sender As Object, e As EventArgs) ' For Each d In System.IO.Directory.GetDirectories("\\192.168.0.91\Datenarchiv\DAKOSY\ECHTSYSTEM\Nachrichtendaten_Ablage\2019") ' Dim fi As New FileInfo(d) diff --git a/initATLASAufschubkonten/App.config b/initATLASAufschubkonten/App.config index 1729194..5f70bbd 100644 --- a/initATLASAufschubkonten/App.config +++ b/initATLASAufschubkonten/App.config @@ -1,6 +1,6 @@ - + diff --git a/initATLASAufschubkonten/EZollAufschubEinlesen.vb b/initATLASAufschubkonten/EZollAufschubEinlesen.vb index e946bae..7c02f48 100644 --- a/initATLASAufschubkonten/EZollAufschubEinlesen.vb +++ b/initATLASAufschubkonten/EZollAufschubEinlesen.vb @@ -21,7 +21,7 @@ Public Class EZollAufschubEinlesen Dim saveAbgaben = True Select Case d1.Abgabenart - Case "2EU", "2IG", "2PE", "5EU" + Case "2EU", "2IG", "5EU" ' "2PE", LeistungsNr = "20" Case "B00" 'EUST LeistungsNr = "20" diff --git a/initATLASAufschubkonten/My Project/Application.Designer.vb b/initATLASAufschubkonten/My Project/Application.Designer.vb index 1486c0b..2584a6d 100644 --- a/initATLASAufschubkonten/My Project/Application.Designer.vb +++ b/initATLASAufschubkonten/My Project/Application.Designer.vb @@ -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/initATLASAufschubkonten/My Project/Resources.Designer.vb b/initATLASAufschubkonten/My Project/Resources.Designer.vb index 6ae2095..18f953a 100644 --- a/initATLASAufschubkonten/My Project/Resources.Designer.vb +++ b/initATLASAufschubkonten/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ diff --git a/initATLASAufschubkonten/My Project/Settings.Designer.vb b/initATLASAufschubkonten/My Project/Settings.Designer.vb index e0563fd..e234f82 100644 --- a/initATLASAufschubkonten/My Project/Settings.Designer.vb +++ b/initATLASAufschubkonten/My Project/Settings.Designer.vb @@ -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/initATLASAufschubkonten/RoutineManager.vbproj b/initATLASAufschubkonten/RoutineManager.vbproj index c71c3dd..7ac77ac 100644 --- a/initATLASAufschubkonten/RoutineManager.vbproj +++ b/initATLASAufschubkonten/RoutineManager.vbproj @@ -11,7 +11,7 @@ RoutineManager 512 WindowsForms - v4.5 + v4.7 @@ -72,6 +72,11 @@ False ..\..\..\dll\Ghostscript.NET.dll + + + + + False ..\..\..\dll\itextsharp.dll @@ -111,6 +116,7 @@ + diff --git a/initATLASAufschubkonten/cVERAG_Interface.vb b/initATLASAufschubkonten/cVERAG_Interface.vb new file mode 100644 index 0000000..12b1f3e --- /dev/null +++ b/initATLASAufschubkonten/cVERAG_Interface.vb @@ -0,0 +1,775 @@ +Public Class cVERAG_Interface + Shared SQL As New VERAG_PROG_ALLGEMEIN.SQL + + 'Shared Function copyFileFTP_OLD(NCTS_TMP As DAKOSY_Worker.cDakosyNCTSOut, DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen) ', filePath As String) + ' Try + ' If NCTS_TMP Is Nothing Then Return False + ' If NCTS_TMP.ncts_ObjectName Is Nothing Then Return False + ' If NCTS_TMP.ncts_ObjectName.ToString.StartsWith("DU") Then Return False + ' If NCTS_TMP.ncts_firma.ToString = "DURMAZ" Then Return False + + ' 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") + ' If filePath = "" Then Return False + + ' NCTS_TMP.LOAD_Sicherheitsangaben() + ' If NCTS_TMP.ncts_SICHERHEITSANGABEN IsNot Nothing AndAlso NCTS_TMP.ncts_SICHERHEITSANGABEN.Count > 0 Then + ' Dim GRN = NCTS_TMP.ncts_SICHERHEITSANGABEN(0).nctsSA_GRN + ' Dim destFile = "" + ' Select Case GRN + ' ' --> FTP Bereitstellung + ' '\\192.168.0.91\Datenarchiv\DAKOSY\ECHTSYSTEM\FTP\TOBB + ' Case "15TR0004000020917", "12TR0004000004665", "17TR0004000032349", "17TR0004000029518" + ' frmStartOptions.copyFile(filePath, "\\ftps.verag.ag\FTP\TOBB\OUT\", destFile) + ' If IO.File.Exists(destFile) Then insertFTPLOG(destFile, "TOBB") Else VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Datei existiert nicht: " & destFile & vbNewLine & NCTS_TMP.ncts_ObjectName, "", "copyFileFTP") + ' Case "18DE0000000073276", "19DE0000000075520", "18DE0000000075520" + ' frmStartOptions.copyFile(filePath, "\\ftps.verag.ag\FTP\OREGON\OUT\", destFile) + ' If IO.File.Exists(destFile) Then insertFTPLOG(destFile, "OREGON") Else VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Datei existiert nicht: " & destFile & vbNewLine & NCTS_TMP.ncts_ObjectName, "", "copyFileFTP") + ' Case "17DE0000000071678", "05AT510000G000FP7" 'VERAG + ' frmStartOptions.copyFile(filePath, "\\192.168.0.91\Datenarchiv\DAKOSY\ECHTSYSTEM\FTP\VERAG\", destFile) + ' If IO.File.Exists(destFile) Then insertFTPLOG(destFile, "VERAG") Else VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Datei existiert nicht: " & destFile & vbNewLine & NCTS_TMP.ncts_ObjectName, "", "copyFileFTP") + ' End Select + ' End If + ' Return True + ' Catch ex As Exception + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine & "BezugsNr: " & NCTS_TMP.ncts_ObjectName, System.Reflection.MethodInfo.GetCurrentMethod.Name) + ' Return False + ' End Try + 'End Function + + Shared Function copyFileFTP_VERAGncts_DY_ByBezugsNr(BezugsNr As String) As Boolean + 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) + 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 + Try + If NCTS_TMP Is Nothing Then Return False + If NCTS_TMP.ncts_ObjectName Is Nothing Then Return False + If NCTS_TMP.ncts_ObjectName.ToString.StartsWith("DU") Then Return False + If NCTS_TMP.ncts_firma.ToString = "DURMAZ" Then Return False + + ' 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") + + + NCTS_TMP.LOAD_Sicherheitsangaben() + If NCTS_TMP.ncts_SICHERHEITSANGABEN IsNot Nothing AndAlso NCTS_TMP.ncts_SICHERHEITSANGABEN.Count > 0 Then + Dim GRN = NCTS_TMP.ncts_SICHERHEITSANGABEN(0).nctsSA_GRN + + Dim destFile = "" + Dim filePath = "" + Dim UniqueId = "" + + ' --> FTP Bereitstellung + Dim NCTS_VERAG_OUT As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts = Nothing + + Dim FTP_Path = "" + Dim CooName = "" + Dim vorsystem = "DY" + If getPathsByGRN(GRN, FTP_Path, CooName) Then + NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromDAKOSY(NCTS_TMP, DY_TMP, UniqueId) + If NCTS_VERAG_OUT IsNot Nothing AndAlso Not alreadyProvidedInInterface(NCTS_VERAG_OUT, vorsystem, checkAlreadyProvided) Then + If genXMLFile(NCTS_VERAG_OUT, filePath, vorsystem, UniqueId) <> "" Then + frmStartOptions.copyFile(filePath, FTP_Path, destFile) + If IO.File.Exists(destFile) Then insertFTPLOG(destFile, CooName, NCTS_VERAG_OUT, vorsystem) Else VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Datei existiert nicht: " & destFile, "", "copyFileFTP") + End If + End If + End If + + + 'Dim destFile = "" + 'Dim filePath = "" + 'Dim NCTS_VERAG_OUT As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts = Nothing + '' --> FTP Bereitstellung + 'Select Case GRN + ' Case "15TR0004000020917", "12TR0004000004665", "17TR0004000032349", "17TR0004000029518" + ' NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromDAKOSY(NCTS_TMP, DY_TMP, filePath) + ' If filePath = "" Then Return False + ' frmStartOptions.copyFile(filePath, "\\ftps.verag.ag\FTP\TOBB\OUT\", destFile) + ' If IO.File.Exists(destFile) Then insertFTPLOG(destFile, "TOBB", NCTS_VERAG_OUT) Else VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Datei existiert nicht: " & destFile & vbNewLine & NCTS_TMP.ncts_ObjectName, "", "copyFileFTP") + ' Case "18DE0000000073276", "19DE0000000075520", "18DE0000000075520" + ' NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromDAKOSY(NCTS_TMP, DY_TMP, filePath) + ' If filePath = "" Then Return False + ' frmStartOptions.copyFile(filePath, "\\ftps.verag.ag\FTP\OREGON\OUT\", destFile) + ' If IO.File.Exists(destFile) Then insertFTPLOG(destFile, "OREGON", NCTS_VERAG_OUT) Else VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Datei existiert nicht: " & destFile & vbNewLine & NCTS_TMP.ncts_ObjectName, "", "copyFileFTP") + ' Case "17DE0000000071678", "05AT510000G000FP7" 'VERAG + ' NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromDAKOSY(NCTS_TMP, DY_TMP, filePath) + ' If filePath = "" Then Return False + ' frmStartOptions.copyFile(filePath, "\\192.168.0.91\Datenarchiv\DAKOSY\ECHTSYSTEM\FTP\VERAG\", destFile) + ' If IO.File.Exists(destFile) Then insertFTPLOG(destFile, "VERAG", NCTS_VERAG_OUT) Else VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Datei existiert nicht: " & destFile & vbNewLine & NCTS_TMP.ncts_ObjectName, "", "copyFileFTP") + 'End Select + End If + Return True + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine & "BezugsNr: " & NCTS_TMP.ncts_ObjectName, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Return False + End Try + End Function + + Shared Function copyFileFTP_VERAGncts_TC_ByBezugsNr(BezugsNr As String) As Boolean + 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) + End Function + Shared Function copyFileFTP_VERAGncts_TC(NCTS_TMP As TELOTEC_Worker.cTelotec_Anmeldung, Optional checkAlreadyProvided As Boolean = True) As Boolean + Try + If NCTS_TMP Is Nothing Then Return False + If NCTS_TMP.telanm_BezugsNr Is Nothing Then Return False + 'If NCTS_TMP.telanm_firma.ToString = "DURMAZ" Then Return False + Select Case NCTS_TMP.telanm_ART + Case "T1", "T2", "T2L", "T-" + Case Else + Return False + End Select + + ' 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") + + ' NCTS_TMP.LOAD_Sicherheitsangaben() + If NCTS_TMP.SICHERHEIT IsNot Nothing AndAlso NCTS_TMP.SICHERHEIT.Count > 0 Then + Dim GRN = NCTS_TMP.SICHERHEIT(0).GRN + Dim destFile = "" + Dim filePath = "" + Dim UniqueId = "" + + ' --> FTP Bereitstellung + Dim NCTS_VERAG_OUT As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts = Nothing + Dim FTP_Path = "" + Dim CooName = "" + Dim vorsystem = "TC" + If getPathsByGRN(GRN, FTP_Path, CooName) Then + NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromTELOTEC(NCTS_TMP, UniqueId) + If NCTS_VERAG_OUT IsNot Nothing AndAlso Not alreadyProvidedInInterface(NCTS_VERAG_OUT, vorsystem, checkAlreadyProvided) Then + If genXMLFile(NCTS_VERAG_OUT, filePath, vorsystem, UniqueId) <> "" Then + frmStartOptions.copyFile(filePath, FTP_Path, destFile) + If IO.File.Exists(destFile) Then insertFTPLOG(destFile, CooName, NCTS_VERAG_OUT, vorsystem) Else VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Datei existiert nicht: " & destFile, "", "copyFileFTP") + End If + End If + End If + + + 'Select Case GRN + ' Case "15TR0004000020917", "12TR0004000004665", "17TR0004000032349", "17TR0004000029518" + ' NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromTELOTEC(NCTS_TMP, filePath) + ' If filePath = "" Then Return False + ' frmStartOptions.copyFile(filePath, "\\ftps.verag.ag\FTP\TOBB\OUT\", destFile) + ' If IO.File.Exists(destFile) Then insertFTPLOG(destFile, "TOBB", NCTS_VERAG_OUT) Else VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Datei existiert nicht: " & destFile & vbNewLine & NCTS_TMP.telanm_BezugsNr, "", "copyFileFTP") + ' Case "18DE0000000073276", "19DE0000000075520", "18DE0000000075520" + ' NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromTELOTEC(NCTS_TMP, filePath) + ' If filePath = "" Then Return False + ' frmStartOptions.copyFile(filePath, "\\ftps.verag.ag\FTP\OREGON\OUT\", destFile) + ' If IO.File.Exists(destFile) Then insertFTPLOG(destFile, "OREGON", NCTS_VERAG_OUT) Else VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Datei existiert nicht: " & destFile & vbNewLine & NCTS_TMP.telanm_BezugsNr, "", "copyFileFTP") + ' Case "17DE0000000071678", "05AT510000G000FP7" 'VERAG + ' NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromTELOTEC(NCTS_TMP, filePath) + ' If filePath = "" Then Return False + ' frmStartOptions.copyFile(filePath, "\\192.168.0.91\Datenarchiv\DAKOSY\ECHTSYSTEM\FTP\VERAG\", destFile) + ' If IO.File.Exists(destFile) Then insertFTPLOG(destFile, "VERAG", NCTS_VERAG_OUT) Else VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Datei existiert nicht: " & destFile & vbNewLine & NCTS_TMP.telanm_BezugsNr, "", "copyFileFTP") + 'End Select + End If + Return True + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine & "BezugsNr: " & NCTS_TMP.telanm_BezugsNr, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Return False + End Try + End Function + + Shared Function copyFileFTP_VERAGncts_EZOLL_ByBezugsNr(LRN As String) As Boolean + 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) + End Function + + Shared Function copyFileFTP_VERAGncts_EZOLL(AnmId As String, Optional checkAlreadyProvided As Boolean = True) As Boolean + Dim LRN = "" + Try + + Dim dEZOLL As DataTable = SQL.loadDgvBySql("SELECT LizenzNr, OperatorID, VorgangID, AnmID, GeaendertAm, GeaendertVon, CRN, LRN" & + " FROM zsAnmRefs" & + " WHERE (VorgangID = 'AV') AND (AnmId = '" & AnmId & "')" & + " ORDER BY GeaendertAm DESC", "EZOLL") + + + If dEZOLL Is Nothing Then Return False + If dEZOLL.Rows.Count <= 0 Then Return False + 'If NCTS_TMP.telanm_firma.ToString = "DURMAZ" Then Return False + + LRN = dEZOLL.Rows(0)("LRN") + Select Case SQL.getValueTxtBySql("SELECT TOP 1 DecTy FROM zsAnmHea WHERE (VorgangID = 'AV') AND (AnmId = '" & AnmId & "')", "EZOLL") + Case "T1", "T2", "T2L", "T-" + Case Else + Return False + End Select + + ' Tabelle zsAnmGrteeGrteeRef lesen. + Dim GRN As String = SQL.getValueTxtBySql("SELECT TOP 1 GRN FROM zsAnmGrteeGrteeRef WHERE AnmID = " & AnmId & " ORDER BY GrteeID, GrteeRefID", "EZOLL") + Dim destFile = "" + Dim filePath = "" + Dim UniqueId = "" + + ' --> FTP Bereitstellung + Dim NCTS_VERAG_OUT As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts = Nothing + + Dim FTP_Path = "" + Dim CooName = "" + Dim vorsystem = "DHF" + If getPathsByGRN(GRN, FTP_Path, CooName) Then + NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromEZOLLByAnmId(AnmId, UniqueId) + If NCTS_VERAG_OUT IsNot Nothing AndAlso Not alreadyProvidedInInterface(NCTS_VERAG_OUT, vorsystem, checkAlreadyProvided) Then + If genXMLFile(NCTS_VERAG_OUT, filePath, vorsystem, UniqueId) <> "" Then + frmStartOptions.copyFile(filePath, FTP_Path, destFile) + If IO.File.Exists(destFile) Then insertFTPLOG(destFile, CooName, NCTS_VERAG_OUT, vorsystem) Else VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Datei existiert nicht: " & destFile & vbNewLine & LRN, "", "copyFileFTP") + End If + End If + End If + + Return True + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine & "BezugsNr: " & LRN, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Return False + End Try + End Function + + Shared Function getPathsByGRN(GRN, ByRef FTP_Path, ByRef CooName) As Boolean + Select Case GRN + Case "15TR0004000020917", "12TR0004000004665", "17TR0004000032349", "17TR0004000029518" + FTP_Path = "\\ftps.verag.ag\FTP\TOBB\OUT\" + CooName = "TOBB" + Case "18DE0000000073276", "19DE0000000075520", "18DE0000000075520" + FTP_Path = "\\ftps.verag.ag\FTP\OREGON\OUT\" + CooName = "OREGON" + Case "17DE0000000071678", "05AT510000G000FP7" 'VERAG + FTP_Path = "\\192.168.0.91\Datenarchiv\DAKOSY\ECHTSYSTEM\FTP\VERAG\" + CooName = "VERAG" + Case "16AT520000G000VA6" 'IMEX + FTP_Path = "\\192.168.0.91\Datenarchiv\DAKOSY\ECHTSYSTEM\FTP\IMEX\" + CooName = "IMEX" + Case Else + Return False + End Select + Return True + End Function + + Shared Function alreadyProvidedInInterface(NCTS_VERAG_OUT As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts, vorsystem 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 + 'Return SQL.doSQL("INSERT INTO tblFTP_Log (ftp_filepath,ftp_user,ftp_BezugsNr,ftp_art,ftp_status,ftp_vorsystem) VALUES ('" & filePath & "','" & user & "','" & NCTS_VERAG_OUT.ProcessData.ReferenzNumber & "','" & NCTS_VERAG_OUT.ProcessData.ProcedureCode & "','" & NCTS_VERAG_OUT.ProcessData.Status & "','')", "FMZOLL") + If SQL.getValueTxtBySql("SELECT count(*) FROM [tblFTP_Log] where [ftp_BezugsNr]='" & NCTS_VERAG_OUT.ProcessData.ReferenzNumber & "' AND [ftp_art]='" & NCTS_VERAG_OUT.ProcessData.ProcedureCode & "' AND [ftp_status]='" & NCTS_VERAG_OUT.ProcessData.Status & "' AND [ftp_vorsystem]='" & vorsystem & "' ", "FMZOLL",,, 0) = 0 Then + Return False + 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 True + End Function + + Shared Function genXMLFile(VERAG_NCTS As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts, ByRef XMLFilePath As String, Code As String, UniqueId As String) As String + Try + If XMLFilePath = "" Then + Dim dir = "\\192.168.0.91\Datenarchiv\ZOLL_SCHNITTSTELLEN\VERAG\NCTS_OUT\" & Code & "\" & Now.Year & "\" & Now.ToShortDateString & "\" + If Not IO.Directory.Exists(dir) Then IO.Directory.CreateDirectory(dir) + XMLFilePath = dir & "VERAG_NCTS_OUT_" & Now.ToString("ddMMyyyHHmmss") & "_" & Code & "_" & UniqueId & ".xml" + End If + VERAG_NCTS.SaveToFile(XMLFilePath) + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return XMLFilePath + End Function + Shared Function genVERAG_OUT_NCTS_FromDAKOSY(NCTS_TMP As DAKOSY_Worker.cDakosyNCTSOut, DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen, ByRef UniqueId As String) As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts + Dim VERAG_NCTS As New VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts + Try + If DY_TMP Is Nothing Then Return Nothing + If NCTS_TMP Is Nothing Then Return Nothing + If NCTS_TMP.ncts_ObjectName Is Nothing Then Return Nothing + NCTS_TMP.LOAD_Warenposition() + + VERAG_NCTS.Version = "2.0.0" ' Automaitsch, weil default ' doch nicht? + + If NCTS_TMP.ncts_firma <> "" Then + VERAG_NCTS.Company = NCTS_TMP.ncts_firma + Else + VERAG_NCTS.Company = "VERAG" + End If + VERAG_NCTS.Department = NCTS_TMP.ncts_niederlassung + + 'VERAG_NCTS.InternalReference.OfficeCode = If( + 'VERAG_NCTS.InternalReference.PositionNumber = NCTS_TMP.ncts_niederlassung + + Select Case DY_TMP.dy_Status + Case < 50 + VERAG_NCTS.ProcessData.Status = 0 + Case 50, 53 + VERAG_NCTS.ProcessData.Status = 50 + Case 60 + VERAG_NCTS.ProcessData.Status = 60 + End Select + + VERAG_NCTS.ProcessData.TransactionDate = NCTS_TMP.ncts_Trans_DatumZeit + + VERAG_NCTS.ProcessData.MRN = If(NCTS_TMP.ncts_MRN, "") + VERAG_NCTS.ProcessData.ReferenzNumber = If(NCTS_TMP.ncts_ObjectName, "") + VERAG_NCTS.ProcessData.ProcedureCode = If(NCTS_TMP.ncts_ArtAnmeldung, "") + + VERAG_NCTS.NCTS_Data.DatDeterminationLimit = If(NCTS_TMP.ncts_Wiedergestellungsdatum, "") + VERAG_NCTS.NCTS_Data.LicensePlate = If(NCTS_TMP.ncts_Befoerderungsmittel_KennzeichenAbgang, "") + VERAG_NCTS.NCTS_Data.DepartureCustomsOffice = If(NCTS_TMP.ncts_AbgangsDienststellennummer, "") + VERAG_NCTS.NCTS_Data.DestinationCustomsOffice = If(NCTS_TMP.ncts_BestimmungsstelleDienststellennummer, "") + VERAG_NCTS.NCTS_Data.DepartureCountry = If(NCTS_TMP.ncts_VersendungsLandCode, "") + VERAG_NCTS.NCTS_Data.DestinationCountry = If(NCTS_TMP.ncts_BestimmungslandCode, "") + + 'Versender + VERAG_NCTS.NCTS_Data.Sender.Name = If(NCTS_TMP.ncts_Versender_Name, "") + VERAG_NCTS.NCTS_Data.Sender.EORI = If(NCTS_TMP.ncts_Versender_EORI, "") + VERAG_NCTS.NCTS_Data.Sender.EORI_NL = If(NCTS_TMP.ncts_Versender_NLNR, "") + 'VERAG_NCTS.NCTS_Data.Sender.UID_Nr = If(NCTS_TMP.vers, "") + VERAG_NCTS.NCTS_Data.Sender.Adress.Country = If(NCTS_TMP.ncts_Versender_Land, "") + VERAG_NCTS.NCTS_Data.Sender.Adress.Postcode = If(NCTS_TMP.ncts_Versender_PLZ, "") + VERAG_NCTS.NCTS_Data.Sender.Adress.Street = If(NCTS_TMP.ncts_Versender_StrasseHausnummer, "") + VERAG_NCTS.NCTS_Data.Sender.Adress.City = If(NCTS_TMP.ncts_Versender_Ort, "") + + 'Empfänger + VERAG_NCTS.NCTS_Data.Consignee.Name = If(NCTS_TMP.ncts_Empfaenger_Name, "") + VERAG_NCTS.NCTS_Data.Consignee.EORI = If(NCTS_TMP.ncts_Empfaenger_EORI, "") + VERAG_NCTS.NCTS_Data.Consignee.EORI_NL = If(NCTS_TMP.ncts_Empfaenger_NLNR, "") + 'VERAG_NCTS.NCTS_Data.Consignee.UID_Nr = If(NCTS_TMP.vers, "") + VERAG_NCTS.NCTS_Data.Consignee.Adress.Country = If(NCTS_TMP.ncts_Empfaenger_Land, "") + VERAG_NCTS.NCTS_Data.Consignee.Adress.Postcode = If(NCTS_TMP.ncts_Empfaenger_PLZ, "") + VERAG_NCTS.NCTS_Data.Consignee.Adress.Street = If(NCTS_TMP.ncts_Empfaenger_StrasseHausnummer, "") + VERAG_NCTS.NCTS_Data.Consignee.Adress.City = If(NCTS_TMP.ncts_Empfaenger_Ort, "") + + 'Frächter + 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, "") + VERAG_NCTS.NCTS_Data.Carrier.EORI_NL = If(NCTS_TMP.ncts_SumA_Befoerderer_NLNR, "") + 'VERAG_NCTS.NCTS_Data.Carrier.UID_Nr = If(NCTS_TMP.vers, "") + VERAG_NCTS.NCTS_Data.Carrier.Adress.Country = If(NCTS_TMP.ncts_SumA_Befoerderer_Land, "") + VERAG_NCTS.NCTS_Data.Carrier.Adress.Postcode = If(NCTS_TMP.ncts_SumA_Befoerderer_PLZ, "") + VERAG_NCTS.NCTS_Data.Carrier.Adress.Street = If(NCTS_TMP.ncts_SumA_Befoerderer_StrasseHausnummer, "") + VERAG_NCTS.NCTS_Data.Carrier.Adress.City = If(NCTS_TMP.ncts_SumA_Befoerderer_Ort, "") + + 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") + End If + + VERAG_NCTS.NCTS_Data.SumGrossWeight = If(NCTS_TMP.ncts_GesamtRohmasse, "0") + Dim cntPos = 1 + If NCTS_TMP.ncts_WARENPOS IsNot Nothing Then + For Each POS In NCTS_TMP.ncts_WARENPOS + Dim V_POS As New VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_nctsNCTS_DataPosition + V_POS.PosNr = cntPos + Dim pkGes = 0 + Dim pkArt = "" + If POS.nctsWP_PACKSTUECKE IsNot Nothing Then + For Each PK In POS.nctsWP_PACKSTUECKE + If PK.nctsWpPk_PackstueckeAnzahl IsNot Nothing Then pkGes += PK.nctsWpPk_PackstueckeAnzahl + If PK.nctsWpPk_Verpackungsart IsNot Nothing Then pkArt = PK.nctsWpPk_Verpackungsart + Next + End If + V_POS.Quantity = pkGes + V_POS.Packaging = pkArt + V_POS.GrossWeight = POS.nctsWP_Rohmasse + V_POS.GoodsDescription = POS.nctsWP_Warenbezeichnung + + VERAG_NCTS.NCTS_Data.Position.Add(V_POS) + cntPos += 1 + Next + End If + + If False Then + Try + If DY_TMP.dy_VBD_dsId IsNot Nothing AndAlso IsNumeric(DY_TMP.dy_VBD_dsId) Then + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(DY_TMP.dy_VBD_dsId) + Dim Path = DS.GET_TOP1_PATH() + If Path <> "" And IO.File.Exists(Path) Then + Dim ATT As New VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_nctsAttachment + ATT.DocumentType = VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_nctsAttachmentDocumentType.NCTS + ATT.FileType = "PDF" + ATT.Name = "NCTS_VBD_" & If(VERAG_NCTS.ProcessData.ProcedureCode, "") & ".pdf" + Convert.ToBase64String(System.IO.File.ReadAllBytes(Path)) + 'ATT.base64BinaryStream = Convert.ToBase64CharArray(System.IO.File.ReadAllBytes(Path)) + ATT.base64BinaryStream = System.Text.Encoding.UTF8.GetBytes(System.Convert.ToBase64String(System.IO.File.ReadAllBytes(Path))) + VERAG_NCTS.Attachments.Add(ATT) + End If + End If + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine & "BezugsNr: " & NCTS_TMP.ncts_ObjectName, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + End If + 'If XMLFilePath = "" Then + ' Dim dir = "\\192.168.0.91\Datenarchiv\ZOLL_SCHNITTSTELLEN\VERAG\NCTS_OUT\DY\" & Now.Year & "\" & Now.ToShortDateString & "\" + ' If Not IO.Directory.Exists(dir) Then IO.Directory.CreateDirectory(dir) + ' XMLFilePath = dir & "VERAG_NCTS_OUT_" & Now.ToString("ddMMyyyHHmmss") & "_DY_" & DY_TMP.dy_Id & ".xml" + 'End If + + UniqueId = DY_TMP.dy_Id + 'VERAG_NCTS.SaveToFile(XMLFilePath) + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine & "BezugsNr: " & NCTS_TMP.ncts_ObjectName, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Return Nothing + End Try + Return VERAG_NCTS + + End Function + + Shared Function genVERAG_OUT_NCTS_FromEZOLLByLRN(LRN As String, ByRef UniqueId As String) As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts + + Dim dEZOLL As DataTable = SQL.loadDgvBySql("SELECT LizenzNr, OperatorID, VorgangID, AnmID, GeaendertAm, GeaendertVon, CRN, LRN" & + " FROM zsAnmRefs" & + " WHERE (VorgangID = 'AV') AND (LRN = '" & LRN & "')" & + " ORDER BY GeaendertAm DESC", "EZOLL") + If dEZOLL Is Nothing Then Return Nothing + If dEZOLL.Rows.Count = 0 Then Return Nothing + + Dim r As DataRow = dEZOLL.Rows(0) + + Return genVERAG_OUT_NCTS_FromEZOLLByAnmId(r.Item("AnmID"), UniqueId) + End Function + + Shared Function genVERAG_OUT_NCTS_FromEZOLLByAnmId(AnmID As String, ByRef UniqueId As String) As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts + Dim VERAG_NCTS As New VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts + Dim LRN = "" + Try + + VERAG_NCTS.Version = "2.0.0" ' Automaitsch, weil default ' doch nicht? + + Dim Bestimmungszollstelle = "" + Dim Bürgschaft = "" + + Dim dEZOLL As DataTable = SQL.loadDgvBySql("SELECT LizenzNr, OperatorID, VorgangID, AnmID, GeaendertAm, GeaendertVon, CRN, LRN" & + " FROM zsAnmRefs" & + " WHERE (VorgangID = 'AV') AND (AnmID = '" & AnmID & "')" & + " ORDER BY GeaendertAm DESC", "EZOLL") + + If dEZOLL Is Nothing Then Return Nothing + If dEZOLL.Rows.Count = 0 Then Return Nothing + + 'TextBox2.ForeColor = Color.Green + Dim r As DataRow = dEZOLL.Rows(0) + + LRN = r.Item("LRN") + + If Not SQL.IsNull(r.Item("OperatorID")) Then + Select Case r.Item("OperatorID") + Case "1" + VERAG_NCTS.Company = "VERAG" + VERAG_NCTS.Department = "SUB" + Case "2" + VERAG_NCTS.Company = "VERAG" + VERAG_NCTS.Department = "SBG" + + Case "3" + VERAG_NCTS.Company = "VERAG" + VERAG_NCTS.Department = "NKD" + Case "4", "5" + VERAG_NCTS.Company = "ATILLA" + VERAG_NCTS.Department = "SUB" + Case "6" + If LRN.StartsWith("4801") Then + VERAG_NCTS.Company = "ATILLA" + Else + VERAG_NCTS.Company = "VERAG" + End If + VERAG_NCTS.Department = "SUB" + Case "8" + VERAG_NCTS.Company = "DURMAZ" + VERAG_NCTS.Department = "SBG" + Return Nothing + Case Else + VERAG_NCTS.Company = "ATILLA" + VERAG_NCTS.Department = "SUB" + + End Select + End If + + + If r.Item("GeaendertAm") IsNot DBNull.Value AndAlso IsDate(r.Item("GeaendertAm")) Then + VERAG_NCTS.ProcessData.TransactionDate = CDate(r.Item("GeaendertAm")) 'default + Else + VERAG_NCTS.ProcessData.TransactionDate = Now.ToShortDateString + End If + + VERAG_NCTS.ProcessData.MRN = r.Item("CRN") + VERAG_NCTS.ProcessData.ReferenzNumber = LRN + + Select Case (SQL.getValueTxtBySql("SELECT ErledigungsTypID FROM zsAnmDHFRefs WHERE AnmID=" & AnmID & " ORDER BY GeaendertAm DESC", "EZOLL")) + Case "F" + VERAG_NCTS.ProcessData.Status = 50 + Case "FB" + VERAG_NCTS.ProcessData.Status = 60 + Case Else + VERAG_NCTS.ProcessData.Status = 0 + End Select + + Dim DTzsAnmHea As DataTable = SQL.loadDgvBySql("SELECT * FROM zsAnmHea WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ")", "EZOLL") + If DTzsAnmHea.Rows().Count > 0 Then + Dim rDTzsAnmHea = DTzsAnmHea.Rows(0) + VERAG_NCTS.ProcessData.ProcedureCode = rDTzsAnmHea("DecTy") + VERAG_NCTS.NCTS_Data.SumGrossWeight = rDTzsAnmHea("TotGross") 'If(NCTS_TMP.ncts_GesamtRohmasse, "0") + VERAG_NCTS.ProcessData.TransactionDate = CDate(rDTzsAnmHea("DecDT")) + End If + + + + VERAG_NCTS.NCTS_Data.DepartureCustomsOffice = SQL.isleernothing(SQL.getValueTxtBySql("SELECT Ref FROM zsAnmDepCO WHERE AnmID=" & AnmID & " ORDER BY GeaendertAm DESC", "EZOLL")) + VERAG_NCTS.NCTS_Data.DatDeterminationLimit = SQL.isleernothing(SQL.getValueTxtBySql("SELECT DLimit FROM zsAnmCtrlRslt WHERE AnmID=" & AnmID & " ORDER BY GeaendertAm DESC", "EZOLL")) + + 'BestimmungsstelleDienststelle + Dim DTzsAnmDestCo As DataTable = SQL.loadDgvBySql("SELECT Ref FROM zsAnmDestCo WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ")", "EZOLL") + If DTzsAnmDestCo.Rows().Count > 0 Then + If Not SQL.IsNull(DTzsAnmDestCo.Rows(0).Item("ref")) Then VERAG_NCTS.NCTS_Data.DestinationCustomsOffice = DTzsAnmDestCo.Rows(0).Item("ref") + End If + + ' Kennzeichen + Dim DTzsAnmTransp As DataTable = SQL.loadDgvBySql("SELECT DepIdnt FROM zsAnmTransp WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ")", "EZOLL") + If DTzsAnmTransp.Rows().Count > 0 Then + If Not SQL.IsNull(DTzsAnmTransp.Rows(0).Item("DepIdnt")) Then + VERAG_NCTS.NCTS_Data.LicensePlate = DTzsAnmTransp.Rows(0).Item("DepIdnt") + End If + End If + + 'Versender + Dim DTzsAnmSender As DataTable = SQL.loadDgvBySql("SELECT * FROM [zsAnmConorTra] WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ")", "EZOLL") + If DTzsAnmSender.Rows().Count > 0 Then + 'VERAG_NCTS.NCTS_Data.Sender.Name = DTzsAnmSender.Rows(0).Item("Na") + If Not SQL.IsNull(DTzsAnmSender.Rows(0).Item("Na")) Then VERAG_NCTS.NCTS_Data.Consignee.Name = DTzsAnmSender.Rows(0).Item("Na") + If Not SQL.IsNull(DTzsAnmSender.Rows(0).Item("Pst")) Then VERAG_NCTS.NCTS_Data.Sender.Adress.Postcode = DTzsAnmSender.Rows(0).Item("Pst") + If Not SQL.IsNull(DTzsAnmSender.Rows(0).Item("Strt")) Then VERAG_NCTS.NCTS_Data.Sender.Adress.Street = DTzsAnmSender.Rows(0).Item("Strt") + If Not SQL.IsNull(DTzsAnmSender.Rows(0).Item("Cty")) Then VERAG_NCTS.NCTS_Data.Sender.Adress.City = DTzsAnmSender.Rows(0).Item("Cty") + If Not SQL.IsNull(DTzsAnmSender.Rows(0).Item("Ctry")) Then + VERAG_NCTS.NCTS_Data.Sender.Adress.Country = DTzsAnmSender.Rows(0).Item("Ctry") + VERAG_NCTS.NCTS_Data.DepartureCountry = DTzsAnmSender.Rows(0).Item("Ctry") + End If + If Not SQL.IsNull(DTzsAnmSender.Rows(0).Item("TIN")) Then VERAG_NCTS.NCTS_Data.Sender.EORI = DTzsAnmSender.Rows(0).Item("TIN") + 'VERAG_NCTS.NCTS_Data.Sender.EORI_NL = If(NCTS_TMP.ncts_Empfaenger_NLNR, "") + 'VERAG_NCTS.NCTS_Data.Sender.UID_Nr = If(NCTS_TMP.ncts_Empfaenger_NLNR, "") + End If + + + 'Empfänger + Dim DTzsAnmConeeTra As DataTable = SQL.loadDgvBySql("SELECT * FROM zsAnmConeeTra WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ")", "EZOLL") + If DTzsAnmConeeTra.Rows().Count > 0 Then + If Not SQL.IsNull(DTzsAnmConeeTra.Rows(0).Item("Na")) Then VERAG_NCTS.NCTS_Data.Consignee.Name = DTzsAnmConeeTra.Rows(0).Item("Na") + If Not SQL.IsNull(DTzsAnmConeeTra.Rows(0).Item("Pst")) Then VERAG_NCTS.NCTS_Data.Consignee.Adress.Postcode = DTzsAnmConeeTra.Rows(0).Item("Pst") + If Not SQL.IsNull(DTzsAnmConeeTra.Rows(0).Item("Strt")) Then VERAG_NCTS.NCTS_Data.Consignee.Adress.Street = DTzsAnmConeeTra.Rows(0).Item("Strt") + If Not SQL.IsNull(DTzsAnmConeeTra.Rows(0).Item("Cty")) Then VERAG_NCTS.NCTS_Data.Consignee.Adress.City = DTzsAnmConeeTra.Rows(0).Item("Cty") + If Not SQL.IsNull(DTzsAnmConeeTra.Rows(0).Item("Ctry")) Then + VERAG_NCTS.NCTS_Data.Consignee.Adress.Country = DTzsAnmConeeTra.Rows(0).Item("Ctry") + VERAG_NCTS.NCTS_Data.DestinationCountry = DTzsAnmConeeTra.Rows(0).Item("Ctry") + End If + If Not SQL.IsNull(DTzsAnmConeeTra.Rows(0).Item("TIN")) Then VERAG_NCTS.NCTS_Data.Consignee.EORI = DTzsAnmConeeTra.Rows(0).Item("TIN") + 'VERAG_NCTS.NCTS_Data.Consignee.EORI_NL = If(NCTS_TMP.ncts_Empfaenger_NLNR, "") + 'VERAG_NCTS.NCTS_Data.Consignee.UID_Nr = If(NCTS_TMP.ncts_Empfaenger_NLNR, "") + End If + + + 'Frächter + 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 + If Not SQL.IsNull(DTzsAnmCarrier.Rows(0).Item("Na")) Then VERAG_NCTS.NCTS_Data.Consignee.Name = DTzsAnmCarrier.Rows(0).Item("Na") + If Not SQL.IsNull(DTzsAnmCarrier.Rows(0).Item("Pst")) Then VERAG_NCTS.NCTS_Data.Carrier.Adress.Postcode = DTzsAnmCarrier.Rows(0).Item("Pst") + If Not SQL.IsNull(DTzsAnmCarrier.Rows(0).Item("Strt")) Then VERAG_NCTS.NCTS_Data.Carrier.Adress.Street = DTzsAnmCarrier.Rows(0).Item("Strt") + If Not SQL.IsNull(DTzsAnmCarrier.Rows(0).Item("Cty")) Then VERAG_NCTS.NCTS_Data.Carrier.Adress.City = DTzsAnmCarrier.Rows(0).Item("Cty") + If Not SQL.IsNull(DTzsAnmCarrier.Rows(0).Item("Ctry")) Then VERAG_NCTS.NCTS_Data.Carrier.Adress.Country = DTzsAnmCarrier.Rows(0).Item("Ctry") + If Not SQL.IsNull(DTzsAnmCarrier.Rows(0).Item("TIN")) Then VERAG_NCTS.NCTS_Data.Carrier.EORI = DTzsAnmCarrier.Rows(0).Item("TIN") + 'VERAG_NCTS.NCTS_Data.Carrier.EORI_NL = If(NCTS_TMP.ncts_Empfaenger_NLNR, "") + 'VERAG_NCTS.NCTS_Data.Carrier.UID_Nr = If(NCTS_TMP.ncts_Empfaenger_NLNR, "") + End If + + + ' Tabelle zsAnmGrteeGrteeRef lesen. + Dim DTzsAnmGrteeGrteeRef As DataTable = SQL.loadDgvBySql("SELECT GRN, GVal" & + " FROM zsAnmGrteeGrteeRef" & + " WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ")" & + " ORDER BY GrteeID, GrteeRefID", "EZOLL") + + If DTzsAnmGrteeGrteeRef.Rows().Count > 0 Then + VERAG_NCTS.NCTS_Data.Guarantee.Amount = 0 + For Each DTzsAnmGrteeGrteeRef_row In DTzsAnmGrteeGrteeRef.Rows() + If Not SQL.IsNull(DTzsAnmGrteeGrteeRef_row.item("GRN")) Then VERAG_NCTS.NCTS_Data.Guarantee.GRN = DTzsAnmGrteeGrteeRef_row.item("GRN") + If Not SQL.IsNull(DTzsAnmGrteeGrteeRef_row.item("GVal")) Then VERAG_NCTS.NCTS_Data.Guarantee.Amount += DTzsAnmGrteeGrteeRef_row.item("GVal") + Next + End If + + 'POSITIONEN + Dim cntPos = 1 + Dim DTzsAnmGdsitem As DataTable = SQL.loadDgvBySql("SELECT * FROM zsAnmGdsitem WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ") ORDER BY GdsItemID", "EZOLL") + If DTzsAnmGdsitem.Rows().Count > 0 Then + For Each DTzsAnmGdsitem_row In DTzsAnmGdsitem.Rows() + Dim V_POS As New VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_nctsNCTS_DataPosition + V_POS.PosNr = cntPos + Dim pkGes = 0 + Dim pkArt = "" + + Dim DTzsAnmGdsitemPk As DataTable = SQL.loadDgvBySql("SELECT * FROM [zsAnmGdsItemPack] WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ") AND GdsItemID='" & DTzsAnmGdsitem_row.Item("GdsItemID") & "' ORDER BY GdsItemID", "EZOLL") + If DTzsAnmGdsitemPk.Rows().Count > 0 Then + For Each DTzsAnmGdsitemPk_row In DTzsAnmGdsitemPk.Rows() + If Not SQL.IsNull(DTzsAnmGdsitemPk_row.item("Kind")) Then pkArt = DTzsAnmGdsitemPk_row.item("Kind") + If Not SQL.IsNull(DTzsAnmGdsitemPk_row.item("Nr")) Then pkGes += DTzsAnmGdsitemPk_row.item("Nr") + Next + End If + + V_POS.Quantity = pkGes + V_POS.Packaging = pkArt + If Not SQL.IsNull(DTzsAnmGdsitem_row.item("Gross")) Then V_POS.GrossWeight = DTzsAnmGdsitem_row.item("Gross") + + V_POS.GoodsDescription = DTzsAnmGdsitem_row.item("GdsDes") + + VERAG_NCTS.NCTS_Data.Position.Add(V_POS) + cntPos += 1 + Next + End If + + + UniqueId = AnmID + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine & "BezugsNr: " & LRN, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Return Nothing + End Try + Return VERAG_NCTS + + End Function + + Shared Function getGRTY_fromEZOLL(LRN As String) As String + Try + Return SQL.getValueTxtBySql("SELECT TOP 1 GRN FROM zsAnmRefs inner join zsAnmGrteeGrteeRef on zsAnmGrteeGrteeRef.AnmID=zsAnmRefs.AnmID WHERE (zsAnmRefs.VorgangID = 'AV') AND (LRN = '" & LRN & "')", "EZOLL") + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine & "BezugsNr: " & LRN, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return "" + End Function + + Shared Function genVERAG_OUT_NCTS_FromTELOTEC(NCTS_TMP As TELOTEC_Worker.cTelotec_Anmeldung, ByRef UniqueId As String) As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts + Dim VERAG_NCTS As New VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts + Try + If NCTS_TMP Is Nothing Then Return Nothing + If NCTS_TMP.telanm_BezugsNr Is Nothing Then Return Nothing + If NCTS_TMP.Hea_DecTy Is Nothing Then Return Nothing + If NCTS_TMP.Hea_DecTy <> "T1" And NCTS_TMP.Hea_DecTy <> "T2" And NCTS_TMP.Hea_DecTy <> "T2L" And NCTS_TMP.Hea_DecTy <> "T-" Then Return Nothing + + VERAG_NCTS.Version = "2.0.0" ' Automaitsch, weil default ' doch nicht? + + If NCTS_TMP.telanm_firma <> "" Then + VERAG_NCTS.Company = NCTS_TMP.telanm_firma + Else + VERAG_NCTS.Company = "IMEX" + End If + VERAG_NCTS.Department = NCTS_TMP.telanm_niederlassung + + + 'VERAG_NCTS.InternalReference.OfficeCode = If( + 'VERAG_NCTS.InternalReference.PositionNumber = NCTS_TMP.ncts_niederlassung + Select Case NCTS_TMP.telanm_Status + Case < 50 + VERAG_NCTS.ProcessData.Status = 0 + Case 50, 53 + VERAG_NCTS.ProcessData.Status = 50 + Case 60 + VERAG_NCTS.ProcessData.Status = 60 + End Select + + VERAG_NCTS.ProcessData.TransactionDate = NCTS_TMP.dec_CreateDate + + VERAG_NCTS.ProcessData.MRN = If(NCTS_TMP.telanm_CRN, "") + VERAG_NCTS.ProcessData.ReferenzNumber = If(NCTS_TMP.telanm_BezugsNr, "") + VERAG_NCTS.ProcessData.ProcedureCode = If(NCTS_TMP.telanm_ART, "") + + VERAG_NCTS.NCTS_Data.DatDeterminationLimit = If(NCTS_TMP.CtrlRslt_DLimit, "") + VERAG_NCTS.NCTS_Data.LicensePlate = If(NCTS_TMP.Transp_DepIdnt, "") + VERAG_NCTS.NCTS_Data.DepartureCustomsOffice = If(NCTS_TMP.DepCO_Ref, "") + VERAG_NCTS.NCTS_Data.DestinationCustomsOffice = If(NCTS_TMP.DestCO_Ref, "") + VERAG_NCTS.NCTS_Data.DepartureCountry = NCTS_TMP.Locs_Disp + VERAG_NCTS.NCTS_Data.DestinationCountry = If(NCTS_TMP.Locs_Dest, "") + + 'Versender + VERAG_NCTS.NCTS_Data.Sender.Name = If(NCTS_TMP.ConorTra_Na, "") + VERAG_NCTS.NCTS_Data.Sender.EORI = If(NCTS_TMP.ConorTra_TIN, "") + 'VERAG_NCTS.NCTS_Data.Sender.EORI_NL = If(NCTS_TMP.ncts_Versender_NLNR, "") + VERAG_NCTS.NCTS_Data.Sender.UID_Nr = If(NCTS_TMP.ConorTra_UIDCtry, "") & If(NCTS_TMP.ConorTra_UID, "") + VERAG_NCTS.NCTS_Data.Sender.Adress.Country = If(NCTS_TMP.ConorTra_Ctry, "") + VERAG_NCTS.NCTS_Data.Sender.Adress.Postcode = If(NCTS_TMP.ConorTra_Pst, "") + VERAG_NCTS.NCTS_Data.Sender.Adress.Street = If(NCTS_TMP.ConorTra_Strt, "") + VERAG_NCTS.NCTS_Data.Sender.Adress.City = If(NCTS_TMP.ConorTra_Cty, "") + + 'Empfänger + VERAG_NCTS.NCTS_Data.Consignee.Name = If(NCTS_TMP.ConeeTra_Na, "") + VERAG_NCTS.NCTS_Data.Consignee.EORI = If(NCTS_TMP.ConeeTra_TIN, "") + 'VERAG_NCTS.NCTS_Data.Consignee.EORI_NL = If(NCTS_TMP.ncts_Versender_NLNR, "") + VERAG_NCTS.NCTS_Data.Consignee.UID_Nr = If(NCTS_TMP.ConeeTra_UIDCtry, "") & If(NCTS_TMP.ConeeTra_UID, "") + VERAG_NCTS.NCTS_Data.Consignee.Adress.Country = If(NCTS_TMP.ConeeTra_Ctry, "") + VERAG_NCTS.NCTS_Data.Consignee.Adress.Postcode = If(NCTS_TMP.ConeeTra_Pst, "") + 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 + 'VERAG_NCTS.NCTS_Data.Carrier.Name = If(NCTS_TMP.ConorTra_Na, "") + 'VERAG_NCTS.NCTS_Data.Carrier.EORI = If(NCTS_TMP.ConorTra_TIN, "") + ''VERAG_NCTS.NCTS_Data.Carrier.EORI_NL = If(NCTS_TMP.ncts_Versender_NLNR, "") + 'VERAG_NCTS.NCTS_Data.Carrier.UID_Nr = If(NCTS_TMP.ConorTra_UIDCtry, "") & If(NCTS_TMP.ConorTra_UID, "") + 'VERAG_NCTS.NCTS_Data.Carrier.Adress.Country = If(NCTS_TMP.ConorTra_Ctry, "") + '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, "") + + 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") + End If + + VERAG_NCTS.NCTS_Data.SumGrossWeight = If(NCTS_TMP.Hea_TotGross, "0") + Dim cntPos = 1 + If NCTS_TMP.POSITIONSDATEN IsNot Nothing Then + For Each POS In NCTS_TMP.POSITIONSDATEN + Dim V_POS As New VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_nctsNCTS_DataPosition + V_POS.PosNr = cntPos + Dim pkGes = 0 + Dim pkArt = "" + If POS.PACKSTUECKE IsNot Nothing Then + For Each PK In POS.PACKSTUECKE + If PK.Pack_Nr IsNot Nothing Then pkGes += PK.Pack_Nr 'verpackt + If PK.Pack_Piec IsNot Nothing Then pkGes += PK.Pack_Piec 'unverpackt + If PK.Pack_Kind IsNot Nothing Then pkArt = PK.Pack_Kind + Next + End If + V_POS.Quantity = pkGes + V_POS.Packaging = pkArt + V_POS.GrossWeight = POS.Item_Gross + V_POS.GoodsDescription = POS.Item_GdsDes + + VERAG_NCTS.NCTS_Data.Position.Add(V_POS) + cntPos += 1 + Next + End If + UniqueId = NCTS_TMP.telanm_id + + 'If XMLFilePath = "" Then + ' Dim dir = "\\192.168.0.91\Datenarchiv\ZOLL_SCHNITTSTELLEN\VERAG\NCTS_OUT\TC\" & Now.Year & "\" & Now.ToShortDateString & "\" + ' If Not IO.Directory.Exists(dir) Then IO.Directory.CreateDirectory(dir) + ' XMLFilePath = dir & "VERAG_NCTS_OUT_" & Now.ToString("ddMMyyyHHmmss") & "_TC_" & NCTS_TMP.telanm_id & ".xml" + 'End If + + + 'VERAG_NCTS.SaveToFile(XMLFilePath) + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine & "BezugsNr: " & NCTS_TMP.telanm_BezugsNr, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Return Nothing + End Try + Return VERAG_NCTS + + End Function + + + Shared Function insertFTPLOG(filePath As String, user As String, NCTS_VERAG_OUT As VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_ncts, vorsystem As String) + Return SQL.doSQL("INSERT INTO tblFTP_Log (ftp_filepath,ftp_user,ftp_BezugsNr,ftp_art,ftp_status,ftp_vorsystem) VALUES ('" & filePath & "','" & user & "','" & NCTS_VERAG_OUT.ProcessData.ReferenzNumber & "','" & NCTS_VERAG_OUT.ProcessData.ProcedureCode & "','" & NCTS_VERAG_OUT.ProcessData.Status & "','" & vorsystem & "')", "FMZOLL") + End Function + + + Shared Function insertFTPLOG(filePath, user, ftp_BezugsNr, ftp_art, ftp_status, ftp_vorsystem) + Return SQL.doSQL("INSERT INTO tblFTP_Log (ftp_filepath,ftp_user,ftp_BezugsNr,ftp_art,ftp_status,ftp_vorsystem) VALUES ('" & filePath & "','" & user & "','" & ftp_BezugsNr & "','" & ftp_art & "','" & ftp_status & "','" & ftp_vorsystem & "')", "FMZOLL") + End Function + + +End Class diff --git a/initATLASAufschubkonten/cWorker_NCTS.vb b/initATLASAufschubkonten/cWorker_NCTS.vb index b2c9866..8be307e 100644 --- a/initATLASAufschubkonten/cWorker_NCTS.vb +++ b/initATLASAufschubkonten/cWorker_NCTS.vb @@ -320,6 +320,18 @@ Public Class cWorker_NCTS WP.nctsWP_PACKSTUECKE.Add(PST) Next End If + + + If GOODSITEM.Document IsNot Nothing AndAlso GOODSITEM.Document.Count > 0 Then + For Each ULdoc In GOODSITEM.Document + Dim UL = New DAKOSY_Worker.cDakosy_NCTSOut_WarenpositionVorgelegteUnterlagen() + UL.nctsWpUl_Referenz = ULdoc.ReferenceNumber + UL.nctsWpUl_Typ = ULdoc.Type + UL.nctsWpUl_Zusatz = ULdoc.Complement + WP.nctsWP_UNTERLAGEN.Add(UL) + Next + End If + NCTS.ncts_WARENPOS.Add(WP) Next End If @@ -1461,9 +1473,10 @@ Public Class cWorker_NCTS If DY_TMP IsNot Nothing Then STATUS.dySt_dyId = DY_TMP.dy_Id STATUS.SAVE() statusTMP = STATUS - copyFileFTP(NCTS_TMP, DY_TMP) - 'If If(NCTS_TMP.ncts_firma, "") = "IMEX" Then NCTS_TMP.insertIntoSpedBuch(DY_TMP) + + ' BEREITSTELLUNG DER DATEN AN FREMDSYSTEME + cVERAG_Interface.copyFileFTP_VERAGncts_DY(NCTS_TMP, DY_TMP) NCTS_TMP.insertIntoSpedBuch(DY_TMP) @@ -1673,6 +1686,9 @@ Public Class cWorker_NCTS If DY_TMP IsNot Nothing Then STATUS.dySt_dyId = DY_TMP.dy_Id STATUS.SAVE() + ' BEREITSTELLUNG DER DATEN AN FREMDSYSTEME + cVERAG_Interface.copyFileFTP_VERAGncts_DY(NCTS_TMP, DY_TMP) + FORM.addDGVEinarbeitung("NCTS: Erledigungsmeldung", STATUS.dySt_BezugsNr) End If @@ -1741,7 +1757,7 @@ Public Class cWorker_NCTS If DY_TMP IsNot Nothing Then STATUS.dySt_dyId = DY_TMP.dy_Id STATUS.SAVE() statusTMP = STATUS - copyFileFTP(NCTS_TMP, DY_TMP) + cVERAG_Interface.copyFileFTP_VERAGncts_DY(NCTS_TMP, DY_TMP) ' If If(NCTS_TMP.ncts_firma, "") = "IMEX" Then NCTS_TMP.insertIntoSpedBuch(DY_TMP) @@ -1816,7 +1832,7 @@ Public Class cWorker_NCTS If DY_TMP IsNot Nothing Then STATUS.dySt_dyId = DY_TMP.dy_Id STATUS.SAVE() statusTMP = STATUS - copyFileFTP(NCTS_TMP, DY_TMP) + cVERAG_Interface.copyFileFTP_VERAGncts_DY(NCTS_TMP, DY_TMP) ' If If(NCTS_TMP.ncts_firma, "") = "IMEX" Then NCTS_TMP.insertIntoSpedBuch(DY_TMP) @@ -1831,45 +1847,6 @@ Public Class cWorker_NCTS End Try End Function - Shared Function copyFileFTP(NCTS_TMP As DAKOSY_Worker.cDakosyNCTSOut, DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen) ', filePath As String) - Try - If NCTS_TMP Is Nothing Then Return False - If NCTS_TMP.ncts_ObjectName Is Nothing Then Return False - If NCTS_TMP.ncts_ObjectName.ToString.StartsWith("DU") Then Return False - If NCTS_TMP.ncts_firma.ToString = "DURMAZ" Then Return False - - 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") - If filePath = "" Then Return False - - NCTS_TMP.LOAD_Sicherheitsangaben() - If NCTS_TMP.ncts_SICHERHEITSANGABEN IsNot Nothing AndAlso NCTS_TMP.ncts_SICHERHEITSANGABEN.Count > 0 Then - Dim GRN = NCTS_TMP.ncts_SICHERHEITSANGABEN(0).nctsSA_GRN - Dim destFile = "" - Select Case GRN - ' --> FTP Bereitstellung - '\\192.168.0.91\Datenarchiv\DAKOSY\ECHTSYSTEM\FTP\TOBB - Case "15TR0004000020917", "12TR0004000004665", "17TR0004000032349" - frmStartOptions.copyFile(filePath, "\\ftps.verag.ag\FTP\TOBB\OUT\", destFile) - If IO.File.Exists(destFile) Then insertFTPLOG(destFile, "TOBB") Else VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Datei existiert nicht: " & destFile & vbNewLine & NCTS_TMP.ncts_ObjectName, "", "copyFileFTP") - Case "18DE0000000073276", "19DE0000000075520", "18DE0000000075520" - frmStartOptions.copyFile(filePath, "\\ftps.verag.ag\FTP\OREGON\OUT\", destFile) - If IO.File.Exists(destFile) Then insertFTPLOG(destFile, "OREGON") Else VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Datei existiert nicht: " & destFile & vbNewLine & NCTS_TMP.ncts_ObjectName, "", "copyFileFTP") - Case "17DE0000000071678", "05AT510000G000FP7" 'VERAG - frmStartOptions.copyFile(filePath, "\\192.168.0.91\Datenarchiv\DAKOSY\ECHTSYSTEM\FTP\VERAG\", destFile) - If IO.File.Exists(destFile) Then insertFTPLOG(destFile, "VERAG") Else VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Datei existiert nicht: " & destFile & vbNewLine & NCTS_TMP.ncts_ObjectName, "", "copyFileFTP") - End Select - End If - Return True - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) - Return False - End Try - End Function - - Shared Function insertFTPLOG(filePath, user) - Return SQL.doSQL("INSERT INTO tblFTP_Log (ftp_filepath,ftp_user) VALUES ('" & filePath & "','" & user & "')", "FMZOLL") - End Function - Shared Sub SaveNCTS_WGDAT(ByRef NCTS_TMP As DAKOSY_Worker.cDakosyNCTSOut, WGDAT As Object) If WGDAT IsNot Nothing AndAlso IsDate(WGDAT) Then diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index 3a9a24b..f679c06 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -24,6 +24,8 @@ 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.PictureBox13 = New System.Windows.Forms.PictureBox() + Me.LinkLabel26 = New System.Windows.Forms.LinkLabel() Me.CheckBox2 = New System.Windows.Forms.CheckBox() Me.LinkLabel25 = New System.Windows.Forms.LinkLabel() Me.LinkLabel23 = New System.Windows.Forms.LinkLabel() @@ -77,8 +79,19 @@ Partial Class frmStartOptions Me.lklAufschubkontenATLASEZOLL = New System.Windows.Forms.LinkLabel() Me.lblRoutineManager = New System.Windows.Forms.Label() Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.tbcntr = New System.Windows.Forms.TabControl() + Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.LinkLabel27 = New System.Windows.Forms.LinkLabel() + Me.Label6 = New System.Windows.Forms.Label() + Me.Label7 = New System.Windows.Forms.Label() Me.Button1 = New System.Windows.Forms.Button() + Me.txtVRGOut_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label8 = New System.Windows.Forms.Label() + Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.PictureBox14 = New System.Windows.Forms.PictureBox() Me.pnl.SuspendLayout() + CType(Me.PictureBox13, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox12, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit() @@ -92,21 +105,19 @@ Partial Class frmStartOptions CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picC0008, System.ComponentModel.ISupportInitialize).BeginInit() + Me.tbcntr.SuspendLayout() + Me.TabPage1.SuspendLayout() + Me.TabPage2.SuspendLayout() + CType(Me.PictureBox14, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnl ' Me.pnl.BackColor = System.Drawing.Color.White Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.pnl.Controls.Add(Me.Button1) + Me.pnl.Controls.Add(Me.tbcntr) Me.pnl.Controls.Add(Me.CheckBox2) Me.pnl.Controls.Add(Me.LinkLabel25) - Me.pnl.Controls.Add(Me.LinkLabel23) - Me.pnl.Controls.Add(Me.LinkLabel24) - Me.pnl.Controls.Add(Me.Label5) - Me.pnl.Controls.Add(Me.LinkLabel21) - Me.pnl.Controls.Add(Me.LinkLabel22) - Me.pnl.Controls.Add(Me.Label4) Me.pnl.Controls.Add(Me.CheckBox1) Me.pnl.Controls.Add(Me.cbxBu) Me.pnl.Controls.Add(Me.cbxKd) @@ -121,32 +132,8 @@ Partial Class frmStartOptions Me.pnl.Controls.Add(Me.LinkLabel18) Me.pnl.Controls.Add(Me.PictureBox9) Me.pnl.Controls.Add(Me.LinkLabel17) - Me.pnl.Controls.Add(Me.PictureBox8) - Me.pnl.Controls.Add(Me.LinkLabel16) - Me.pnl.Controls.Add(Me.LinkLabel15) Me.pnl.Controls.Add(Me.cbxHistory) - Me.pnl.Controls.Add(Me.PictureBox7) - Me.pnl.Controls.Add(Me.LinkLabel14) - Me.pnl.Controls.Add(Me.PictureBox6) - Me.pnl.Controls.Add(Me.LinkLabel13) - Me.pnl.Controls.Add(Me.PictureBox5) - Me.pnl.Controls.Add(Me.LinkLabel12) - Me.pnl.Controls.Add(Me.PictureBox4) - Me.pnl.Controls.Add(Me.LinkLabel11) - Me.pnl.Controls.Add(Me.PictureBox3) - Me.pnl.Controls.Add(Me.LinkLabel10) - Me.pnl.Controls.Add(Me.LinkLabel9) - Me.pnl.Controls.Add(Me.PictureBox2) - Me.pnl.Controls.Add(Me.LinkLabel8) - Me.pnl.Controls.Add(Me.PictureBox1) - Me.pnl.Controls.Add(Me.LinkLabel7) - Me.pnl.Controls.Add(Me.LinkLabel6) - Me.pnl.Controls.Add(Me.LinkLabel5) - Me.pnl.Controls.Add(Me.Label2) - Me.pnl.Controls.Add(Me.picC0008) Me.pnl.Controls.Add(Me.btn) - Me.pnl.Controls.Add(Me.LinkLabel4) - Me.pnl.Controls.Add(Me.Label1) Me.pnl.Controls.Add(Me.LinkLabel2) Me.pnl.Controls.Add(Me.LinkLabel1) Me.pnl.Controls.Add(Me.LinkLabel3) @@ -158,13 +145,35 @@ Partial Class frmStartOptions Me.pnl.Size = New System.Drawing.Size(790, 677) Me.pnl.TabIndex = 0 ' + 'PictureBox13 + ' + Me.PictureBox13.BackgroundImage = CType(resources.GetObject("PictureBox13.BackgroundImage"), System.Drawing.Image) + Me.PictureBox13.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox13.Location = New System.Drawing.Point(129, 120) + Me.PictureBox13.Name = "PictureBox13" + Me.PictureBox13.Size = New System.Drawing.Size(18, 18) + Me.PictureBox13.TabIndex = 54 + Me.PictureBox13.TabStop = False + Me.PictureBox13.Visible = False + ' + 'LinkLabel26 + ' + Me.LinkLabel26.AutoSize = True + Me.LinkLabel26.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.LinkLabel26.Location = New System.Drawing.Point(13, 125) + Me.LinkLabel26.Name = "LinkLabel26" + Me.LinkLabel26.Size = New System.Drawing.Size(95, 13) + Me.LinkLabel26.TabIndex = 10 + Me.LinkLabel26.TabStop = True + Me.LinkLabel26.Text = "I0700 - Maßeinheit" + ' 'CheckBox2 ' Me.CheckBox2.AutoSize = True Me.CheckBox2.Location = New System.Drawing.Point(302, 151) Me.CheckBox2.Name = "CheckBox2" Me.CheckBox2.Size = New System.Drawing.Size(98, 17) - Me.CheckBox2.TabIndex = 51 + Me.CheckBox2.TabIndex = 13 Me.CheckBox2.Text = "History (7Tage)" Me.CheckBox2.UseVisualStyleBackColor = True ' @@ -175,7 +184,7 @@ Partial Class frmStartOptions Me.LinkLabel25.Location = New System.Drawing.Point(299, 135) Me.LinkLabel25.Name = "LinkLabel25" Me.LinkLabel25.Size = New System.Drawing.Size(99, 13) - Me.LinkLabel25.TabIndex = 50 + Me.LinkLabel25.TabIndex = 12 Me.LinkLabel25.TabStop = True Me.LinkLabel25.Text = "ZOLARIS Anhänge" ' @@ -183,10 +192,10 @@ Partial Class frmStartOptions ' Me.LinkLabel23.AutoSize = True Me.LinkLabel23.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel23.Location = New System.Drawing.Point(299, 620) + Me.LinkLabel23.Location = New System.Drawing.Point(295, 313) Me.LinkLabel23.Name = "LinkLabel23" Me.LinkLabel23.Size = New System.Drawing.Size(180, 13) - Me.LinkLabel23.TabIndex = 49 + Me.LinkLabel23.TabIndex = 21 Me.LinkLabel23.TabStop = True Me.LinkLabel23.Text = "Eingangsnachrichten abrufen PROD" ' @@ -194,10 +203,10 @@ Partial Class frmStartOptions ' Me.LinkLabel24.AutoSize = True Me.LinkLabel24.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel24.Location = New System.Drawing.Point(299, 595) + Me.LinkLabel24.Location = New System.Drawing.Point(295, 288) Me.LinkLabel24.Name = "LinkLabel24" Me.LinkLabel24.Size = New System.Drawing.Size(177, 13) - Me.LinkLabel24.TabIndex = 48 + Me.LinkLabel24.TabIndex = 19 Me.LinkLabel24.TabStop = True Me.LinkLabel24.Text = "Eingangsnachrichten abrufen TEST" ' @@ -205,20 +214,20 @@ Partial Class frmStartOptions ' Me.Label5.AutoSize = True Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label5.Location = New System.Drawing.Point(299, 568) + Me.Label5.Location = New System.Drawing.Point(295, 261) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(184, 13) - Me.Label5.TabIndex = 47 + Me.Label5.TabIndex = 17 Me.Label5.Text = "MDM Nachrichtenverarbeitung:" ' 'LinkLabel21 ' Me.LinkLabel21.AutoSize = True Me.LinkLabel21.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel21.Location = New System.Drawing.Point(15, 620) + Me.LinkLabel21.Location = New System.Drawing.Point(11, 313) Me.LinkLabel21.Name = "LinkLabel21" Me.LinkLabel21.Size = New System.Drawing.Size(180, 13) - Me.LinkLabel21.TabIndex = 46 + Me.LinkLabel21.TabIndex = 20 Me.LinkLabel21.TabStop = True Me.LinkLabel21.Text = "Eingangsnachrichten abrufen PROD" ' @@ -226,10 +235,10 @@ Partial Class frmStartOptions ' Me.LinkLabel22.AutoSize = True Me.LinkLabel22.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel22.Location = New System.Drawing.Point(15, 595) + Me.LinkLabel22.Location = New System.Drawing.Point(11, 288) Me.LinkLabel22.Name = "LinkLabel22" Me.LinkLabel22.Size = New System.Drawing.Size(177, 13) - Me.LinkLabel22.TabIndex = 45 + Me.LinkLabel22.TabIndex = 18 Me.LinkLabel22.TabStop = True Me.LinkLabel22.Text = "Eingangsnachrichten abrufen TEST" ' @@ -237,10 +246,10 @@ Partial Class frmStartOptions ' Me.Label4.AutoSize = True Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label4.Location = New System.Drawing.Point(15, 568) + Me.Label4.Location = New System.Drawing.Point(11, 261) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(211, 13) - Me.Label4.TabIndex = 44 + Me.Label4.TabIndex = 16 Me.Label4.Text = "TELOTEC Nachrichtenverarbeitung:" ' 'CheckBox1 @@ -250,7 +259,7 @@ Partial Class frmStartOptions Me.CheckBox1.Location = New System.Drawing.Point(173, 220) Me.CheckBox1.Name = "CheckBox1" Me.CheckBox1.Size = New System.Drawing.Size(56, 17) - Me.CheckBox1.TabIndex = 43 + Me.CheckBox1.TabIndex = 18 Me.CheckBox1.Text = "öffnen" Me.CheckBox1.UseVisualStyleBackColor = True ' @@ -262,7 +271,7 @@ Partial Class frmStartOptions Me.cbxBu.Location = New System.Drawing.Point(87, 220) Me.cbxBu.Name = "cbxBu" Me.cbxBu.Size = New System.Drawing.Size(81, 17) - Me.cbxBu.TabIndex = 42 + Me.cbxBu.TabIndex = 17 Me.cbxBu.Text = "Buchungen" Me.cbxBu.UseVisualStyleBackColor = True ' @@ -274,7 +283,7 @@ Partial Class frmStartOptions Me.cbxKd.Location = New System.Drawing.Point(18, 220) Me.cbxKd.Name = "cbxKd" Me.cbxKd.Size = New System.Drawing.Size(63, 17) - Me.cbxKd.TabIndex = 41 + Me.cbxKd.TabIndex = 16 Me.cbxKd.Text = "Kunden" Me.cbxKd.UseVisualStyleBackColor = True ' @@ -286,7 +295,7 @@ Partial Class frmStartOptions Me.Button9.Location = New System.Drawing.Point(18, 193) Me.Button9.Name = "Button9" Me.Button9.Size = New System.Drawing.Size(211, 24) - Me.Button9.TabIndex = 40 + Me.Button9.TabIndex = 15 Me.Button9.Text = "Kunden --> DVO" Me.Button9.UseVisualStyleBackColor = True ' @@ -297,7 +306,7 @@ Partial Class frmStartOptions Me.Label3.Location = New System.Drawing.Point(15, 177) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(138, 13) - Me.Label3.TabIndex = 39 + Me.Label3.TabIndex = 14 Me.Label3.Text = "Routine Manager IMEX" ' 'PictureBox12 @@ -318,7 +327,7 @@ Partial Class frmStartOptions Me.LinkLabel20.Location = New System.Drawing.Point(15, 135) Me.LinkLabel20.Name = "LinkLabel20" Me.LinkLabel20.Size = New System.Drawing.Size(66, 13) - Me.LinkLabel20.TabIndex = 36 + Me.LinkLabel20.TabIndex = 10 Me.LinkLabel20.TabStop = True Me.LinkLabel20.Text = "UID-Prüfung" ' @@ -340,7 +349,7 @@ Partial Class frmStartOptions Me.LinkLabel19.Location = New System.Drawing.Point(479, 99) Me.LinkLabel19.Name = "LinkLabel19" Me.LinkLabel19.Size = New System.Drawing.Size(129, 13) - Me.LinkLabel19.TabIndex = 34 + Me.LinkLabel19.TabIndex = 9 Me.LinkLabel19.TabStop = True Me.LinkLabel19.Text = "Währungskurse EZB 90D" ' @@ -362,7 +371,7 @@ Partial Class frmStartOptions Me.LinkLabel18.Location = New System.Drawing.Point(479, 78) Me.LinkLabel18.Name = "LinkLabel18" Me.LinkLabel18.Size = New System.Drawing.Size(106, 13) - Me.LinkLabel18.TabIndex = 32 + Me.LinkLabel18.TabIndex = 7 Me.LinkLabel18.TabStop = True Me.LinkLabel18.Text = "Währungskurse EZB" ' @@ -384,7 +393,7 @@ Partial Class frmStartOptions Me.LinkLabel17.Location = New System.Drawing.Point(479, 51) Me.LinkLabel17.Name = "LinkLabel17" Me.LinkLabel17.Size = New System.Drawing.Size(107, 13) - Me.LinkLabel17.TabIndex = 30 + Me.LinkLabel17.TabIndex = 4 Me.LinkLabel17.TabStop = True Me.LinkLabel17.Text = "Bundesanzeiger EZT" ' @@ -392,7 +401,7 @@ Partial Class frmStartOptions ' Me.PictureBox8.BackgroundImage = CType(resources.GetObject("PictureBox8.BackgroundImage"), System.Drawing.Image) Me.PictureBox8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox8.Location = New System.Drawing.Point(634, 397) + Me.PictureBox8.Location = New System.Drawing.Point(630, 90) Me.PictureBox8.Name = "PictureBox8" Me.PictureBox8.Size = New System.Drawing.Size(18, 18) Me.PictureBox8.TabIndex = 29 @@ -403,10 +412,10 @@ Partial Class frmStartOptions ' Me.LinkLabel16.AutoSize = True Me.LinkLabel16.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel16.Location = New System.Drawing.Point(479, 402) + Me.LinkLabel16.Location = New System.Drawing.Point(475, 95) Me.LinkLabel16.Name = "LinkLabel16" Me.LinkLabel16.Size = New System.Drawing.Size(149, 13) - Me.LinkLabel16.TabIndex = 28 + Me.LinkLabel16.TabIndex = 9 Me.LinkLabel16.TabStop = True Me.LinkLabel16.Text = "I0200 - Unterlageaerten (EZA)" ' @@ -414,10 +423,10 @@ Partial Class frmStartOptions ' Me.LinkLabel15.AutoSize = True Me.LinkLabel15.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel15.Location = New System.Drawing.Point(299, 517) + Me.LinkLabel15.Location = New System.Drawing.Point(295, 210) Me.LinkLabel15.Name = "LinkLabel15" Me.LinkLabel15.Size = New System.Drawing.Size(183, 13) - Me.LinkLabel15.TabIndex = 27 + Me.LinkLabel15.TabIndex = 15 Me.LinkLabel15.TabStop = True Me.LinkLabel15.Text = "VERAG Kundendaten senden PROD" ' @@ -427,7 +436,7 @@ Partial Class frmStartOptions Me.cbxHistory.Location = New System.Drawing.Point(18, 95) Me.cbxHistory.Name = "cbxHistory" Me.cbxHistory.Size = New System.Drawing.Size(58, 17) - Me.cbxHistory.TabIndex = 26 + Me.cbxHistory.TabIndex = 8 Me.cbxHistory.Text = "History" Me.cbxHistory.UseVisualStyleBackColor = True ' @@ -435,7 +444,7 @@ Partial Class frmStartOptions ' Me.PictureBox7.BackgroundImage = CType(resources.GetObject("PictureBox7.BackgroundImage"), System.Drawing.Image) Me.PictureBox7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox7.Location = New System.Drawing.Point(404, 397) + Me.PictureBox7.Location = New System.Drawing.Point(400, 90) Me.PictureBox7.Name = "PictureBox7" Me.PictureBox7.Size = New System.Drawing.Size(18, 18) Me.PictureBox7.TabIndex = 25 @@ -446,10 +455,10 @@ Partial Class frmStartOptions ' Me.LinkLabel14.AutoSize = True Me.LinkLabel14.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel14.Location = New System.Drawing.Point(299, 402) + Me.LinkLabel14.Location = New System.Drawing.Point(295, 95) Me.LinkLabel14.Name = "LinkLabel14" Me.LinkLabel14.Size = New System.Drawing.Size(99, 13) - Me.LinkLabel14.TabIndex = 24 + Me.LinkLabel14.TabIndex = 8 Me.LinkLabel14.TabStop = True Me.LinkLabel14.Text = "C0013 - Unterlagen" ' @@ -457,7 +466,7 @@ Partial Class frmStartOptions ' Me.PictureBox6.BackgroundImage = CType(resources.GetObject("PictureBox6.BackgroundImage"), System.Drawing.Image) Me.PictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox6.Location = New System.Drawing.Point(131, 397) + Me.PictureBox6.Location = New System.Drawing.Point(127, 90) Me.PictureBox6.Name = "PictureBox6" Me.PictureBox6.Size = New System.Drawing.Size(18, 18) Me.PictureBox6.TabIndex = 23 @@ -468,10 +477,10 @@ Partial Class frmStartOptions ' Me.LinkLabel13.AutoSize = True Me.LinkLabel13.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel13.Location = New System.Drawing.Point(15, 402) + Me.LinkLabel13.Location = New System.Drawing.Point(11, 95) Me.LinkLabel13.Name = "LinkLabel13" Me.LinkLabel13.Size = New System.Drawing.Size(110, 13) - Me.LinkLabel13.TabIndex = 22 + Me.LinkLabel13.TabIndex = 7 Me.LinkLabel13.TabStop = True Me.LinkLabel13.Text = "I0400 - Währungsliste" ' @@ -479,7 +488,7 @@ Partial Class frmStartOptions ' Me.PictureBox5.BackgroundImage = CType(resources.GetObject("PictureBox5.BackgroundImage"), System.Drawing.Image) Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox5.Location = New System.Drawing.Point(644, 339) + Me.PictureBox5.Location = New System.Drawing.Point(640, 32) Me.PictureBox5.Name = "PictureBox5" Me.PictureBox5.Size = New System.Drawing.Size(18, 18) Me.PictureBox5.TabIndex = 21 @@ -490,10 +499,10 @@ Partial Class frmStartOptions ' Me.LinkLabel12.AutoSize = True Me.LinkLabel12.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel12.Location = New System.Drawing.Point(479, 344) + Me.LinkLabel12.Location = New System.Drawing.Point(475, 37) Me.LinkLabel12.Name = "LinkLabel12" Me.LinkLabel12.Size = New System.Drawing.Size(159, 13) - Me.LinkLabel12.TabIndex = 20 + Me.LinkLabel12.TabIndex = 3 Me.LinkLabel12.TabStop = True Me.LinkLabel12.Text = "A0127 - Beteiligten-Konstellation" ' @@ -501,7 +510,7 @@ Partial Class frmStartOptions ' Me.PictureBox4.BackgroundImage = CType(resources.GetObject("PictureBox4.BackgroundImage"), System.Drawing.Image) Me.PictureBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox4.Location = New System.Drawing.Point(687, 367) + Me.PictureBox4.Location = New System.Drawing.Point(683, 60) Me.PictureBox4.Name = "PictureBox4" Me.PictureBox4.Size = New System.Drawing.Size(18, 18) Me.PictureBox4.TabIndex = 19 @@ -512,10 +521,10 @@ Partial Class frmStartOptions ' Me.LinkLabel11.AutoSize = True Me.LinkLabel11.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel11.Location = New System.Drawing.Point(479, 372) + Me.LinkLabel11.Location = New System.Drawing.Point(475, 65) Me.LinkLabel11.Name = "LinkLabel11" Me.LinkLabel11.Size = New System.Drawing.Size(202, 13) - Me.LinkLabel11.TabIndex = 18 + Me.LinkLabel11.TabIndex = 6 Me.LinkLabel11.TabStop = True Me.LinkLabel11.Text = "A0122 - Art der Anmeldung (Überführung)" ' @@ -523,7 +532,7 @@ Partial Class frmStartOptions ' Me.PictureBox3.BackgroundImage = CType(resources.GetObject("PictureBox3.BackgroundImage"), System.Drawing.Image) Me.PictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox3.Location = New System.Drawing.Point(409, 367) + Me.PictureBox3.Location = New System.Drawing.Point(405, 60) Me.PictureBox3.Name = "PictureBox3" Me.PictureBox3.Size = New System.Drawing.Size(18, 18) Me.PictureBox3.TabIndex = 17 @@ -534,10 +543,10 @@ Partial Class frmStartOptions ' Me.LinkLabel10.AutoSize = True Me.LinkLabel10.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel10.Location = New System.Drawing.Point(299, 372) + Me.LinkLabel10.Location = New System.Drawing.Point(295, 65) Me.LinkLabel10.Name = "LinkLabel10" Me.LinkLabel10.Size = New System.Drawing.Size(104, 13) - Me.LinkLabel10.TabIndex = 16 + Me.LinkLabel10.TabIndex = 5 Me.LinkLabel10.TabStop = True Me.LinkLabel10.Text = "C0010 - AES Länder" ' @@ -545,10 +554,10 @@ Partial Class frmStartOptions ' Me.LinkLabel9.AutoSize = True Me.LinkLabel9.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel9.Location = New System.Drawing.Point(15, 517) + Me.LinkLabel9.Location = New System.Drawing.Point(11, 210) Me.LinkLabel9.Name = "LinkLabel9" Me.LinkLabel9.Size = New System.Drawing.Size(180, 13) - Me.LinkLabel9.TabIndex = 15 + Me.LinkLabel9.TabIndex = 14 Me.LinkLabel9.TabStop = True Me.LinkLabel9.Text = "Eingangsnachrichten abrufen PROD" ' @@ -556,7 +565,7 @@ Partial Class frmStartOptions ' Me.PictureBox2.BackgroundImage = CType(resources.GetObject("PictureBox2.BackgroundImage"), System.Drawing.Image) Me.PictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox2.Location = New System.Drawing.Point(425, 339) + Me.PictureBox2.Location = New System.Drawing.Point(421, 32) Me.PictureBox2.Name = "PictureBox2" Me.PictureBox2.Size = New System.Drawing.Size(18, 18) Me.PictureBox2.TabIndex = 14 @@ -567,10 +576,10 @@ Partial Class frmStartOptions ' Me.LinkLabel8.AutoSize = True Me.LinkLabel8.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel8.Location = New System.Drawing.Point(299, 344) + Me.LinkLabel8.Location = New System.Drawing.Point(295, 37) Me.LinkLabel8.Name = "LinkLabel8" Me.LinkLabel8.Size = New System.Drawing.Size(120, 13) - Me.LinkLabel8.TabIndex = 13 + Me.LinkLabel8.TabIndex = 2 Me.LinkLabel8.TabStop = True Me.LinkLabel8.Text = "C0014 - Vorpapier Arten" ' @@ -578,7 +587,7 @@ Partial Class frmStartOptions ' Me.PictureBox1.BackgroundImage = CType(resources.GetObject("PictureBox1.BackgroundImage"), System.Drawing.Image) Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox1.Location = New System.Drawing.Point(209, 367) + Me.PictureBox1.Location = New System.Drawing.Point(205, 60) Me.PictureBox1.Name = "PictureBox1" Me.PictureBox1.Size = New System.Drawing.Size(18, 18) Me.PictureBox1.TabIndex = 12 @@ -589,10 +598,10 @@ Partial Class frmStartOptions ' Me.LinkLabel7.AutoSize = True Me.LinkLabel7.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel7.Location = New System.Drawing.Point(15, 372) + Me.LinkLabel7.Location = New System.Drawing.Point(11, 65) Me.LinkLabel7.Name = "LinkLabel7" Me.LinkLabel7.Size = New System.Drawing.Size(188, 13) - Me.LinkLabel7.TabIndex = 11 + Me.LinkLabel7.TabIndex = 4 Me.LinkLabel7.TabStop = True Me.LinkLabel7.Text = "C0017 - Packstücke (Verpackungsart)" ' @@ -600,10 +609,10 @@ Partial Class frmStartOptions ' Me.LinkLabel6.AutoSize = True Me.LinkLabel6.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel6.Location = New System.Drawing.Point(299, 492) + Me.LinkLabel6.Location = New System.Drawing.Point(295, 185) Me.LinkLabel6.Name = "LinkLabel6" Me.LinkLabel6.Size = New System.Drawing.Size(180, 13) - Me.LinkLabel6.TabIndex = 10 + Me.LinkLabel6.TabIndex = 13 Me.LinkLabel6.TabStop = True Me.LinkLabel6.Text = "VERAG Kundendaten senden TEST" ' @@ -611,10 +620,10 @@ Partial Class frmStartOptions ' Me.LinkLabel5.AutoSize = True Me.LinkLabel5.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel5.Location = New System.Drawing.Point(15, 492) + Me.LinkLabel5.Location = New System.Drawing.Point(11, 185) Me.LinkLabel5.Name = "LinkLabel5" Me.LinkLabel5.Size = New System.Drawing.Size(177, 13) - Me.LinkLabel5.TabIndex = 9 + Me.LinkLabel5.TabIndex = 12 Me.LinkLabel5.TabStop = True Me.LinkLabel5.Text = "Eingangsnachrichten abrufen TEST" ' @@ -622,17 +631,17 @@ Partial Class frmStartOptions ' Me.Label2.AutoSize = True Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(15, 465) + Me.Label2.Location = New System.Drawing.Point(11, 158) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(205, 13) - Me.Label2.TabIndex = 8 + Me.Label2.TabIndex = 11 Me.Label2.Text = "DAKOSY Nachrichtenverarbeitung:" ' 'picC0008 ' Me.picC0008.BackgroundImage = CType(resources.GetObject("picC0008.BackgroundImage"), System.Drawing.Image) Me.picC0008.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.picC0008.Location = New System.Drawing.Point(133, 339) + Me.picC0008.Location = New System.Drawing.Point(129, 32) Me.picC0008.Name = "picC0008" Me.picC0008.Size = New System.Drawing.Size(18, 18) Me.picC0008.TabIndex = 7 @@ -650,7 +659,7 @@ Partial Class frmStartOptions Me.btn.Margin = New System.Windows.Forms.Padding(0) Me.btn.Name = "btn" Me.btn.Size = New System.Drawing.Size(75, 22) - Me.btn.TabIndex = 6 + Me.btn.TabIndex = 0 Me.btn.Text = "X" Me.btn.UseVisualStyleBackColor = False ' @@ -658,10 +667,10 @@ Partial Class frmStartOptions ' Me.LinkLabel4.AutoSize = True Me.LinkLabel4.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel4.Location = New System.Drawing.Point(15, 344) + Me.LinkLabel4.Location = New System.Drawing.Point(11, 37) Me.LinkLabel4.Name = "LinkLabel4" Me.LinkLabel4.Size = New System.Drawing.Size(112, 13) - Me.LinkLabel4.TabIndex = 5 + Me.LinkLabel4.TabIndex = 1 Me.LinkLabel4.TabStop = True Me.LinkLabel4.Text = "C0008 - NCTS Länder" ' @@ -669,10 +678,10 @@ Partial Class frmStartOptions ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(15, 311) + Me.Label1.Location = New System.Drawing.Point(8, 11) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(177, 13) - Me.Label1.TabIndex = 4 + Me.Label1.TabIndex = 0 Me.Label1.Text = "ZOLL.DE Codelisten einlesen:" ' 'LinkLabel2 @@ -682,7 +691,7 @@ Partial Class frmStartOptions Me.LinkLabel2.Location = New System.Drawing.Point(299, 78) Me.LinkLabel2.Name = "LinkLabel2" Me.LinkLabel2.Size = New System.Drawing.Size(133, 13) - Me.LinkLabel2.TabIndex = 3 + Me.LinkLabel2.TabIndex = 6 Me.LinkLabel2.TabStop = True Me.LinkLabel2.Text = "Bürgschaftsdaten ZODIAK" ' @@ -693,7 +702,7 @@ Partial Class frmStartOptions Me.LinkLabel1.Location = New System.Drawing.Point(15, 78) Me.LinkLabel1.Name = "LinkLabel1" Me.LinkLabel1.Size = New System.Drawing.Size(182, 13) - Me.LinkLabel1.TabIndex = 2 + Me.LinkLabel1.TabIndex = 5 Me.LinkLabel1.TabStop = True Me.LinkLabel1.Text = "Bürgschaftsdaten ZABIS + ZOLARIS" ' @@ -704,7 +713,7 @@ Partial Class frmStartOptions Me.LinkLabel3.Location = New System.Drawing.Point(299, 51) Me.LinkLabel3.Name = "LinkLabel3" Me.LinkLabel3.Size = New System.Drawing.Size(128, 13) - Me.LinkLabel3.TabIndex = 1 + Me.LinkLabel3.TabIndex = 3 Me.LinkLabel3.TabStop = True Me.LinkLabel3.Text = "Aufschubkonten ZODIAK" ' @@ -715,7 +724,7 @@ Partial Class frmStartOptions Me.lklAufschubkontenATLASEZOLL.Location = New System.Drawing.Point(15, 51) Me.lklAufschubkontenATLASEZOLL.Name = "lklAufschubkontenATLASEZOLL" Me.lklAufschubkontenATLASEZOLL.Size = New System.Drawing.Size(177, 13) - Me.lklAufschubkontenATLASEZOLL.TabIndex = 1 + Me.lklAufschubkontenATLASEZOLL.TabIndex = 2 Me.lklAufschubkontenATLASEZOLL.TabStop = True Me.lklAufschubkontenATLASEZOLL.Text = "Aufschubkonten ZABIS + ZOLARIS" ' @@ -726,7 +735,7 @@ Partial Class frmStartOptions Me.lblRoutineManager.Location = New System.Drawing.Point(12, 12) Me.lblRoutineManager.Name = "lblRoutineManager" Me.lblRoutineManager.Size = New System.Drawing.Size(104, 13) - Me.lblRoutineManager.TabIndex = 0 + Me.lblRoutineManager.TabIndex = 1 Me.lblRoutineManager.Text = "Routine Manager" ' 'MyTextBox1 @@ -748,17 +757,178 @@ Partial Class frmStartOptions Me.MyTextBox1.MaxLines_Warning_Label = Nothing Me.MyTextBox1.Name = "MyTextBox1" Me.MyTextBox1.Size = New System.Drawing.Size(53, 20) - Me.MyTextBox1.TabIndex = 38 + Me.MyTextBox1.TabIndex = 11 Me.MyTextBox1.Text = "10000" ' + 'tbcntr + ' + Me.tbcntr.Controls.Add(Me.TabPage1) + Me.tbcntr.Controls.Add(Me.TabPage2) + Me.tbcntr.Dock = System.Windows.Forms.DockStyle.Bottom + Me.tbcntr.Location = New System.Drawing.Point(0, 254) + Me.tbcntr.Name = "tbcntr" + Me.tbcntr.SelectedIndex = 0 + Me.tbcntr.Size = New System.Drawing.Size(788, 421) + Me.tbcntr.TabIndex = 19 + ' + 'TabPage1 + ' + Me.TabPage1.Controls.Add(Me.LinkLabel4) + Me.TabPage1.Controls.Add(Me.PictureBox13) + Me.TabPage1.Controls.Add(Me.picC0008) + Me.TabPage1.Controls.Add(Me.LinkLabel26) + Me.TabPage1.Controls.Add(Me.Label2) + Me.TabPage1.Controls.Add(Me.LinkLabel5) + Me.TabPage1.Controls.Add(Me.LinkLabel6) + Me.TabPage1.Controls.Add(Me.LinkLabel23) + Me.TabPage1.Controls.Add(Me.LinkLabel7) + Me.TabPage1.Controls.Add(Me.LinkLabel24) + Me.TabPage1.Controls.Add(Me.PictureBox1) + Me.TabPage1.Controls.Add(Me.Label5) + Me.TabPage1.Controls.Add(Me.LinkLabel8) + Me.TabPage1.Controls.Add(Me.LinkLabel21) + Me.TabPage1.Controls.Add(Me.PictureBox2) + Me.TabPage1.Controls.Add(Me.LinkLabel22) + Me.TabPage1.Controls.Add(Me.LinkLabel9) + Me.TabPage1.Controls.Add(Me.Label4) + Me.TabPage1.Controls.Add(Me.LinkLabel10) + Me.TabPage1.Controls.Add(Me.Label1) + Me.TabPage1.Controls.Add(Me.PictureBox3) + Me.TabPage1.Controls.Add(Me.LinkLabel11) + Me.TabPage1.Controls.Add(Me.PictureBox4) + Me.TabPage1.Controls.Add(Me.LinkLabel12) + Me.TabPage1.Controls.Add(Me.PictureBox5) + Me.TabPage1.Controls.Add(Me.LinkLabel13) + Me.TabPage1.Controls.Add(Me.PictureBox6) + Me.TabPage1.Controls.Add(Me.LinkLabel14) + Me.TabPage1.Controls.Add(Me.PictureBox7) + Me.TabPage1.Controls.Add(Me.LinkLabel15) + Me.TabPage1.Controls.Add(Me.LinkLabel16) + Me.TabPage1.Controls.Add(Me.PictureBox8) + Me.TabPage1.Location = New System.Drawing.Point(4, 22) + Me.TabPage1.Name = "TabPage1" + Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage1.Size = New System.Drawing.Size(780, 395) + Me.TabPage1.TabIndex = 0 + Me.TabPage1.Text = "Zollverfahren" + Me.TabPage1.UseVisualStyleBackColor = True + ' + 'TabPage2 + ' + Me.TabPage2.Controls.Add(Me.PictureBox14) + Me.TabPage2.Controls.Add(Me.MyComboBox1) + Me.TabPage2.Controls.Add(Me.Label8) + Me.TabPage2.Controls.Add(Me.txtVRGOut_BezugsNr) + Me.TabPage2.Controls.Add(Me.Button1) + Me.TabPage2.Controls.Add(Me.Label7) + Me.TabPage2.Controls.Add(Me.LinkLabel27) + Me.TabPage2.Controls.Add(Me.Label6) + Me.TabPage2.Location = New System.Drawing.Point(4, 22) + Me.TabPage2.Name = "TabPage2" + Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage2.Size = New System.Drawing.Size(780, 395) + Me.TabPage2.TabIndex = 1 + Me.TabPage2.Text = "VERAG Interface" + Me.TabPage2.UseVisualStyleBackColor = True + ' + 'LinkLabel27 + ' + Me.LinkLabel27.AutoSize = True + Me.LinkLabel27.Enabled = False + Me.LinkLabel27.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.LinkLabel27.Location = New System.Drawing.Point(14, 46) + Me.LinkLabel27.Name = "LinkLabel27" + Me.LinkLabel27.Size = New System.Drawing.Size(85, 13) + Me.LinkLabel27.TabIndex = 2 + Me.LinkLabel27.TabStop = True + Me.LinkLabel27.Text = "Eingang abrufen" + ' + 'Label6 + ' + Me.Label6.AutoSize = True + Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label6.Location = New System.Drawing.Point(11, 20) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(66, 13) + Me.Label6.TabIndex = 0 + Me.Label6.Text = "VERAG IN" + ' + 'Label7 + ' + Me.Label7.AutoSize = True + Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label7.Location = New System.Drawing.Point(295, 20) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(79, 13) + Me.Label7.TabIndex = 1 + Me.Label7.Text = "VERAG OUT" + ' 'Button1 ' - Me.Button1.Location = New System.Drawing.Point(489, 221) + 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.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(198, 34) - Me.Button1.TabIndex = 52 + Me.Button1.Size = New System.Drawing.Size(72, 38) + Me.Button1.TabIndex = 6 + Me.Button1.Text = "Daten --> FTP" Me.Button1.UseVisualStyleBackColor = True ' + '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 + ' + 'Label8 + ' + Me.Label8.AutoSize = True + Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label8.Location = New System.Drawing.Point(295, 46) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(176, 13) + Me.Label8.TabIndex = 3 + Me.Label8.Text = "Bereitstellen - Zollysytem/BezugsNr:" + ' + '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 + ' + 'PictureBox14 + ' + 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.Name = "PictureBox14" + Me.PictureBox14.Size = New System.Drawing.Size(18, 18) + Me.PictureBox14.TabIndex = 56 + Me.PictureBox14.TabStop = False + Me.PictureBox14.Visible = False + ' 'frmStartOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -774,6 +944,7 @@ Partial Class frmStartOptions Me.WindowState = System.Windows.Forms.FormWindowState.Minimized Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() + CType(Me.PictureBox13, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox12, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).EndInit() @@ -787,6 +958,12 @@ Partial Class frmStartOptions CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.picC0008, System.ComponentModel.ISupportInitialize).EndInit() + Me.tbcntr.ResumeLayout(False) + Me.TabPage1.ResumeLayout(False) + Me.TabPage1.PerformLayout() + Me.TabPage2.ResumeLayout(False) + Me.TabPage2.PerformLayout() + CType(Me.PictureBox14, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -844,5 +1021,17 @@ Partial Class frmStartOptions Friend WithEvents Label5 As Label Friend WithEvents LinkLabel25 As LinkLabel Friend WithEvents CheckBox2 As CheckBox + Friend WithEvents PictureBox13 As PictureBox + Friend WithEvents LinkLabel26 As LinkLabel + Friend WithEvents tbcntr As TabControl + Friend WithEvents TabPage1 As TabPage + Friend WithEvents TabPage2 As TabPage + Friend WithEvents Label7 As Label + Friend WithEvents LinkLabel27 As LinkLabel + Friend WithEvents Label6 As Label + Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label8 As Label + Friend WithEvents txtVRGOut_BezugsNr As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Button1 As Button + Friend WithEvents PictureBox14 As PictureBox End Class diff --git a/initATLASAufschubkonten/frmStartOptions.resx b/initATLASAufschubkonten/frmStartOptions.resx index a72dd98..046180e 100644 --- a/initATLASAufschubkonten/frmStartOptions.resx +++ b/initATLASAufschubkonten/frmStartOptions.resx @@ -118,6 +118,30 @@ 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 @@ -212,6 +236,30 @@ 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 ac29c36..f6c657d 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -39,6 +39,12 @@ Public Class frmStartOptions timer.Interval = 2500 VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + + MyComboBox1.Items.Clear() + MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DAKOSY", "DY")) + MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("TELEOTEC", "TC")) + MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DHF", "DHF")) + 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 @@ -215,6 +221,8 @@ Public Class frmStartOptions Select Case row("MsgTyp") Case "EZ922" : DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "EZA") Case "TR109" : DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "NCTS") + ' BEREITSTELLUNG DER DATEN AN FREMDSYSTEME + cVERAG_Interface.copyFileFTP_VERAGncts_EZOLL(cDHF_Anhaenge.AnmID) Case "EZ923" 'Ergänzung STB - Mitteilung sql.doSQL("Update Speditionsbuch SET DokumentId_Mitteilung='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND DokumentId_Mitteilung is null", "FMZOLL") End Select @@ -344,7 +352,15 @@ Public Class frmStartOptions PictureBox4.Visible = False PictureBox5.Visible = False PictureBox6.Visible = False + PictureBox7.Visible = False PictureBox8.Visible = False + PictureBox9.Visible = False + PictureBox10.Visible = False + PictureBox11.Visible = False + PictureBox12.Visible = False + PictureBox13.Visible = False + PictureBox14.Visible = False + End Sub Private Sub LinkLabel5_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel5.LinkClicked @@ -902,7 +918,7 @@ Public Class frmStartOptions importFileFromEZOLL(If(CheckBox2.Checked, Now.AddDays(-7), Now)) End Sub - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + Private Sub Button1_Click(sender As Object, e As EventArgs) For Each d In System.IO.Directory.GetDirectories("\\192.168.0.91\Datenarchiv\DAKOSY\ECHTSYSTEM\Nachrichtendaten_Ablage\2019") Dim fid As New FileInfo(d) If fid.Name >= 20190820 Then @@ -956,4 +972,30 @@ Public Class frmStartOptions Next End Sub + + Private Sub LinkLabel26_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel26.LinkClicked + Me.Cursor = Cursors.WaitCursor + Try + DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("I0700", True) 'TESTSYSTEM + Dim erg = DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("I0700", False) 'ECHTSYSTEM + showPic(erg, PictureBox13) + Catch ex As Exception : VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name) : End Try + Me.Cursor = Cursors.Default + End Sub + + Private Sub TabPage2_Click(sender As Object, e As EventArgs) + + End Sub + + Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click + Dim ok As Boolean = False + Select Case MyComboBox1._value + Case "DY" : ok = cVERAG_Interface.copyFileFTP_VERAGncts_DY_ByBezugsNr(txtVRGOut_BezugsNr.Text) + Case "TC" : ok = cVERAG_Interface.copyFileFTP_VERAGncts_TC_ByBezugsNr(txtVRGOut_BezugsNr.Text) + Case "DHF" : ok = cVERAG_Interface.copyFileFTP_VERAGncts_EZOLL_ByBezugsNr(txtVRGOut_BezugsNr.Text) + End Select + + showPic(ok, PictureBox14) + + End Sub End Class \ No newline at end of file diff --git a/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb index 48923b0..eb6b2f1 100644 --- a/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb @@ -519,9 +519,8 @@ Public Class frmTCNachrichtenVerarbeitung TC.Hea_DecTy = vifDEC.Hea_DecTy 'Art der Anmeldung Select Case TC.Hea_DecTy - Case "T1" : TC.telanm_ART = "T1" - Case "T2" : TC.telanm_ART = "T2" - Case Else : TC.telanm_ART = TC.Hea_DecTy + Case "T1", "T2", "T2L" : TC.telanm_ART = TC.Hea_DecTy + Case Else : TC.telanm_ART = TC.Hea_DecTy '^^ End Select TC.MsgType = vifDEC.MsgType @@ -541,7 +540,7 @@ Public Class frmTCNachrichtenVerarbeitung 'Derzeit nur IMEX TC.telanm_firma = "IMEX" - TC.telanm_niederlassung = "SUB" + TC.telanm_niederlassung = "Sub" TC.telanm_Erstellung = Now TC.telanm_LetzteBearbeitung = Now @@ -764,7 +763,7 @@ Public Class frmTCNachrichtenVerarbeitung ''''Aktuellste Nachricht - If SQL.getValueTxtBySql("SELECT COUNT(*) FROM [tblTelotec_Anmeldung] WHERE telanm_BezugsNr='" & TC.telanm_BezugsNr & "' and telanm_Status>'" & TC.telanm_Status & "' ", "FMZOLL") > 0 Then + If SQL.getValueTxtBySql("Select COUNT(*) FROM [tblTelotec_Anmeldung] WHERE telanm_BezugsNr='" & TC.telanm_BezugsNr & "' and telanm_Status>'" & TC.telanm_Status & "' ", "FMZOLL") > 0 Then TC.telnam_aktuellsteNachricht = 0 Else TC.telnam_aktuellsteNachricht = 1 @@ -772,18 +771,24 @@ Public Class frmTCNachrichtenVerarbeitung End If If TC.SAVE() Then - ' TELOTEC_Worker.cTELOTEC_Statusmeldungen.InsertStatusMeldung(DY_TMP, TELOTEC_Worker.cDY_Statusliste.S_05) - If If(TC.telanm_Status, 0) = TELOTEC_Worker.cTC_Statusliste.S_60 Then - ' TC.insertIntoSpedBuch() - Dim ZOLLIMPORT As New DAKOSY_Worker.cZOLL_IMPORT - ZOLLIMPORT.TelotecImport(TC) - End If + ' TELOTEC_Worker.cTELOTEC_Statusmeldungen.InsertStatusMeldung(DY_TMP, TELOTEC_Worker.cDY_Statusliste.S_05) + If If(TC.telanm_Status, 0) = TELOTEC_Worker.cTC_Statusliste.S_60 Then + ' TC.insertIntoSpedBuch() + Dim ZOLLIMPORT As New DAKOSY_Worker.cZOLL_IMPORT + ZOLLIMPORT.TelotecImport(TC) + End If + ' BEREITSTELLUNG DER DATEN AN FREMDSYSTEME + If TC.telanm_ART = "T1" Or TC.telanm_ART.ToString.Contains("T2") Or TC.telanm_ART.ToString.StartsWith("T-") Then + Select Case TC.telanm_Status + Case TELOTEC_Worker.cTC_Statusliste.S_50, TELOTEC_Worker.cTC_Statusliste.S_60 + cVERAG_Interface.copyFileFTP_VERAGncts_TC(TC) + End Select End If - End If + End If - Try + 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)