diff --git a/SDL/App.config b/SDL/App.config index c0e5b351..2fb2e6a3 100644 --- a/SDL/App.config +++ b/SDL/App.config @@ -1,43 +1,43 @@ - + -
+
- + - + - - + + - - + + - - + + - - + + - - + + - - + + @@ -64,18 +64,18 @@ - - + + - + - + diff --git a/SDL/My Project/Application.Designer.vb b/SDL/My Project/Application.Designer.vb index fc6cf8b1..87f5c1df 100644 --- a/SDL/My Project/Application.Designer.vb +++ b/SDL/My Project/Application.Designer.vb @@ -34,5 +34,11 @@ Namespace My Protected Overrides Sub OnCreateMainForm() Me.MainForm = Global.SDL.frmLogin End Sub + + _ + Protected Overrides Function OnInitialize(ByVal commandLineArgs As System.Collections.ObjectModel.ReadOnlyCollection(Of String)) As Boolean + Me.MinimumSplashScreenDisplayTime = 0 + Return MyBase.OnInitialize(commandLineArgs) + End Function End Class End Namespace diff --git a/SDL/My Project/Settings.Designer.vb b/SDL/My Project/Settings.Designer.vb index 6f8b0448..798f43cd 100644 --- a/SDL/My Project/Settings.Designer.vb +++ b/SDL/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/SDL/My Project/license.elic.xml b/SDL/My Project/license.elic.xml new file mode 100644 index 00000000..030cec9f --- /dev/null +++ b/SDL/My Project/license.elic.xml @@ -0,0 +1,26 @@ + + + B081D0F5-EF94-42F2-B287-4812D84164CE + Runtime + VERAG Spedition AG + al@verag.ag + VERAG Spedition AG + 2024-08-31T00:00:00Z + 2025-08-31T00:00:00Z + + + Spire.PDF Pro Edition + 10.7 + + Developer Subscription + 1 + 1 + + + + + e-iceblue + sales@e-iceblue.com + http://www.e-iceblue.com + + diff --git a/SDL/My Project/licenseViewer.elic.xml b/SDL/My Project/licenseViewer.elic.xml new file mode 100644 index 00000000..30f93032 --- /dev/null +++ b/SDL/My Project/licenseViewer.elic.xml @@ -0,0 +1,25 @@ + + + Runtime + VERAG Spedition AG + al@verag.ag + VERAG Spedition AG + 2024-08-31T00:00:00Z + 2025-08-31T00:00:00Z + + + Spire.PDFViewer for Forms + 7.12 + + Developer Subscription + 1 + 1 + + + + + e-iceblue + sales@e-iceblue.com + http://www.e-iceblue.com + + diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 13821c4e..521e1b76 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -11,7 +11,7 @@ SDL 512 WindowsForms - v4.7 + v4.8 true @@ -298,10 +298,6 @@ False ..\..\..\dll\RKAesIcm.dll - - False - ..\..\..\dll\Spire.PDF\2023\Spire.Pdf.dll - @@ -2780,6 +2776,7 @@ True Application.myapp + True True @@ -4821,6 +4818,8 @@ + + diff --git a/SDL/Web References/EORI/Reference.vb b/SDL/Web References/EORI/Reference.vb index 01171632..0667e014 100644 --- a/SDL/Web References/EORI/Reference.vb +++ b/SDL/Web References/EORI/Reference.vb @@ -24,7 +24,7 @@ Imports System.Xml.Serialization Namespace EORI ''' - _ @@ -121,7 +121,7 @@ Namespace EORI End Class ''' - - - _ + _ Public Delegate Sub validateEORICompletedEventHandler(ByVal sender As Object, ByVal e As validateEORICompletedEventArgs) ''' - _ Partial Public Class validateEORICompletedEventArgs diff --git a/SDL/Web References/at.gv.bmf.finanzonline/Reference.vb b/SDL/Web References/at.gv.bmf.finanzonline/Reference.vb index 018156dc..8666f25a 100644 --- a/SDL/Web References/at.gv.bmf.finanzonline/Reference.vb +++ b/SDL/Web References/at.gv.bmf.finanzonline/Reference.vb @@ -24,7 +24,7 @@ Imports System.Xml.Serialization Namespace at.gv.bmf.finanzonline ''' - _ @@ -129,7 +129,7 @@ Namespace at.gv.bmf.finanzonline End Class ''' - _ Public Enum uidAbfrageServiceRequestStufe @@ -144,11 +144,11 @@ Namespace at.gv.bmf.finanzonline End Enum ''' - _ + _ Public Delegate Sub uidAbfrageCompletedEventHandler(ByVal sender As Object, ByVal e As uidAbfrageCompletedEventArgs) ''' - _ Partial Public Class uidAbfrageCompletedEventArgs diff --git a/SDL/Web References/at.gv.bmf.finanzonlineLogin/Reference.vb b/SDL/Web References/at.gv.bmf.finanzonlineLogin/Reference.vb index 46f96118..7a96e569 100644 --- a/SDL/Web References/at.gv.bmf.finanzonlineLogin/Reference.vb +++ b/SDL/Web References/at.gv.bmf.finanzonlineLogin/Reference.vb @@ -24,7 +24,7 @@ Imports System.Xml.Serialization Namespace at.gv.bmf.finanzonlineLogin ''' - _ @@ -156,11 +156,11 @@ Namespace at.gv.bmf.finanzonlineLogin End Class ''' - _ + _ Public Delegate Sub loginCompletedEventHandler(ByVal sender As Object, ByVal e As loginCompletedEventArgs) ''' - _ Partial Public Class loginCompletedEventArgs @@ -199,11 +199,11 @@ Namespace at.gv.bmf.finanzonlineLogin End Class ''' - _ + _ Public Delegate Sub logoutCompletedEventHandler(ByVal sender As Object, ByVal e As logoutCompletedEventArgs) ''' - _ Partial Public Class logoutCompletedEventArgs diff --git a/SDL/Web References/eu.europa.ec/Reference.vb b/SDL/Web References/eu.europa.ec/Reference.vb index 39ba7fe9..0ce64cd0 100644 --- a/SDL/Web References/eu.europa.ec/Reference.vb +++ b/SDL/Web References/eu.europa.ec/Reference.vb @@ -24,7 +24,7 @@ Imports System.Xml.Serialization Namespace eu.europa.ec ''' - _ @@ -200,7 +200,7 @@ Namespace eu.europa.ec End Class ''' - _ Public Enum matchCode @@ -219,11 +219,11 @@ Namespace eu.europa.ec End Enum ''' - _ + _ Public Delegate Sub checkVatCompletedEventHandler(ByVal sender As Object, ByVal e As checkVatCompletedEventArgs) ''' - _ Partial Public Class checkVatCompletedEventArgs @@ -286,11 +286,11 @@ Namespace eu.europa.ec End Class ''' - _ + _ Public Delegate Sub checkVatApproxCompletedEventHandler(ByVal sender As Object, ByVal e As checkVatApproxCompletedEventArgs) ''' - _ Partial Public Class checkVatApproxCompletedEventArgs diff --git a/SDL/Web References/eu.europa.ec1/Reference.vb b/SDL/Web References/eu.europa.ec1/Reference.vb index 8374c639..dc24e902 100644 --- a/SDL/Web References/eu.europa.ec1/Reference.vb +++ b/SDL/Web References/eu.europa.ec1/Reference.vb @@ -24,7 +24,7 @@ Imports System.Xml.Serialization Namespace eu.europa.ec1 ''' - _ @@ -73,14 +73,14 @@ Namespace eu.europa.ec1 ''' Public Event validateEORICompleted As validateEORICompletedEventHandler - + ''' - - Public Function validateEORI(ByVal eori() As String) As eoriValidationResult + _ + Public Function validateEORI( ByVal eori() As String) As eoriValidationResult Dim results() As Object = Me.Invoke("validateEORI", New Object() {eori}) - Return CType(results(0), eoriValidationResult) + Return CType(results(0),eoriValidationResult) End Function - + ''' Public Overloads Sub validateEORIAsync(ByVal eori() As String) Me.validateEORIAsync(eori, Nothing) @@ -121,7 +121,7 @@ Namespace eu.europa.ec1 End Class ''' - - - _ + _ Public Delegate Sub validateEORICompletedEventHandler(ByVal sender As Object, ByVal e As validateEORICompletedEventArgs) ''' - _ Partial Public Class validateEORICompletedEventArgs @@ -324,12 +324,12 @@ Namespace eu.europa.ec1 MyBase.New(exception, cancelled, userState) Me.results = results End Sub - + ''' Public ReadOnly Property Result() As eoriValidationResult Get - Me.RaiseExceptionIfNecessary() - Return CType(Me.results(0), eoriValidationResult) + Me.RaiseExceptionIfNecessary + Return CType(Me.results(0),eoriValidationResult) End Get End Property End Class diff --git a/SDL/kunden/usrCntlCBAM.Designer.vb b/SDL/kunden/usrCntlCBAM.Designer.vb index 9ed40b8f..cd873f34 100644 --- a/SDL/kunden/usrCntlCBAM.Designer.vb +++ b/SDL/kunden/usrCntlCBAM.Designer.vb @@ -26,7 +26,6 @@ Partial Class usrCntlCBAM Me.lblOffert = New System.Windows.Forms.TextBox() Me.cntxtAddSdl = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.txtEori = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label1 = New System.Windows.Forms.Label() Me.btnCBAMPruef_DAKOSY = New System.Windows.Forms.Button() Me.btnCBAMPruef_DHF_VERAG = New System.Windows.Forms.Button() @@ -38,12 +37,8 @@ Partial Class usrCntlCBAM Me.txtCBAMPruef_DHF_VERAG = New System.Windows.Forms.TextBox() Me.txtCBAMPruef_DHF_UNISPED = New System.Windows.Forms.TextBox() Me.txtCBAMPruef_TELOTEC = New System.Windows.Forms.TextBox() - Me.txtBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label4 = New System.Windows.Forms.Label() Me.Label5 = New System.Windows.Forms.Label() - Me.cboQuartal = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.txtJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.btnCBAM_DS_DHF_UNISPED = New System.Windows.Forms.Button() Me.btnCBAM_DS_TELOTEC = New System.Windows.Forms.Button() Me.btnCBAM_DS_DHF_VERAG = New System.Windows.Forms.Button() @@ -62,11 +57,16 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DHF_VERAG_Copy = New System.Windows.Forms.Button() Me.btnCBAM_DS_DHF_UNISPED_Copy = New System.Windows.Forms.Button() Me.btnCBAM_DS_TELOTEC_Copy = New System.Windows.Forms.Button() - Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) - Me.cbxVERAG = New System.Windows.Forms.CheckBox() Me.btnCBAM_DS_DAKOSY_XML = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() - Me.Button3 = New System.Windows.Forms.Button() + Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) + Me.cbxVERAG = New System.Windows.Forms.CheckBox() + Me.txtJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cboQuartal = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtEori = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Button1 = New System.Windows.Forms.Button() Me.cntxtAddSdl.SuspendLayout() Me.MyPanel1.SuspendLayout() Me.SuspendLayout() @@ -96,29 +96,6 @@ Partial Class usrCntlCBAM Me.DToolStripMenuItem.Size = New System.Drawing.Size(81, 22) Me.DToolStripMenuItem.Text = "d" ' - 'txtEori - ' - Me.txtEori._DateTimeOnly = False - Me.txtEori._numbersOnly = False - Me.txtEori._numbersOnlyKommastellen = "" - Me.txtEori._numbersOnlyTrennzeichen = True - Me.txtEori._Prozent = False - Me.txtEori._ShortDateNew = False - Me.txtEori._ShortDateOnly = False - Me.txtEori._TimeOnly = False - Me.txtEori._TimeOnly_Seconds = False - Me.txtEori._value = "" - Me.txtEori._Waehrung = False - Me.txtEori._WaehrungZeichen = True - Me.txtEori.ForeColor = System.Drawing.Color.Black - Me.txtEori.Location = New System.Drawing.Point(106, 48) - Me.txtEori.MaxLineLength = -1 - Me.txtEori.MaxLines_Warning = "" - Me.txtEori.MaxLines_Warning_Label = Nothing - Me.txtEori.Name = "txtEori" - Me.txtEori.Size = New System.Drawing.Size(341, 20) - Me.txtEori.TabIndex = 1 - ' 'Label1 ' Me.Label1.AutoSize = True @@ -243,52 +220,6 @@ Partial Class usrCntlCBAM Me.txtCBAMPruef_TELOTEC.Text = "-" Me.txtCBAMPruef_TELOTEC.TextAlign = System.Windows.Forms.HorizontalAlignment.Center ' - 'txtBis - ' - Me.txtBis._DateTimeOnly = False - Me.txtBis._numbersOnly = False - Me.txtBis._numbersOnlyKommastellen = "" - Me.txtBis._numbersOnlyTrennzeichen = True - Me.txtBis._Prozent = False - Me.txtBis._ShortDateNew = False - Me.txtBis._ShortDateOnly = False - Me.txtBis._TimeOnly = False - Me.txtBis._TimeOnly_Seconds = False - Me.txtBis._value = "" - Me.txtBis._Waehrung = False - Me.txtBis._WaehrungZeichen = True - Me.txtBis.ForeColor = System.Drawing.Color.Black - Me.txtBis.Location = New System.Drawing.Point(860, 49) - Me.txtBis.MaxLineLength = -1 - Me.txtBis.MaxLines_Warning = "" - Me.txtBis.MaxLines_Warning_Label = Nothing - Me.txtBis.Name = "txtBis" - Me.txtBis.Size = New System.Drawing.Size(110, 20) - Me.txtBis.TabIndex = 14 - ' - 'txtVon - ' - Me.txtVon._DateTimeOnly = False - Me.txtVon._numbersOnly = False - Me.txtVon._numbersOnlyKommastellen = "" - Me.txtVon._numbersOnlyTrennzeichen = True - Me.txtVon._Prozent = False - Me.txtVon._ShortDateNew = False - Me.txtVon._ShortDateOnly = False - Me.txtVon._TimeOnly = False - Me.txtVon._TimeOnly_Seconds = False - Me.txtVon._value = "" - Me.txtVon._Waehrung = False - Me.txtVon._WaehrungZeichen = True - Me.txtVon.ForeColor = System.Drawing.Color.Black - Me.txtVon.Location = New System.Drawing.Point(744, 49) - Me.txtVon.MaxLineLength = -1 - Me.txtVon.MaxLines_Warning = "" - Me.txtVon.MaxLines_Warning_Label = Nothing - Me.txtVon.Name = "txtVon" - Me.txtVon.Size = New System.Drawing.Size(110, 20) - Me.txtVon.TabIndex = 15 - ' 'Label4 ' Me.Label4.AutoSize = True @@ -307,41 +238,6 @@ Partial Class usrCntlCBAM Me.Label5.TabIndex = 18 Me.Label5.Text = "Zeitraum:" ' - 'cboQuartal - ' - Me.cboQuartal._allowedValuesFreiText = Nothing - Me.cboQuartal._allowFreiText = False - Me.cboQuartal._value = "" - Me.cboQuartal.FormattingEnabled = True - Me.cboQuartal.Items.AddRange(New Object() {"", "Q1", "Q2", "Q3", "Q4"}) - Me.cboQuartal.Location = New System.Drawing.Point(511, 48) - Me.cboQuartal.Name = "cboQuartal" - Me.cboQuartal.Size = New System.Drawing.Size(45, 21) - Me.cboQuartal.TabIndex = 19 - ' - 'txtJahr - ' - Me.txtJahr._DateTimeOnly = False - Me.txtJahr._numbersOnly = False - Me.txtJahr._numbersOnlyKommastellen = "" - Me.txtJahr._numbersOnlyTrennzeichen = True - Me.txtJahr._Prozent = False - Me.txtJahr._ShortDateNew = False - Me.txtJahr._ShortDateOnly = False - Me.txtJahr._TimeOnly = False - Me.txtJahr._TimeOnly_Seconds = False - Me.txtJahr._value = "" - Me.txtJahr._Waehrung = False - Me.txtJahr._WaehrungZeichen = True - Me.txtJahr.ForeColor = System.Drawing.Color.Black - Me.txtJahr.Location = New System.Drawing.Point(562, 49) - Me.txtJahr.MaxLineLength = -1 - Me.txtJahr.MaxLines_Warning = "" - Me.txtJahr.MaxLines_Warning_Label = Nothing - Me.txtJahr.Name = "txtJahr" - Me.txtJahr.Size = New System.Drawing.Size(60, 20) - Me.txtJahr.TabIndex = 20 - ' 'btnCBAM_DS_DHF_UNISPED ' Me.btnCBAM_DS_DHF_UNISPED.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -560,6 +456,31 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_TELOTEC_Copy.Text = "In Zwischenablage kopieren" Me.btnCBAM_DS_TELOTEC_Copy.UseVisualStyleBackColor = True ' + 'btnCBAM_DS_DAKOSY_XML + ' + Me.btnCBAM_DS_DAKOSY_XML.Enabled = False + Me.btnCBAM_DS_DAKOSY_XML.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnCBAM_DS_DAKOSY_XML.Image = Global.SDL.My.Resources.Resources.xml + Me.btnCBAM_DS_DAKOSY_XML.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnCBAM_DS_DAKOSY_XML.Location = New System.Drawing.Point(144, 435) + Me.btnCBAM_DS_DAKOSY_XML.Name = "btnCBAM_DS_DAKOSY_XML" + Me.btnCBAM_DS_DAKOSY_XML.Size = New System.Drawing.Size(130, 42) + Me.btnCBAM_DS_DAKOSY_XML.TabIndex = 40 + Me.btnCBAM_DS_DAKOSY_XML.Text = "XML" + Me.btnCBAM_DS_DAKOSY_XML.UseVisualStyleBackColor = True + ' + 'Button2 + ' + Me.Button2.Enabled = False + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button2.Location = New System.Drawing.Point(144, 483) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(130, 42) + Me.Button2.TabIndex = 42 + Me.Button2.Text = "In Zwischenablage kopieren" + Me.Button2.UseVisualStyleBackColor = True + ' 'MyPanel1 ' Me.MyPanel1.Controls.Add(Me.cbxVERAG) @@ -578,49 +499,126 @@ Partial Class usrCntlCBAM Me.cbxVERAG.Text = "VERAG" Me.cbxVERAG.UseVisualStyleBackColor = True ' - 'btnCBAM_DS_DAKOSY_XML + 'txtJahr ' - Me.btnCBAM_DS_DAKOSY_XML.Enabled = False - Me.btnCBAM_DS_DAKOSY_XML.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCBAM_DS_DAKOSY_XML.Image = Global.SDL.My.Resources.Resources.xml - Me.btnCBAM_DS_DAKOSY_XML.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DAKOSY_XML.Location = New System.Drawing.Point(144, 378) - Me.btnCBAM_DS_DAKOSY_XML.Name = "btnCBAM_DS_DAKOSY_XML" - Me.btnCBAM_DS_DAKOSY_XML.Size = New System.Drawing.Size(130, 42) - Me.btnCBAM_DS_DAKOSY_XML.TabIndex = 40 - Me.btnCBAM_DS_DAKOSY_XML.Text = "XML" - Me.btnCBAM_DS_DAKOSY_XML.UseVisualStyleBackColor = True + Me.txtJahr._DateTimeOnly = False + Me.txtJahr._numbersOnly = False + Me.txtJahr._numbersOnlyKommastellen = "" + Me.txtJahr._numbersOnlyTrennzeichen = True + Me.txtJahr._Prozent = False + Me.txtJahr._ShortDateNew = False + Me.txtJahr._ShortDateOnly = False + Me.txtJahr._TimeOnly = False + Me.txtJahr._TimeOnly_Seconds = False + Me.txtJahr._value = "" + Me.txtJahr._Waehrung = False + Me.txtJahr._WaehrungZeichen = True + Me.txtJahr.ForeColor = System.Drawing.Color.Black + Me.txtJahr.Location = New System.Drawing.Point(562, 49) + Me.txtJahr.MaxLineLength = -1 + Me.txtJahr.MaxLines_Warning = "" + Me.txtJahr.MaxLines_Warning_Label = Nothing + Me.txtJahr.Name = "txtJahr" + Me.txtJahr.Size = New System.Drawing.Size(60, 20) + Me.txtJahr.TabIndex = 20 ' - 'Button2 + 'cboQuartal ' - Me.Button2.Enabled = False - Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button2.Location = New System.Drawing.Point(144, 426) - Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(130, 42) - Me.Button2.TabIndex = 42 - Me.Button2.Text = "In Zwischenablage kopieren" - Me.Button2.UseVisualStyleBackColor = True + Me.cboQuartal._allowedValuesFreiText = Nothing + Me.cboQuartal._allowFreiText = False + Me.cboQuartal._value = "" + Me.cboQuartal.FormattingEnabled = True + Me.cboQuartal.Items.AddRange(New Object() {"", "Q1", "Q2", "Q3", "Q4"}) + Me.cboQuartal.Location = New System.Drawing.Point(511, 48) + Me.cboQuartal.Name = "cboQuartal" + Me.cboQuartal.Size = New System.Drawing.Size(45, 21) + Me.cboQuartal.TabIndex = 19 ' - 'Button3 + 'txtVon ' - Me.Button3.Enabled = False - Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button3.Location = New System.Drawing.Point(106, 474) - Me.Button3.Name = "Button3" - Me.Button3.Size = New System.Drawing.Size(168, 42) - Me.Button3.TabIndex = 43 - Me.Button3.Text = "Alles in Zwischenablage kopieren" - Me.Button3.UseVisualStyleBackColor = True + Me.txtVon._DateTimeOnly = False + Me.txtVon._numbersOnly = False + Me.txtVon._numbersOnlyKommastellen = "" + Me.txtVon._numbersOnlyTrennzeichen = True + Me.txtVon._Prozent = False + Me.txtVon._ShortDateNew = False + Me.txtVon._ShortDateOnly = False + Me.txtVon._TimeOnly = False + Me.txtVon._TimeOnly_Seconds = False + Me.txtVon._value = "" + Me.txtVon._Waehrung = False + Me.txtVon._WaehrungZeichen = True + Me.txtVon.ForeColor = System.Drawing.Color.Black + Me.txtVon.Location = New System.Drawing.Point(744, 49) + Me.txtVon.MaxLineLength = -1 + Me.txtVon.MaxLines_Warning = "" + Me.txtVon.MaxLines_Warning_Label = Nothing + Me.txtVon.Name = "txtVon" + Me.txtVon.Size = New System.Drawing.Size(110, 20) + Me.txtVon.TabIndex = 15 + ' + 'txtBis + ' + Me.txtBis._DateTimeOnly = False + Me.txtBis._numbersOnly = False + Me.txtBis._numbersOnlyKommastellen = "" + Me.txtBis._numbersOnlyTrennzeichen = True + Me.txtBis._Prozent = False + Me.txtBis._ShortDateNew = False + Me.txtBis._ShortDateOnly = False + Me.txtBis._TimeOnly = False + Me.txtBis._TimeOnly_Seconds = False + Me.txtBis._value = "" + Me.txtBis._Waehrung = False + Me.txtBis._WaehrungZeichen = True + Me.txtBis.ForeColor = System.Drawing.Color.Black + Me.txtBis.Location = New System.Drawing.Point(860, 49) + Me.txtBis.MaxLineLength = -1 + Me.txtBis.MaxLines_Warning = "" + Me.txtBis.MaxLines_Warning_Label = Nothing + Me.txtBis.Name = "txtBis" + Me.txtBis.Size = New System.Drawing.Size(110, 20) + Me.txtBis.TabIndex = 14 + ' + 'txtEori + ' + Me.txtEori._DateTimeOnly = False + Me.txtEori._numbersOnly = False + Me.txtEori._numbersOnlyKommastellen = "" + Me.txtEori._numbersOnlyTrennzeichen = True + Me.txtEori._Prozent = False + Me.txtEori._ShortDateNew = False + Me.txtEori._ShortDateOnly = False + Me.txtEori._TimeOnly = False + Me.txtEori._TimeOnly_Seconds = False + Me.txtEori._value = "" + Me.txtEori._Waehrung = False + Me.txtEori._WaehrungZeichen = True + Me.txtEori.ForeColor = System.Drawing.Color.Black + Me.txtEori.Location = New System.Drawing.Point(106, 48) + Me.txtEori.MaxLineLength = -1 + Me.txtEori.MaxLines_Warning = "" + Me.txtEori.MaxLines_Warning_Label = Nothing + Me.txtEori.Name = "txtEori" + Me.txtEori.Size = New System.Drawing.Size(341, 20) + Me.txtEori.TabIndex = 1 + ' + 'Button1 + ' + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.Location = New System.Drawing.Point(106, 387) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(168, 42) + Me.Button1.TabIndex = 44 + Me.Button1.Text = "XML Datensatz generieren " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(DAKOSY)" + Me.Button1.UseVisualStyleBackColor = True ' 'usrCntlCBAM ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White - Me.Controls.Add(Me.Button3) + Me.Controls.Add(Me.Button1) Me.Controls.Add(Me.Button2) Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_XML) Me.Controls.Add(Me.MyPanel1) @@ -714,5 +712,5 @@ Partial Class usrCntlCBAM Friend WithEvents cbxVERAG As CheckBox Friend WithEvents btnCBAM_DS_DAKOSY_XML As Button Friend WithEvents Button2 As Button - Friend WithEvents Button3 As Button + Friend WithEvents Button1 As Button End Class diff --git a/SDL/kunden/usrCntlCBAM.vb b/SDL/kunden/usrCntlCBAM.vb index 2f58a48f..4c4d6fae 100644 --- a/SDL/kunden/usrCntlCBAM.vb +++ b/SDL/kunden/usrCntlCBAM.vb @@ -1,5 +1,6 @@  +Imports javax.xml.bind.annotation Imports VERAG_PROG_ALLGEMEIN.agsCustomsExchange Public Class usrCntlCBAM @@ -284,7 +285,7 @@ Public Class usrCntlCBAM End If End Sub - Private Sub Button4_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DAKOSY.Click + Private Sub btnCBAM_DS_DAKOSY_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DAKOSY.Click btnCBAM_DS_DAKOSY_Deteil.Enabled = False btnCBAM_DS_DAKOSY_Copy.Enabled = False btnCBAM_DS_DAKOSY_Deteil.Tag = "" @@ -386,8 +387,9 @@ Public Class usrCntlCBAM Dim SQLSTR = " SELECT - left(ezaWP_WarennummerEZT,8) Tarifnummer,sum(ezaWP_Eigenmasse)Eigenmasse,sum(ezaWP_Rohmasse)Rohmasse,sum(ezaWP_Artikelpreis)Rechnungspreis,eza_VersendungsLandCode VersendungsLand - FROM [VERAG].[dbo].[tblDakosy_EZA] + left(ezaWP_WarennummerEZT,8) Tarifnummer,sum(ezaWP_Eigenmasse)Eigenmasse,sum(ezaWP_Rohmasse)Rohmasse,sum(ezaWP_Artikelpreis)Rechnungspreis,eza_VersendungsLandCode VersendungsLand ,isnull(ezaWP_AnmeldeVErfahren,'') Verfahren,isnull([ezaWP_VerfahrensCodeVorangegangenesVerfahren],'') VorangegangenesVerfahren + + FROM [VERAG].[dbo].[tblDakosy_EZA] inner join tblDakosy_EZA_Warenposition on ezaWP_EzaId=eza_Id where eza_anmeldedatum between '" & txtVon._value & "' and '" & txtBis._value & "' @@ -423,7 +425,7 @@ Public Class usrCntlCBAM " End If - SQLSTR &= " group by eza_VersendungsLandCode,left(ezaWP_WarennummerEZT,8)" + SQLSTR &= " group by eza_VersendungsLandCode,left(ezaWP_WarennummerEZT,8),ezaWP_AnmeldeVErfahren,ezaWP_VerfahrensCodeVorangegangenesVerfahren" Dim dt = SQL.loadDgvBySql(SQLSTR, "FMZOLL", 600) @@ -439,50 +441,20 @@ Public Class usrCntlCBAM - '----- XML ---------------------------------------------------------------------------------------------------------------------------------------- + ''----- XML ---------------------------------------------------------------------------------------------------------------------------------------- - btnCBAM_DS_DAKOSY_XML.Enabled = False - btnCBAM_DS_DAKOSY_XML.Tag = "" + 'btnCBAM_DS_DAKOSY_XML.Enabled = False + 'btnCBAM_DS_DAKOSY_XML.Tag = "" - If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + 'If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + ' '--------------------------------------------------------------------------------------------------------------------------------------------- + ' doCBAM_XML(dt, EORI) + ' '--------------------------------------------------------------------------------------------------------------------------------------------- - Dim CBAM_XML As New VERAG_PROG_ALLGEMEIN.CBAM_QReport_17.QReportType - - CBAM_XML.Year = txtJahr.Text - CBAM_XML.ReportingPeriod = cboQuartal._value - - For Each g In dt.Rows - Dim GOODS As New VERAG_PROG_ALLGEMEIN.CBAM_QReport_17.ImportedGoodType - GOODS.CommodityCode.HsCode = g("Tarifnummer").ToString.Substring(0, 6) - GOODS.CommodityCode.CnCode = g("Tarifnummer").ToString.Substring(6, 2) - GOODS.OriginCountry.Country = g("VersendungsLand") - GOODS.MeasureImported.NetMass = g("Eigenmasse") - GOODS.MeasureImported.MeasurementUnit = "KG" - CBAM_XML.ImportedGood.Add(GOODS) - Next - - Dim optFileName = EORI & "_XML_" & txtVon._value & "-" & txtBis._value - Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\SDL\tmp\" ' My.Computer.FileSystem.GetTempFileName - If Not My.Computer.FileSystem.DirectoryExists(sPath) Then - My.Computer.FileSystem.CreateDirectory(sPath) - End If - - Dim filename = sPath & optFileName & ".xml" - While System.IO.File.Exists(filename) - filename = sPath & optFileName & Now.ToString("ddMMyyyyHHmmss") & ".xml" - End While + 'End If - CBAM_XML.SaveToFile(filename) - btnCBAM_DS_DAKOSY_XML.Tag = filename - btnCBAM_DS_DAKOSY_XML.Enabled = True - - Me.Cursor = Cursors.WaitCursor - - End If - - - '--------------------------------------------------------------------------------------------------------------------------------------------- + ''--------------------------------------------------------------------------------------------------------------------------------------------- Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -496,6 +468,193 @@ Public Class usrCntlCBAM End Sub + Private Sub ButtonXML_Click(sender As Object, e As EventArgs) Handles Button1.Click + Button2.Enabled = False + btnCBAM_DS_DAKOSY_XML.Enabled = False + btnCBAM_DS_DAKOSY_XML.Tag = "" + + + '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + + + Try + Dim EORI = txtEori.Text + If cbxVERAG.Checked Then EORI = "VERAG" + If EORI = "" Then MsgBox("EORI eingeben!") : Exit Sub + If txtVon._value = "" Then MsgBox("Datum von eingeben!") : Exit Sub + If txtBis._value = "" Then MsgBox("Datum bis eingeben!") : Exit Sub + Me.Cursor = Cursors.WaitCursor + + Dim SQLSTR = " + SELECT + left(ezaWP_WarennummerEZT,8) Tarifnummer,sum(ezaWP_Eigenmasse)Eigenmasse,sum(ezaWP_Rohmasse)Rohmasse,sum(ezaWP_Artikelpreis)Rechnungspreis,eza_VersendungsLandCode VersendungsLand ,isnull(ezaWP_AnmeldeVErfahren,'') Verfahren,isnull([ezaWP_VerfahrensCodeVorangegangenesVerfahren],'') VorangegangenesVerfahren + ,isnull(ezaAd_NameFirma1,'') as Empfänger,isnull(ezaAd_TeilnehmerEORI,'') as EmpfängerEORI + + FROM [VERAG].[dbo].[tblDakosy_EZA] + inner join tblDakosy_EZA_Warenposition on ezaWP_EzaId=eza_Id + inner join tblDakosy_EZA_Adressen on ezaAd_EZAId=eza_Id and [ezaAd_AdressTyp]='CN' + where + eza_anmeldedatum between '" & txtVon._value & "' and '" & txtBis._value & "' + and + ( + left(ezaWP_WarennummerEZT,4) IN (2523,2716,2808,2814,3102,3105,7201,7203,7318,7326,7601,7616) + OR left(ezaWP_WarennummerEZT,4) between 7301 and 7311 + OR left(ezaWP_WarennummerEZT,4) between 7205 and 7229 + OR left(ezaWP_WarennummerEZT,4) between 7603 and 7614 + OR ezaWP_WarennummerEZT like '25070080%' + OR ezaWP_WarennummerEZT like '283421%' + OR ezaWP_WarennummerEZT like '260112%' + OR ezaWP_WarennummerEZT like '720211%' + OR ezaWP_WarennummerEZT like '720219%' + OR ezaWP_WarennummerEZT like '720241%' + OR ezaWP_WarennummerEZT like '720249%' + OR ezaWP_WarennummerEZT like '720260%' + OR ezaWP_WarennummerEZT like '280410%' + + ) + and ezaWP_WarennummerEZT not like '310560%' + and (eza_status between 50 and 60 or [eza_ANR] LIKE 'ATC%') + + " + + If cbxVERAG.Checked Then + SQLSTR &= " + and eza_VertretungsVerhaeltnisCode=2 + " + Else + SQLSTR &= " + and (select isnull([ezaAd_NameFirma1],[ezaAd_TeilnehmerEORI]) FROM tblDakosy_EZA_Adressen WHERE ezaAd_EZAId=eza_Id and [ezaAd_AdressTyp]='CN')='" & EORI & "' + " + End If + + SQLSTR &= " group by ezaAd_NameFirma1,ezaAd_TeilnehmerEORI,eza_VersendungsLandCode,left(ezaWP_WarennummerEZT,8),ezaWP_AnmeldeVErfahren,ezaWP_VerfahrensCodeVorangegangenesVerfahren" + + + Dim dt = SQL.loadDgvBySql(SQLSTR, "FMZOLL", 600) + + + + + '----- XML ---------------------------------------------------------------------------------------------------------------------------------------- + + + If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + '--------------------------------------------------------------------------------------------------------------------------------------------- + doCBAM_XML(dt, EORI) + '--------------------------------------------------------------------------------------------------------------------------------------------- + Button2.Enabled = True + btnCBAM_DS_DAKOSY_XML.Enabled = True + + End If + + + '--------------------------------------------------------------------------------------------------------------------------------------------- + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + Me.Cursor = Cursors.Default + + End Sub + + Private Sub doCBAM_XML(dt As DataTable, EORI As String) + Dim CBAM_XML As New VERAG_PROG_ALLGEMEIN.CBAM_QReport_17.QReportType + + CBAM_XML.Year = txtJahr.Text + CBAM_XML.ReportingPeriod = cboQuartal._value + EORI = txtEori.Text ' Sont VERAG problem.. + + If cbxVERAG.Checked Then ' VERAG--> Indirect Representative + CBAM_XML.Representative.IdentificationNumber = EORI + Dim AD As VERAG_PROG_ALLGEMEIN.cAdressen = Nothing + Select Case EORI + Case "DE4824105" + AD = New VERAG_PROG_ALLGEMEIN.cAdressen(712255) 'VERAG GmbH (DE) + Case "ATEOS1000000199" + AD = New VERAG_PROG_ALLGEMEIN.cAdressen(711104) 'VERAG AG (AT) + Case "ATEOS1000059121" + AD = New VERAG_PROG_ALLGEMEIN.cAdressen(600006) 'VERAG Customs Service GmbH (AT) + + End Select + If AD IsNot Nothing Then + CBAM_XML.Representative.Name = AD.Name_1 + If If(AD.Name_2, "") <> "" Then CBAM_XML.Representative.Name &= " " & AD.Name_2 + If AD.LandKz <> "" Then CBAM_XML.Representative.RepresentativeAddress.Country = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2Land(AD.LandKz) + CBAM_XML.Representative.RepresentativeAddress.Street = If(AD.Straße, "") + CBAM_XML.Representative.RepresentativeAddress.Postcode = If(AD.PLZ, "") + End If + End If + + 'Dim KD_IMP = VERAG_PROG_ALLGEMEIN.cKunde.LOAD_ByEORI(EORI) + 'If KD_IMP.hasEntry Then + ' Dim A_IMP As New VERAG_PROG_ALLGEMEIN.cAdressen(KD_IMP.KundenNrZentrale) + ' If A_IMP IsNot Nothing AndAlso A_IMP.hasEntry Then + ' CBAM_XML.Importer.Name = A_IMP.Name_1 + ' If If(A_IMP.Name_2, "") <> "" Then CBAM_XML.Importer.Name &= " " & A_IMP.Name_2 + ' If A_IMP.LandKz <> "" Then CBAM_XML.Importer.ImporterAddress.Country = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2Land(A_IMP.LandKz) + ' CBAM_XML.Importer.ImporterAddress.Street = If(A_IMP.Straße, "") + ' CBAM_XML.Importer.ImporterAddress.Postcode = If(A_IMP.PLZ, "") + ' End If + 'End If + + + For Each g In dt.Rows + Dim GOODS As New VERAG_PROG_ALLGEMEIN.CBAM_QReport_17.ImportedGoodType + GOODS.CommodityCode.HsCode = g("Tarifnummer").ToString.Substring(0, 6) + GOODS.CommodityCode.CnCode = g("Tarifnummer").ToString.Substring(6, 2) + GOODS.OriginCountry.Country = g("VersendungsLand") + GOODS.MeasureImported.NetMass = g("Eigenmasse") + GOODS.MeasureImported.MeasurementUnit = "KG" + + ' ezaAd_NameFirma1, ezaAd_TeilnehmerEORI, + If g("EmpfängerEORI") <> "" Then + + + Dim KD_IMP = VERAG_PROG_ALLGEMEIN.cKunde.LOAD_ByEORI(g("EmpfängerEORI")) + If KD_IMP.hasEntry Then + Dim A_IMP As New VERAG_PROG_ALLGEMEIN.cAdressen(KD_IMP.KundenNrZentrale) + If A_IMP IsNot Nothing AndAlso A_IMP.hasEntry Then + GOODS.Importer.Name = A_IMP.Name_1 + If If(A_IMP.Name_2, "") <> "" Then GOODS.Importer.Name &= " " & A_IMP.Name_2 + If A_IMP.LandKz <> "" Then GOODS.Importer.ImporterAddress.Country = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2Land(A_IMP.LandKz) + GOODS.Importer.ImporterAddress.Street = If(A_IMP.Straße, "") + GOODS.Importer.ImporterAddress.Postcode = If(A_IMP.PLZ, "") + End If + End If + Else + GOODS.Importer.Name = g("Empfänger") + + End If + + + Dim IQ As New VERAG_PROG_ALLGEMEIN.CBAM_QReport_17.ImportedQuantityType + If g("Verfahren") <> "" Then IQ.Procedure.RequestedProc = g("Verfahren").ToString.Substring(0, 2) + If g("VorangegangenesVerfahren") <> "" Then IQ.Procedure.PreviousProc = g("VorangegangenesVerfahren").ToString.Substring(0, 2) + GOODS.ImportedQuantity.Add(IQ) + CBAM_XML.ImportedGood.Add(GOODS) + Next + + Dim optFileName = EORI & "_XML_" & txtVon._value & "-" & txtBis._value + Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\SDL\tmp\" ' My.Computer.FileSystem.GetTempFileName + If Not My.Computer.FileSystem.DirectoryExists(sPath) Then + My.Computer.FileSystem.CreateDirectory(sPath) + End If + + Dim filename = sPath & optFileName & ".xml" + While System.IO.File.Exists(filename) + filename = sPath & optFileName & Now.ToString("ddMMyyyyHHmmss") & ".xml" + End While + + + CBAM_XML.SaveToFile(filename) + btnCBAM_DS_DAKOSY_XML.Tag = filename + btnCBAM_DS_DAKOSY_XML.Enabled = True + + 'Me.Cursor = Cursors.WaitCursor + End Sub + + Private Sub btnCBAM_DS_DAKOSY_Deteil_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DAKOSY_Deteil.Click, btnCBAM_DS_DAKOSY_Summe.Click, btnCBAM_DS_DHF_VERAG_Deteil.Click, btnCBAM_DS_DHF_VERAG_Summe.Click, btnCBAM_DS_DHF_UNISPED_Deteil.Click, btnCBAM_DS_DHF_UNISPED_Summe.Click, btnCBAM_DS_TELOTEC_Detail.Click, btnCBAM_DS_TELOTEC_Summe.Click, btnCBAM_DS_DAKOSY_XML.Click @@ -750,7 +909,7 @@ Public Class usrCntlCBAM End Sub - Private Sub Button1_Click(sender As Object, e As EventArgs) + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click End Sub @@ -766,7 +925,7 @@ Public Class usrCntlCBAM End If End Sub - Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click + Private Sub Button3_Click(sender As Object, e As EventArgs) Dim f As New List(Of String) If btnCBAM_DS_DAKOSY_Deteil.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Deteil.Tag) If btnCBAM_DS_DAKOSY_Summe.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Summe.Tag) diff --git a/SDLUPDATER/App.config b/SDLUPDATER/App.config index ade40453..24a91088 100644 --- a/SDLUPDATER/App.config +++ b/SDLUPDATER/App.config @@ -1,7 +1,7 @@ - + diff --git a/SDLUPDATER/My Project/Application.Designer.vb b/SDLUPDATER/My Project/Application.Designer.vb index 1c2d69b5..1c32a12d 100644 --- a/SDLUPDATER/My Project/Application.Designer.vb +++ b/SDLUPDATER/My Project/Application.Designer.vb @@ -34,5 +34,11 @@ Namespace My Protected Overrides Sub OnCreateMainForm() Me.MainForm = Global.SDLUPDATER.UPDATERfrm End Sub + + _ + Protected Overrides Function OnInitialize(ByVal commandLineArgs As System.Collections.ObjectModel.ReadOnlyCollection(Of String)) As Boolean + Me.MinimumSplashScreenDisplayTime = 0 + Return MyBase.OnInitialize(commandLineArgs) + End Function End Class End Namespace diff --git a/SDLUPDATER/My Project/Settings.Designer.vb b/SDLUPDATER/My Project/Settings.Designer.vb index 97f3c0df..62cc9922 100644 --- a/SDLUPDATER/My Project/Settings.Designer.vb +++ b/SDLUPDATER/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/SDLUPDATER/SDLUPDATER.vbproj b/SDLUPDATER/SDLUPDATER.vbproj index babb89f7..6cb68fb6 100644 --- a/SDLUPDATER/SDLUPDATER.vbproj +++ b/SDLUPDATER/SDLUPDATER.vbproj @@ -11,7 +11,7 @@ SDLUPDATER 512 WindowsForms - v4.7 + v4.8 false publish\ diff --git a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb index c05c2961..5a6e5ce4 100644 --- a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb +++ b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb @@ -1920,6 +1920,9 @@ Public Class cVermerk Property Beschreibung As String = "" Property SMSId As Integer Property SMSStatus As Integer + Property Geloescht As Boolean + Property AAS_Warnstufe As Boolean + Property HintergrundVermerk As Boolean End Class @@ -1953,6 +1956,9 @@ Public Class cVermerkeDAL daten.VorauskasseId = VarToInt(dr.Item("VorauskasseId")) daten.SMSId = VarToInt(dr.Item("SMSId")) daten.SMSStatus = VarToInt(dr.Item("SMSstatus")) + daten.Geloescht = VarToBool(dr.Item("Geloescht")) + daten.AAS_Warnstufe = VarToBool(dr.Item("AAS_Warnstufe")) + daten.HintergrundVermerk = VarToBool(dr.Item("HintergrundVermerk")) End If dr.Close() End Using @@ -2125,11 +2131,11 @@ Public Class cVermerkeDAL If d.VermerkID = 0 Then 'Neuanlage hAuswahl = "INSERT INTO Vermerke " & - "(AvisoID,VermerkArt,SendungID, Datum, Mitarbeiter, Hinweis_Vermerk, VermerkeCode,MitarbeiterId,Beschreibung,VorauskasseId,SMSId,SMSStatus) VALUES (@AvisoID,@VermerkArt, @SendungID, @Datum, @Mitarbeiter, @Hinweis_Vermerk, @VermerkeCode,@MitarbeiterId,@Beschreibung,@VorauskasseId,@SMSId,@SMSStatus)" + "(AvisoID,VermerkArt,SendungID, Datum, Mitarbeiter, Hinweis_Vermerk, VermerkeCode,MitarbeiterId,Beschreibung,VorauskasseId,SMSId,SMSStatus,Geloescht,AAS_Warnstufe,HintergrundVermerk) VALUES (@AvisoID,@VermerkArt, @SendungID, @Datum, @Mitarbeiter, @Hinweis_Vermerk, @VermerkeCode,@MitarbeiterId,@Beschreibung,@VorauskasseId,@SMSId,@SMSStatus,@Geloescht,@AAS_Warnstufe,@HintergrundVermerk)" Else 'Änderung hAuswahl = String.Format( - "UPDATE Vermerke SET AvisoID = @AvisoID, VermerkArt=@VermerkArt,SendungID=@SendungID,Datum = @Datum, Mitarbeiter = @Mitarbeiter, Hinweis_Vermerk = @Hinweis_Vermerk, VermerkeCode = @VermerkeCode, MitarbeiterId=@MitarbeiterId, Beschreibung=@Beschreibung,VorauskasseId=@VorauskasseId WHERE VermerkID = @VermerkID,SMSId=@SMSId,SMSStatus=@SMSStatus") + "UPDATE Vermerke SET AvisoID = @AvisoID, VermerkArt=@VermerkArt,SendungID=@SendungID,Datum = @Datum, Mitarbeiter = @Mitarbeiter, Hinweis_Vermerk = @Hinweis_Vermerk, VermerkeCode = @VermerkeCode, MitarbeiterId=@MitarbeiterId, Beschreibung=@Beschreibung,VorauskasseId=@VorauskasseId WHERE VermerkID = @VermerkID,SMSId=@SMSId,SMSStatus=@SMSStatus,Geloescht=@Geloescht,AAS_Warnstufe=@AAS_Warnstufe,HintergrundVermerk=@HintergrundVermerk") End If Dim sql = hAuswahl Dim conn As SqlConnection = cDatenbankAVISO.GetNewOpenConnection() @@ -2147,6 +2153,9 @@ Public Class cVermerkeDAL cmd.Parameters.AddWithValue("@VorauskasseId", If(d.VorauskasseId IsNot Nothing, d.VorauskasseId, DBNull.Value)) cmd.Parameters.AddWithValue("@SMSId", d.SMSId) cmd.Parameters.AddWithValue("@SMSStatus", d.SMSStatus) + cmd.Parameters.AddWithValue("@Geloescht", d.Geloescht) + cmd.Parameters.AddWithValue("@AAS_Warnstufe", d.AAS_Warnstufe) + cmd.Parameters.AddWithValue("@HintergrundVermerk", d.HintergrundVermerk) Try cmd.ExecuteNonQuery() @@ -2182,6 +2191,25 @@ Public Class cVermerkeDAL Return False End Function + Public Shared Function increaseWarnstufe(VermerkID) As Boolean + + Dim SQLstr As String = " UPDATE Vermerke SET AAS_Warnstufe = (AAS_Warnstufe+1) WHERE VermerkID = @VermerkID" + Dim conn As SqlConnection = cDatenbankAVISO.GetNewOpenConnection() + Using cmd As New SqlCommand(SQLstr, conn) + cmd.Parameters.AddWithValue("@VermerkID", VermerkID) + + Try + cmd.ExecuteNonQuery() + Return True + Catch ex As SqlException + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End Using + conn.Close() + Return False + End Function + + Public Sub togglegeloescht(ByVal hID As Integer, ByVal VermerkText As String, AvisoID As Integer) Dim sql = String.Format("UPDATE Vermerke SET Geloescht=Geloescht-1 WHERE VermerkID = {0}", hID) diff --git a/VERAG_PROG_ALLGEMEIN/App.config b/VERAG_PROG_ALLGEMEIN/App.config index 0dede84a..b281dd61 100644 --- a/VERAG_PROG_ALLGEMEIN/App.config +++ b/VERAG_PROG_ALLGEMEIN/App.config @@ -9,52 +9,31 @@ - - - - - - - - - - - - - - - - - - - - - connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=ASFINAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;" /> - + + + + + + + + + + + + + + + + + + + + + connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=ASFINAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;" /> + - + @@ -65,30 +44,25 @@ Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=DISPO;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200 - + - + http://ec.europa.eu/taxation_customs/vies/services/checkVatService - + https://finanzonline.bmf.gv.at/fon/ws/uidAbfrage/ - + https://finanzonline.bmf.gv.at:443/fonws/ws/session - + http://localhost:8733/DSFinVKService - + http://ec.europa.eu/taxation_customs/vies/services/checkVatTestService @@ -96,17 +70,13 @@ - - + + - - + + diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKunde.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKunde.vb index a54805ea..608c90cf 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKunde.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKunde.vb @@ -89,6 +89,9 @@ Public Class cKunde Public hasEntry As Boolean = False Dim SQL As New SQL + Sub New() + + End Sub Sub New(KundenNr) Me.KundenNr = KundenNr If KundenNr <= 0 Then @@ -311,6 +314,54 @@ Public Class cKunde ' Return Nothing End Sub + Public Shared Function LOAD_ByEORI(EORI) As cKunde + Dim test = "" + Dim KUNDE As New cKunde() + Try + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("SELECT * FROM Kunden INNER JOIN Filialen on Filialen.FilialenNr=Kunden.FilialenNr WHERE EORITIN=@EORITIN and ( '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA.Replace("ATILLA", "VERAG") & "' IN (Filialen.Firma,Filialen.Cluster)) ", conn) + cmd.Parameters.AddWithValue("@EORITIN", EORI) + + Dim dr = cmd.ExecuteReader() + If dr.Read Then + For Each li In KUNDE.getParameterList() + ' Me.GetType.GetProperty(l.Scalarvariable) = dr.Item(l.Text) + Dim propInfo As PropertyInfo = KUNDE.GetType.GetProperty(li.Scalarvariable) + ' MsgBox(l.Text) + ' MsgBox(propInfo.PropertyType.ToString) + ' propInfo.SetValue(GetType(Object), l.Text) + + 'propInfo.SetValue(Me, l.Text) + + ' Try + test = li.Text + If dr.Item(li.Text) Is DBNull.Value Then + propInfo.SetValue(KUNDE, Nothing) + Else + propInfo.SetValue(KUNDE, dr.Item(li.Text)) + End If + + ' Catch ex As Exception + + ' End Try + + ' Me.GetType.GetProperty(l.Scalarvariable).setSetValue(GetType(Object), l.Text) + 'If propInfo IsNot Nothing Then + 'propInfo.SetValue(l.Scalarvariable, l.Text) + ' End If + Next + KUNDE.hasEntry = True + End If + dr.Close() + End Using + End Using + Return KUNDE + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return Nothing + End Function + Public Function getUpdateCmd() As String diff --git a/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb b/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb index b515438f..57633c08 100644 --- a/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb @@ -13,15 +13,15 @@ Option Explicit On Namespace My - - + + _ Partial Public NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings) - + + 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 @@ -36,10 +36,10 @@ Namespace My End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - + #If _MyType = "WindowsForms" Then If Not addedHandler Then SyncLock addedHandlerLockObject @@ -53,296 +53,296 @@ Namespace My Return defaultInstance End Get End Property - - + + _ Public Property SCANCANON_PRODConnectionString() As String Get - Return CType(Me("SCANCANON_PRODConnectionString"), String) + Return CType(Me("SCANCANON_PRODConnectionString"),String) End Get Set - Me("SCANCANON_PRODConnectionString") = Value + Me("SCANCANON_PRODConnectionString") = value End Set End Property - - + + _ Public ReadOnly Property VERAG_PROG_ALLGEMEIN_UIDPruefung_checkVatService() As String Get - Return CType(Me("VERAG_PROG_ALLGEMEIN_UIDPruefung_checkVatService"), String) + Return CType(Me("VERAG_PROG_ALLGEMEIN_UIDPruefung_checkVatService"),String) End Get End Property - - + + _ Public Property DISPOConnectionString() As String Get - Return CType(Me("DISPOConnectionString"), String) + Return CType(Me("DISPOConnectionString"),String) End Get Set - Me("DISPOConnectionString") = Value + Me("DISPOConnectionString") = value End Set End Property - - + + _ Public ReadOnly Property VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_uidAbfrageService() As String Get - Return CType(Me("VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_uidAbfrageService"), String) + Return CType(Me("VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_uidAbfrageService"),String) End Get End Property - - + + _ Public ReadOnly Property VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_session_sessionService() As String Get - Return CType(Me("VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_session_sessionService"), String) + Return CType(Me("VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_session_sessionService"),String) End Get End Property - - + + _ Public Property asdadasdasdasdasdasd() As String Get - Return CType(Me("asdadasdasdasdasdasd"), String) + Return CType(Me("asdadasdasdasdasdasd"),String) End Get Set - Me("asdadasdasdasdasdasd") = Value + Me("asdadasdasdasdasdasd") = value End Set End Property - - + + _ Public ReadOnly Property FMZOLL_PRODConnectionString() As String Get - Return CType(Me("FMZOLL_PRODConnectionString"), String) + Return CType(Me("FMZOLL_PRODConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property SYSKAConnectionString() As String Get - Return CType(Me("SYSKAConnectionString"), String) + Return CType(Me("SYSKAConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property ATLASConnectionString() As String Get - Return CType(Me("ATLASConnectionString"), String) + Return CType(Me("ATLASConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property ADMINConnectionString_DEV() As String Get - Return CType(Me("ADMINConnectionString_DEV"), String) + Return CType(Me("ADMINConnectionString_DEV"),String) End Get End Property - - + + _ Public ReadOnly Property SDL_PRODConnectionString() As String Get - Return CType(Me("SDL_PRODConnectionString"), String) + Return CType(Me("SDL_PRODConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property FMZOLLConnectionString() As String Get - Return CType(Me("FMZOLLConnectionString"), String) + Return CType(Me("FMZOLLConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property AVISOConnectionStringTEST() As String Get - Return CType(Me("AVISOConnectionStringTEST"), String) + Return CType(Me("AVISOConnectionStringTEST"),String) End Get End Property - - + + _ Public ReadOnly Property AVISOConnectionString() As String Get - Return CType(Me("AVISOConnectionString"), String) + Return CType(Me("AVISOConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property SDLConnectionString() As String Get - Return CType(Me("SDLConnectionString"), String) + Return CType(Me("SDLConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property EZOLLConnectionString() As String Get - Return CType(Me("EZOLLConnectionString"), String) + Return CType(Me("EZOLLConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property AVISO_ATILLAConnectionString() As String Get - Return CType(Me("AVISO_ATILLAConnectionString"), String) + Return CType(Me("AVISO_ATILLAConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property ATLAS_SBGConnectionString() As String Get - Return CType(Me("ATLAS_SBGConnectionString"), String) + Return CType(Me("ATLAS_SBGConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property UIDConnectionString() As String Get - Return CType(Me("UIDConnectionString"), String) + Return CType(Me("UIDConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property UID_PRODConnectionString() As String Get - Return CType(Me("UID_PRODConnectionString"), String) + Return CType(Me("UID_PRODConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property FDConnectionString() As String Get - Return CType(Me("FDConnectionString"), String) + Return CType(Me("FDConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property FD_PRODConnectionString() As String Get - Return CType(Me("FD_PRODConnectionString"), String) + Return CType(Me("FD_PRODConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property DISPOConnectionStringTEST() As String Get - Return CType(Me("DISPOConnectionStringTEST"), String) + Return CType(Me("DISPOConnectionStringTEST"),String) End Get End Property - - + + _ Public ReadOnly Property VERAG_PROG_ALLGEMEIN_RKSV_DE_DSFinVKService_DSFinVKServer() As String Get - Return CType(Me("VERAG_PROG_ALLGEMEIN_RKSV_DE_DSFinVKService_DSFinVKServer"), String) + Return CType(Me("VERAG_PROG_ALLGEMEIN_RKSV_DE_DSFinVKService_DSFinVKServer"),String) End Get End Property - - + + _ Public ReadOnly Property VERAG_PROG_ALLGEMEIN_eu_europa_ec_checkVatTestService() As String Get - Return CType(Me("VERAG_PROG_ALLGEMEIN_eu_europa_ec_checkVatTestService"), String) + Return CType(Me("VERAG_PROG_ALLGEMEIN_eu_europa_ec_checkVatTestService"),String) End Get End Property - - + + _ Public ReadOnly Property ADMINConnectionString_OLD() As String Get - Return CType(Me("ADMINConnectionString_OLD"), String) + Return CType(Me("ADMINConnectionString_OLD"),String) End Get End Property diff --git a/VERAG_PROG_ALLGEMEIN/My Project/license.elic.xml b/VERAG_PROG_ALLGEMEIN/My Project/license.elic.xml index fb5cc36c..030cec9f 100644 --- a/VERAG_PROG_ALLGEMEIN/My Project/license.elic.xml +++ b/VERAG_PROG_ALLGEMEIN/My Project/license.elic.xml @@ -1,32 +1,26 @@ - - - Runtime - VERAG Spedition AG - al@verag.ag - VERAG Spedition AG - 2022-07-12T00:00:00Z - 2023-07-12T00:00:00Z - - - Spire.PDFViewer for Forms - 7.1 - - 1 - 1 - - - - Spire.PDF Pro Edition - 8.7 - - 1 - 1 - - - - - e-iceblue - sales@e-iceblue.com - http://www.e-iceblue.com - - \ No newline at end of file + + + B081D0F5-EF94-42F2-B287-4812D84164CE + Runtime + VERAG Spedition AG + al@verag.ag + VERAG Spedition AG + 2024-08-31T00:00:00Z + 2025-08-31T00:00:00Z + + + Spire.PDF Pro Edition + 10.7 + + Developer Subscription + 1 + 1 + + + + + e-iceblue + sales@e-iceblue.com + http://www.e-iceblue.com + + diff --git a/VERAG_PROG_ALLGEMEIN/My Project/licenseViewer.elic.xml b/VERAG_PROG_ALLGEMEIN/My Project/licenseViewer.elic.xml new file mode 100644 index 00000000..30f93032 --- /dev/null +++ b/VERAG_PROG_ALLGEMEIN/My Project/licenseViewer.elic.xml @@ -0,0 +1,25 @@ + + + Runtime + VERAG Spedition AG + al@verag.ag + VERAG Spedition AG + 2024-08-31T00:00:00Z + 2025-08-31T00:00:00Z + + + Spire.PDFViewer for Forms + 7.12 + + Developer Subscription + 1 + 1 + + + + + e-iceblue + sales@e-iceblue.com + http://www.e-iceblue.com + + diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index 5fbbf0e4..fa5c5e22 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -12,7 +12,7 @@ VERAG_PROG_ALLGEMEIN 512 Windows - v4.7 + v4.8 @@ -132,17 +132,11 @@ False F:\PROGRAMMIERUNG\dll\NetSpell.SpellChecker.DLL - - False - F:\PROGRAMMIERUNG\dll\Spire.PDF\2023\Spire.License.dll + + ..\..\..\dll\Spire.PDF\2024\Spire.Pdf.dll - - False - F:\PROGRAMMIERUNG\dll\Spire.PDF\2023\Spire.Pdf.dll - - - False - F:\PROGRAMMIERUNG\dll\Spire.PDF\2023\Spire.PdfViewer.Forms.dll + + ..\..\..\dll\Spire.PDF\2024\Spire.PdfViewer.Forms.dll @@ -604,6 +598,7 @@ True Application.myapp + True True @@ -1417,6 +1412,9 @@ + + +