From 5e910875ee965645e9ca2171db669547b24679e2 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Mon, 19 Dec 2022 14:11:30 +0100 Subject: [PATCH] DY:Stammreferenzen in AES --- .../ATLAS/AES/usrCntlATLAS_AES.Designer.vb | 84 ++++++++++------ .../DAKOSY/ATLAS/AES/usrCntlATLAS_AES.resx | 3 - .../DAKOSY/ATLAS/AES/usrCntlATLAS_AES.vb | 95 +++++++++++++++---- .../ATLAS/EZA/usrCntlATLAS_EZA.Designer.vb | 36 +++---- .../DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.resx | 3 - .../DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb | 1 + .../DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb | 2 +- .../DAKOSY/ATLAS/cDakosyInterface_Send.vb | 2 +- .../Stammreferenz/frmDakosyStammreferenz.vb | 1 + .../frmDakosyStammreferenzVerwalten.vb | 1 + 10 files changed, 156 insertions(+), 72 deletions(-) diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.Designer.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.Designer.vb index 4b7d651b..aa073521 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.Designer.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.Designer.vb @@ -32,6 +32,8 @@ Partial Class usrCntlATLAS_AES Me.btnPositionen = New System.Windows.Forms.Button() Me.Button5 = New System.Windows.Forms.Button() Me.pnl = New System.Windows.Forms.Panel() + Me.Label6 = New System.Windows.Forms.Label() + Me.cboStammreferenz = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboDakosyAction = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button1 = New System.Windows.Forms.Button() Me.Label4 = New System.Windows.Forms.Label() @@ -47,8 +49,8 @@ Partial Class usrCntlATLAS_AES Me.OptionenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SpeichernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LadenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.Label6 = New System.Windows.Forms.Label() - Me.cboStammreferenz = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtDyMandant = New System.Windows.Forms.Label() + Me.txtDyNiederlassung = New System.Windows.Forms.Label() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer.Panel1.SuspendLayout() Me.SplitContainer.SuspendLayout() @@ -104,7 +106,7 @@ Partial Class usrCntlATLAS_AES Me.btnAllgemein.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center Me.btnAllgemein.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnAllgemein.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.btnAllgemein.Image = Global.SDL.My.Resources.android_note12 + Me.btnAllgemein.Image = Global.SDL.My.Resources.Resources.android_note12 Me.btnAllgemein.ImageAlign = System.Drawing.ContentAlignment.TopCenter Me.btnAllgemein.Location = New System.Drawing.Point(2, 2) Me.btnAllgemein.Margin = New System.Windows.Forms.Padding(2) @@ -121,7 +123,7 @@ Partial Class usrCntlATLAS_AES Me.btnAdressen.BackColor = System.Drawing.Color.White Me.btnAdressen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center Me.btnAdressen.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnAdressen.Image = Global.SDL.My.Resources.house1 + Me.btnAdressen.Image = Global.SDL.My.Resources.Resources.house1 Me.btnAdressen.ImageAlign = System.Drawing.ContentAlignment.TopCenter Me.btnAdressen.Location = New System.Drawing.Point(81, 2) Me.btnAdressen.Margin = New System.Windows.Forms.Padding(2) @@ -138,7 +140,7 @@ Partial Class usrCntlATLAS_AES Me.btnSicherheit.BackColor = System.Drawing.Color.White Me.btnSicherheit.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center Me.btnSicherheit.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnSicherheit.Image = Global.SDL.My.Resources.sicherheit1 + Me.btnSicherheit.Image = Global.SDL.My.Resources.Resources.sicherheit1 Me.btnSicherheit.ImageAlign = System.Drawing.ContentAlignment.TopCenter Me.btnSicherheit.Location = New System.Drawing.Point(160, 2) Me.btnSicherheit.Margin = New System.Windows.Forms.Padding(2) @@ -156,7 +158,7 @@ Partial Class usrCntlATLAS_AES Me.btnAktiveVeredelung.BackColor = System.Drawing.Color.White Me.btnAktiveVeredelung.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center Me.btnAktiveVeredelung.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnAktiveVeredelung.Image = Global.SDL.My.Resources.aktiveVeredelung1 + Me.btnAktiveVeredelung.Image = Global.SDL.My.Resources.Resources.aktiveVeredelung1 Me.btnAktiveVeredelung.ImageAlign = System.Drawing.ContentAlignment.TopCenter Me.btnAktiveVeredelung.Location = New System.Drawing.Point(245, 2) Me.btnAktiveVeredelung.Margin = New System.Windows.Forms.Padding(2) @@ -174,7 +176,7 @@ Partial Class usrCntlATLAS_AES Me.btnPositionen.BackColor = System.Drawing.Color.White Me.btnPositionen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center Me.btnPositionen.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnPositionen.Image = Global.SDL.My.Resources.list_new_small2 + Me.btnPositionen.Image = Global.SDL.My.Resources.Resources.list_new_small2 Me.btnPositionen.ImageAlign = System.Drawing.ContentAlignment.TopCenter Me.btnPositionen.Location = New System.Drawing.Point(343, 2) Me.btnPositionen.Margin = New System.Windows.Forms.Padding(2) @@ -192,7 +194,7 @@ Partial Class usrCntlATLAS_AES Me.Button5.BackColor = System.Drawing.Color.White Me.Button5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button5.Image = Global.SDL.My.Resources.android_note12 + Me.Button5.Image = Global.SDL.My.Resources.Resources.android_note12 Me.Button5.ImageAlign = System.Drawing.ContentAlignment.TopCenter Me.Button5.Location = New System.Drawing.Point(428, 2) Me.Button5.Margin = New System.Windows.Forms.Padding(2) @@ -222,6 +224,31 @@ Partial Class usrCntlATLAS_AES Me.pnl.Size = New System.Drawing.Size(361, 72) Me.pnl.TabIndex = 1 ' + 'Label6 + ' + Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label6.AutoSize = True + Me.Label6.Location = New System.Drawing.Point(8, 51) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(57, 13) + Me.Label6.TabIndex = 16 + Me.Label6.Text = "Stammref.:" + Me.Label6.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'cboStammreferenz + ' + Me.cboStammreferenz._allowedValuesFreiText = Nothing + Me.cboStammreferenz._allowFreiText = False + Me.cboStammreferenz._value = "" + Me.cboStammreferenz.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.cboStammreferenz.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboStammreferenz.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cboStammreferenz.FormattingEnabled = True + Me.cboStammreferenz.Location = New System.Drawing.Point(71, 48) + Me.cboStammreferenz.Name = "cboStammreferenz" + Me.cboStammreferenz.Size = New System.Drawing.Size(129, 21) + Me.cboStammreferenz.TabIndex = 15 + ' 'cboDakosyAction ' Me.cboDakosyAction._allowedValuesFreiText = Nothing @@ -335,6 +362,8 @@ Partial Class usrCntlATLAS_AES ' 'Panel1 ' + Me.Panel1.Controls.Add(Me.txtDyMandant) + Me.Panel1.Controls.Add(Me.txtDyNiederlassung) Me.Panel1.Controls.Add(Me.Label1) Me.Panel1.Controls.Add(Me.lblBezugsnummer) Me.Panel1.Controls.Add(Me.MenuStrip) @@ -372,30 +401,24 @@ Partial Class usrCntlATLAS_AES Me.LadenToolStripMenuItem.Size = New System.Drawing.Size(126, 22) Me.LadenToolStripMenuItem.Text = "Laden ..." ' - 'Label6 + 'txtDyMandant ' - Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(8, 51) - Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(57, 13) - Me.Label6.TabIndex = 16 - Me.Label6.Text = "Stammref.:" - Me.Label6.TextAlign = System.Drawing.ContentAlignment.TopRight + Me.txtDyMandant.BackColor = System.Drawing.Color.White + Me.txtDyMandant.Location = New System.Drawing.Point(402, 6) + Me.txtDyMandant.Name = "txtDyMandant" + Me.txtDyMandant.Size = New System.Drawing.Size(48, 13) + Me.txtDyMandant.TabIndex = 23 + Me.txtDyMandant.Text = "VERG" + Me.txtDyMandant.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'cboStammreferenz + 'txtDyNiederlassung ' - Me.cboStammreferenz._allowedValuesFreiText = Nothing - Me.cboStammreferenz._allowFreiText = False - Me.cboStammreferenz._value = "" - Me.cboStammreferenz.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.cboStammreferenz.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboStammreferenz.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.cboStammreferenz.FormattingEnabled = True - Me.cboStammreferenz.Location = New System.Drawing.Point(71, 48) - Me.cboStammreferenz.Name = "cboStammreferenz" - Me.cboStammreferenz.Size = New System.Drawing.Size(129, 21) - Me.cboStammreferenz.TabIndex = 15 + Me.txtDyNiederlassung.BackColor = System.Drawing.Color.White + Me.txtDyNiederlassung.Location = New System.Drawing.Point(456, 6) + Me.txtDyNiederlassung.Name = "txtDyNiederlassung" + Me.txtDyNiederlassung.Size = New System.Drawing.Size(76, 13) + Me.txtDyNiederlassung.TabIndex = 22 + Me.txtDyNiederlassung.Text = "SUB" ' 'usrCntlATLAS_AES ' @@ -446,5 +469,6 @@ Partial Class usrCntlATLAS_AES Friend WithEvents NeueBezugsnummerVergebenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents Label6 As System.Windows.Forms.Label Friend WithEvents cboStammreferenz As VERAG_PROG_ALLGEMEIN.MyComboBox - + Friend WithEvents txtDyMandant As Label + Friend WithEvents txtDyNiederlassung As Label End Class diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.resx b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.resx index 39313e13..c31215db 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.resx +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.resx @@ -123,7 +123,4 @@ 17, 17 - - 17, 17 - \ No newline at end of file diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.vb index ea0d17ee..c032a85f 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.vb @@ -15,6 +15,7 @@ Public Class usrCntlATLAS_AES Property zusatz As String Property BezugsNr As String = "" + Dim sentToDakosy = False Property AVISO As VERAG_PROG_ALLGEMEIN.cAviso Property SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen @@ -146,27 +147,80 @@ Public Class usrCntlATLAS_AES POSITIONEN = New usrCntlATLAS_AES_Positionen(AES) PASS_VEREDELUNG = New usrCntlATLAS_AES_PassiveVeredelung(AES) - If AES Is Nothing Then ' NEUE ZOLLANMELDUNG - Try + Select Case FIRMA_DY + Case "VERAG" : txtDyMandant.Text = "VERG" + txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG + ' Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG + 'Case "SUB" : txtDyNiederlassung.Text = "VERG" + 'Case "SUW" : txtDyNiederlassung.Text = "ATIL" + ''Case "SBG" : txtDyNiederlassung.Text = "IMEX" + 'Case "NEU" : txtDyNiederlassung.Text = "IMEX" + 'Case "NKD" : txtDyNiederlassung.Text = "IMEX" + 'End Select + Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO" + Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW" + Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "ATSPED" + Case "IMEX" : txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = "IME" + End Select - BezugsNr = getBezugsnr(BezugsNr) + cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='AES' and dySr_dy_Mandant='" & txtDyMandant.Text & "' and dySr_dy_Niederlassung='" & txtDyNiederlassung.Text & "' and dySr_visible=1", False, "FMZOLL", True) + cboStammreferenz.changeItem("") - Catch ex As Exception - MsgBox(ex.StackTrace) - End Try - AES = cDakosyAES.LOADByBezugsNr(BezugsNr, True) - If AES Is Nothing Then - 'Falls zur BezugsNr schon ein Eintrag in der DB vorhanden ist - AES = New cDakosyAES() - loaddataFromAVISO(AES) - End If + If isSTAMMREF Then + Me.BezugsNr = "STAMMREFERENZ" + If AES Is Nothing Then AES = New cDakosyAES + AES.aes_ObjectName = BezugsNr + Button1.Enabled = False + cboDakosyAction.Enabled = False Else - ' AES is ot nothing - Me.BezugsNr = AES.aes_ObjectName - 'MsgBox(AES.ncts_Hauptverpflichteter_Name) + If AES Is Nothing Then ' NEUE ZOLLANMELDUNG + Dim kdnr As Object = Nothing + If SENDUNG IsNot Nothing AndAlso SENDUNG.tblSnd_EmpfaengerKdNr > 0 Then + kdnr = SENDUNG.tblSnd_EmpfaengerKdNr + End If + Dim f As New frmDakosyStammreferenz("DE", "AES", False, kdnr,, FIRMA_DY) + Dim Stammreferenz = Nothing + If f.ShowDialog(Me) Then + Stammreferenz = f.STAMMREF + sentToDakosy = f.sentToDakosy + End If + + Try + + BezugsNr = getBezugsnr(BezugsNr) + + Catch ex As Exception + MsgBox(ex.StackTrace) + End Try + + + 'Wenn bei der Stammref eine andere NL ausgewählt wurde, wird dies hier korrigiert (zb. IMEX / GLOBAL!): + If f.nl <> txtDyNiederlassung.Text Then + txtDyNiederlassung.Text = f.nl + cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='AES' and dySr_dy_Mandant='" & txtDyMandant.Text & "' and dySr_dy_Niederlassung='" & txtDyNiederlassung.Text & "' and dySr_visible=1", False, "FMZOLL", True) + End If + + + AES = cDakosyAES.LOADByBezugsNr(BezugsNr, True) + If AES Is Nothing Then + 'Falls zur BezugsNr schon ein Eintrag in der DB vorhanden ist + AES = New cDakosyAES() + loaddataFromAVISO(AES) + End If + cboStammreferenz.changeItem(Stammreferenz) + + Else + ' AES is ot nothing + Me.BezugsNr = AES.aes_ObjectName + 'MsgBox(AES.ncts_Hauptverpflichteter_Name) + + End If End If + + + If If(AES.aes_firma, "") = "" Then If FIRMA_DY <> "" Then AES.aes_firma = FIRMA_DY ' If AES.ncts_ArtAnmeldung Is Nothing Or AES.ncts_ArtAnmeldung = "" Then 'AES.ncts_ArtAnmeldung = "T2" @@ -219,6 +273,15 @@ Public Class usrCntlATLAS_AES AddHandler POSITIONEN.PosAnzChanged, Sub(anz) Label3.Text = anz End Sub + + If sentToDakosy Then + Try + Me.Button1.PerformClick() + Me.FindForm.Close() + Catch + End Try + + End If End Sub Sub buttonClick(sender As Object, e As EventArgs) 'HANDLED @@ -343,7 +406,7 @@ Public Class usrCntlATLAS_AES Me.Refresh() - If vbYes = MsgBox("Sollen die Daten abgeschickt werden?" & vbNewLine & "Eine Änderung ist nur noch in der Dakosy Software möglich.", vbYesNoCancel) Then + If sentToDakosy OrElse vbYes = MsgBox("Sollen die Daten abgeschickt werden?" & vbNewLine & "Eine Änderung ist nur noch in der Dakosy Software möglich.", vbYesNoCancel) Then ' Dim cDyAnm As New cDakosy_Zollanmeldungen(cDy_ART, BezugsNr, AVISO.AvisoID, SENDUNG.tblSnd_SendungID) loadDYZollanmeldungen() diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.Designer.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.Designer.vb index 07842624..31f5785c 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.Designer.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.Designer.vb @@ -52,10 +52,10 @@ Partial Class usrCntlATLAS_EZA Me.OptionenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SpeichernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LadenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() - Me.EZAIDToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateiimportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DynamicAutomotiveXLSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.EZAIDToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer.Panel1.SuspendLayout() Me.SplitContainer.SuspendLayout() @@ -257,7 +257,7 @@ Partial Class usrCntlATLAS_EZA 'cboStammreferenz ' Me.cboStammreferenz._allowedValuesFreiText = Nothing - Me.cboStammreferenz._allowFreiText = False + Me.cboStammreferenz._allowFreiText = True Me.cboStammreferenz._value = "" Me.cboStammreferenz.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.cboStammreferenz.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList @@ -424,29 +424,16 @@ Partial Class usrCntlATLAS_EZA 'SpeichernToolStripMenuItem ' Me.SpeichernToolStripMenuItem.Name = "SpeichernToolStripMenuItem" - Me.SpeichernToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.SpeichernToolStripMenuItem.Size = New System.Drawing.Size(126, 22) Me.SpeichernToolStripMenuItem.Text = "Speichern" ' 'LadenToolStripMenuItem ' Me.LadenToolStripMenuItem.Name = "LadenToolStripMenuItem" - Me.LadenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.LadenToolStripMenuItem.Size = New System.Drawing.Size(126, 22) Me.LadenToolStripMenuItem.Text = "Laden ..." Me.LadenToolStripMenuItem.Visible = False ' - 'ToolStripMenuItem1 - ' - Me.ToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EZAIDToolStripMenuItem}) - Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1" - Me.ToolStripMenuItem1.Size = New System.Drawing.Size(24, 20) - Me.ToolStripMenuItem1.Text = "?" - ' - 'EZAIDToolStripMenuItem - ' - Me.EZAIDToolStripMenuItem.Name = "EZAIDToolStripMenuItem" - Me.EZAIDToolStripMenuItem.Size = New System.Drawing.Size(109, 22) - Me.EZAIDToolStripMenuItem.Text = "EZA ID" - ' 'DateiimportToolStripMenuItem ' Me.DateiimportToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DynamicAutomotiveXLSToolStripMenuItem}) @@ -460,6 +447,19 @@ Partial Class usrCntlATLAS_EZA Me.DynamicAutomotiveXLSToolStripMenuItem.Size = New System.Drawing.Size(224, 22) Me.DynamicAutomotiveXLSToolStripMenuItem.Text = "Dynamic Automotive (XLSX)" ' + 'ToolStripMenuItem1 + ' + Me.ToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EZAIDToolStripMenuItem}) + Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1" + Me.ToolStripMenuItem1.Size = New System.Drawing.Size(24, 20) + Me.ToolStripMenuItem1.Text = "?" + ' + 'EZAIDToolStripMenuItem + ' + Me.EZAIDToolStripMenuItem.Name = "EZAIDToolStripMenuItem" + Me.EZAIDToolStripMenuItem.Size = New System.Drawing.Size(109, 22) + Me.EZAIDToolStripMenuItem.Text = "EZA ID" + ' 'usrCntlATLAS_EZA ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.resx b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.resx index 39313e13..c31215db 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.resx +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.resx @@ -123,7 +123,4 @@ 17, 17 - - 17, 17 - \ No newline at end of file diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb index e709e2c7..594d8bad 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb @@ -195,6 +195,7 @@ Public Class usrCntlATLAS_EZA 'Case "NEU" : txtDyNiederlassung.Text = "IMEX" 'Case "NKD" : txtDyNiederlassung.Text = "IMEX" 'End Select + Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO" Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW" Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "ATSPED" Case "IMEX" : txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = "IME" diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb index 19f3e37e..d2672600 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb @@ -166,7 +166,7 @@ Public Class usrCntlATLAS_NCTS ''Case "SBG" : txtDyNiederlassung.Text = "IMEX" 'Case "NEU" : txtDyNiederlassung.Text = "IMEX" 'Case "NKD" : txtDyNiederlassung.Text = "IMEX" - 'End Select + 'End Select Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW" Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "ATSPED" Case "IMEX" : txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = "IME" diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb index a8bd1c14..f535d2ba 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb @@ -1200,7 +1200,7 @@ Class DAKOSY_Interface_SEND If cDY.aes_AusgangszollstelleID IsNot Nothing Then EA.KopfDaten.AusgangZollstelleID = cDY.aes_AusgangszollstelleID If cDY.aes_TatsaechlicheAusgangZollstelleID IsNot Nothing Then EA.KopfDaten.TatsaechlicheAusgangZollstelleID = cDY.aes_TatsaechlicheAusgangZollstelleID If cDY.aes_GeschaeftartCode IsNot Nothing Then EA.KopfDaten.GeschaeftArtCode = cDY.aes_GeschaeftartCode - If cDY.aes_Rechnungspreis IsNot Nothing Then EA.KopfDaten.Rechnungspreis = cDY.aes_Rechnungspreis.replace(",", ".") + If cDY.aes_Rechnungspreis IsNot Nothing Then EA.KopfDaten.Rechnungspreis = cDY.aes_Rechnungspreis.ToString.Replace(",", ".") If cDY.aes_Rechnungwaehrung IsNot Nothing Then EA.KopfDaten.Rechnungswaehrung = cDY.aes_Rechnungwaehrung If cDY.aes_BesondererTatbestand IsNot Nothing Then EA.KopfDaten.BesondererTatbestand = cDY.aes_BesondererTatbestand diff --git a/SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenz.vb b/SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenz.vb index 03ac40da..ae73d012 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenz.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenz.vb @@ -49,6 +49,7 @@ cboVerfahren.Items.Clear() cboVerfahren.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NCTS - Versandverfahren", "NCTS")) cboVerfahren.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ZA - Zollanmeldung", "EZA")) + cboVerfahren.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AES - Ausfuhr", "AES")) cboVerfahren.changeItem(verfahren) cboLand.Items.Clear() diff --git a/SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenzVerwalten.vb b/SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenzVerwalten.vb index 77442628..7eea8af5 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenzVerwalten.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenzVerwalten.vb @@ -5,6 +5,7 @@ cboVerfahren.Items.Clear() cboVerfahren.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NCTS - Versandverfahren", "NCTS")) cboVerfahren.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ZA - Zollanmeldung", "EZA")) + cboVerfahren.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AES - Ausfuhr", "AES")) ' cboVerfahren.changeItem(verfahren) cboLand.Items.Clear()