diff --git a/Aviso/AvisoStatusFunctions.vb b/Aviso/AvisoStatusFunctions.vb index 68fce78..65f042f 100644 --- a/Aviso/AvisoStatusFunctions.vb +++ b/Aviso/AvisoStatusFunctions.vb @@ -2174,7 +2174,7 @@ ELSE_ATILLA: Dim DsId = "" Dim DsId2 = "" Dim frist = "" - Dim gestellungsadresse = "" + Dim gestellungsadresse = "" Dim found = False Select Case s.tblSnd_Abfertigungsart_ID Case 5, 6, 18, 24, 32, 33, 34, 37, 40 'Versand @@ -2265,7 +2265,7 @@ ELSE_ATILLA: Dim PathTmp = (New VERAG_PROG_ALLGEMEIN.cDATENSERVER(DsId)).GET_TOP1_PATH(False) If PathTmp <> "" Then anhaenge.Add(PathTmp) : found = True End If - If IsNumeric(DsId) Then + If IsNumeric(DsId2) Then Dim PathTmp2 = (New VERAG_PROG_ALLGEMEIN.cDATENSERVER(DsId2)).GET_TOP1_PATH(False) If PathTmp2 <> "" Then anhaenge.Add(PathTmp2) : found = True End If @@ -2294,7 +2294,7 @@ ELSE_ATILLA: If cnt = 1 Then ' wurde nicht erhöht -> keine Einträge SendungslistTXT = "" End If - If KUNDE_ERW.EmailFreigabeSendungsListe Then hText = hText.Replace("%Platzhalter%", SendungslistTXT) + If KUNDE_ERW IsNot Nothing AndAlso KUNDE_ERW.EmailFreigabeSendungsListe Then hText = hText.Replace("%Platzhalter%", SendungslistTXT) End If End If End Select diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index d402464..73eb643 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index 23eec6b..4d7eddc 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -37,7 +37,11 @@ Partial Class frmSendungsdetailsNEU Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnl = New System.Windows.Forms.Panel() Me.Panel4 = New System.Windows.Forms.Panel() Me.TabControl1 = New System.Windows.Forms.TabControl() @@ -1038,7 +1042,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem8.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem8.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem8.Name = "ToolStripMenuItem8" - Me.ToolStripMenuItem8.Size = New System.Drawing.Size(102, 30) + Me.ToolStripMenuItem8.Size = New System.Drawing.Size(188, 30) Me.ToolStripMenuItem8.Text = "T1" ' 'ToolStripMenuItem9 @@ -1046,7 +1050,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem9.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem9.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem9.Name = "ToolStripMenuItem9" - Me.ToolStripMenuItem9.Size = New System.Drawing.Size(102, 30) + Me.ToolStripMenuItem9.Size = New System.Drawing.Size(188, 30) Me.ToolStripMenuItem9.Text = "T2" ' 'ToolStripMenuItem10 @@ -1054,7 +1058,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem10.Enabled = False Me.ToolStripMenuItem10.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10" - Me.ToolStripMenuItem10.Size = New System.Drawing.Size(102, 30) + Me.ToolStripMenuItem10.Size = New System.Drawing.Size(188, 30) Me.ToolStripMenuItem10.Text = "Ü-T" Me.ToolStripMenuItem10.Visible = False ' @@ -2729,8 +2733,24 @@ Partial Class frmSendungsdetailsNEU Me.dgvAbrechnung.AllowUserToResizeColumns = False Me.dgvAbrechnung.AllowUserToResizeRows = False Me.dgvAbrechnung.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvAbrechnung.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle13 Me.dgvAbrechnung.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvAbrechnung.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnAbrId, Me.clmnAbrFirma, Me.clmnAbrLeistungsNr, Me.clmnAbrLeistung, Me.clmnAbrPreis}) + DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvAbrechnung.DefaultCellStyle = DataGridViewCellStyle15 Me.dgvAbrechnung.Location = New System.Drawing.Point(6, 35) Me.dgvAbrechnung.MultiSelect = False Me.dgvAbrechnung.Name = "dgvAbrechnung" @@ -2776,8 +2796,8 @@ Partial Class frmSendungsdetailsNEU ' 'clmnAbrPreis ' - DataGridViewCellStyle13.Format = "C2" - Me.clmnAbrPreis.DefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle14.Format = "C2" + Me.clmnAbrPreis.DefaultCellStyle = DataGridViewCellStyle14 Me.clmnAbrPreis.HeaderText = "Preis" Me.clmnAbrPreis.MaxInputLength = 15 Me.clmnAbrPreis.MinimumWidth = 6 @@ -2985,8 +3005,24 @@ Partial Class frmSendungsdetailsNEU Me.dgvVorkosten.AllowUserToResizeColumns = False Me.dgvVorkosten.AllowUserToResizeRows = False Me.dgvVorkosten.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvVorkosten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle16 Me.dgvVorkosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvVorkosten.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnVK_id, Me.clmnFirma, Me.clmnLeistung, Me.clmnPreis}) + DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvVorkosten.DefaultCellStyle = DataGridViewCellStyle18 Me.dgvVorkosten.Location = New System.Drawing.Point(3, 4) Me.dgvVorkosten.MultiSelect = False Me.dgvVorkosten.Name = "dgvVorkosten" @@ -3028,8 +3064,8 @@ Partial Class frmSendungsdetailsNEU 'clmnPreis ' Me.clmnPreis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - DataGridViewCellStyle14.Format = "C2" - Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle17.Format = "C2" + Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle17 Me.clmnPreis.HeaderText = "Preis" Me.clmnPreis.MaxInputLength = 15 Me.clmnPreis.MinimumWidth = 6 diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 5c091ac..e764e60 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -8230,4 +8230,5 @@ Public Class frmSendungsdetailsNEU e.SuppressKeyPress = True End If End Sub + End Class 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