From 8ff020bde466ef97bb418ff053a1a629b3afec02 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 15 May 2026 11:34:47 +0200 Subject: [PATCH] IDS, etc. Zollern Gesamtsicherheiten, etc. --- Aviso/usrCntlSND_ATBGestellung.Designer.vb | 25 ++++--- Aviso/usrCntlSND_ATBGestellung.vb | 86 +++++++++++++++------- 2 files changed, 71 insertions(+), 40 deletions(-) diff --git a/Aviso/usrCntlSND_ATBGestellung.Designer.vb b/Aviso/usrCntlSND_ATBGestellung.Designer.vb index 27d15a6..515a34b 100644 --- a/Aviso/usrCntlSND_ATBGestellung.Designer.vb +++ b/Aviso/usrCntlSND_ATBGestellung.Designer.vb @@ -23,6 +23,7 @@ Partial Class usrCntlSND_ATBGestellung Private Sub InitializeComponent() Me.pnlT1 = New System.Windows.Forms.Panel() + Me.Button2 = New System.Windows.Forms.Button() Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.txtT1Datum = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker() @@ -36,7 +37,6 @@ Partial Class usrCntlSND_ATBGestellung Me.Label3 = New System.Windows.Forms.Label() Me.txtT1VerzollungsadresseBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.Label33 = New System.Windows.Forms.Label() - Me.Button2 = New System.Windows.Forms.Button() Me.pnlT1.SuspendLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -62,6 +62,18 @@ Partial Class usrCntlSND_ATBGestellung Me.pnlT1.Size = New System.Drawing.Size(549, 125) Me.pnlT1.TabIndex = 0 ' + 'Button2 + ' + Me.Button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button2.Location = New System.Drawing.Point(424, 94) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(94, 28) + Me.Button2.TabIndex = 133 + Me.Button2.Text = "Saldocheck" + Me.Button2.UseVisualStyleBackColor = True + Me.Button2.Visible = False + ' 'PictureBox5 ' Me.PictureBox5.BackgroundImage = Global.AVISO.My.Resources.Resources.fragezeichen1 @@ -253,17 +265,6 @@ Partial Class usrCntlSND_ATBGestellung Me.Label33.TabIndex = 3 Me.Label33.Text = "Vorpapier / T1:" ' - 'Button2 - ' - Me.Button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button2.Location = New System.Drawing.Point(424, 94) - Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(94, 28) - Me.Button2.TabIndex = 133 - Me.Button2.Text = "Saldocheck" - Me.Button2.UseVisualStyleBackColor = True - ' 'usrCntlSND_ATBGestellung ' Me.Controls.Add(Me.pnlT1) diff --git a/Aviso/usrCntlSND_ATBGestellung.vb b/Aviso/usrCntlSND_ATBGestellung.vb index e9b0e7e..919c893 100644 --- a/Aviso/usrCntlSND_ATBGestellung.vb +++ b/Aviso/usrCntlSND_ATBGestellung.vb @@ -97,28 +97,35 @@ Public Class usrCntlSND_ATBGestellung Standort = Sicherheiten_Standort.IMEX : firmaID = 20 End Select - 'sonderfälle lt. Mestan - If SND.tblSnd_Zollsystem_Land = "DE" Then + 'sonderfälle lt. Mestan + If SND.tblSnd_Zollsystem_Land = "DE" Then - Select Case SND.FilialenNr - Case 5501, 4803, 4809, 5103 + Select Case SND.FilialenNr + Case 5501, 4803, 4809, 5103 Standort = Sicherheiten_Standort.VERAG_GMBH : firmaID = 2 End Select - ElseIf SND.tblSnd_Zollsystem_Land = "AT" Then + ElseIf SND.tblSnd_Zollsystem_Land = "AT" Then - If SND.tblSnd_Abfertigungsart_ID = 1 Then 'ZA + If SND.tblSnd_Abfertigungsart_ID = 1 Then 'ZA Standort = Sicherheiten_Standort.VERAG_CS : firmaID = 11 ElseIf SND.tblSnd_Abfertigungsart_ID = 38 Then 'EV-Verz - Select Case SND.FilialenNr - Case 4803, 5303, 4809, 5103 + Select Case SND.FilialenNr + Case 4803, 5303, 4809, 5103 Standort = Sicherheiten_Standort.VERAG_CS : firmaID = 11 End Select - End If - End If + End If + + If isZollern(SND) Then + + Standort = Sicherheiten_Standort.ZOLLERN : firmaID = 99 + + End If + + Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort, firmaID) If GesSichRef Is Nothing Then MsgBox("Verwahrungsreferenz kann nicht ermittelt werden!") : Exit Sub @@ -183,19 +190,20 @@ Public Class usrCntlSND_ATBGestellung Dim frm As New frmGesamtsicherheitenNEU() Select Case gessicherheit.gs_standort - Case "Verag GmbH" + Case Sicherheiten_Standort.VERAG_GMBH firmaId = 2 - Case "Verag AG" + Case Sicherheiten_Standort.VERAG_AG firmaId = 1 - Case "Unisped GmbH" + Case Sicherheiten_Standort.UNISPED firmaId = 21 - Case "AMBAR GmbH" + Case Sicherheiten_Standort.AMBAR firmaId = 24 - Case "Verag CS" + Case Sicherheiten_Standort.VERAG_CS firmaId = 11 - Case "IMEX" + Case Sicherheiten_Standort.IMEX firmaId = 20 - + Case Sicherheiten_Standort.ZOLLERN + firmaId = 99 End Select With frm @@ -226,15 +234,15 @@ Public Class usrCntlSND_ATBGestellung Select Case SND.FilialenNr Case 4803, 4809 - Standort = "VERAG AG" : firmaId = 1 + Standort = Sicherheiten_Standort.VERAG_AG : firmaId = 1 Case 5601 - Standort = "Unisped GmbH" : firmaId = 21 + Standort = Sicherheiten_Standort.UNISPED : firmaId = 21 Case 5701 - Standort = "AMBAR GmbH" : firmaId = 24 + Standort = Sicherheiten_Standort.AMBAR : firmaId = 24 Case 4810, 5103, 5901 - Standort = "VERAG GmbH" : firmaId = 2 + Standort = Sicherheiten_Standort.VERAG_GMBH : firmaId = 2 Case 5501 - Standort = "IMEX" : firmaId = 20 + Standort = Sicherheiten_Standort.IMEX : firmaId = 20 End Select 'sonderfälle lt. Mestan @@ -242,24 +250,33 @@ Public Class usrCntlSND_ATBGestellung Select Case SND.FilialenNr Case 5501, 4803, 4809, 5103 - Standort = "VERAG GmbH" : firmaId = 2 + Standort = Sicherheiten_Standort.VERAG_GMBH : firmaId = 2 End Select ElseIf SND.tblSnd_Zollsystem_Land = "AT" Then If SND.tblSnd_Abfertigungsart_ID = 1 Then 'ZA - Standort = "VERAG CS" : firmaId = 11 + Standort = Sicherheiten_Standort.VERAG_CS : firmaId = 11 ElseIf SND.tblSnd_Abfertigungsart_ID = 38 Then 'EV-Verz Select Case SND.FilialenNr Case 4803, 5303, 4809, 5103 - Standort = "VERAG CS" : firmaId = 11 + Standort = Sicherheiten_Standort.VERAG_CS : firmaId = 11 End Select End If End If - Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort) + + + If isZollern(SND) Then + + Standort = Sicherheiten_Standort.ZOLLERN : firmaId = 99 + + End If + + + Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort, firmaId) Dim frm As New frmGesamtsicherheitenNEU @@ -362,7 +379,20 @@ Public Class usrCntlSND_ATBGestellung Process.Start(webAddress) End Sub - Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + Private Function isZollern(SND As cSendungen) - End Sub + Dim zollernKdnr = {772383, 712203} + + If zollernKdnr.Contains(SND.tblSnd_AbsenderKdNr) OrElse + zollernKdnr.Contains(SND.tblSnd_AuftraggeberKdNr) OrElse + (SND.tblSnd_AvisiererKdNr IsNot Nothing AndAlso zollernKdnr.Contains(SND.tblSnd_AvisiererKdNr)) OrElse + zollernKdnr.Contains(SND.tblSnd_EmpfaengerKdNr) OrElse + (SND.tblSnd_FrachtfuehrerKdNr IsNot Nothing AndAlso zollernKdnr.Contains(SND.tblSnd_FrachtfuehrerKdNr)) Then + Return True + Else + Return False + End If + + + End Function End Class