VAVISO LKW-Prüfung, CBAM-Filter, etc.

This commit is contained in:
2026-02-18 17:21:51 +01:00
parent c70799b828
commit 95d17dbe57
5 changed files with 89 additions and 50 deletions

View File

@@ -747,29 +747,43 @@ Public Class frmEintragAviso
End If
End If
Dim EintragMehrfach As Boolean = False
If Neuanlage Then
'jetzt eine Prüfung, ob dieser LKW bereits vor kurzem erfasst wurde
Dim hLKWCheck2 As String = AvisoDAL.Suche_LKWStatus(txtLKW_Nr.Text.Trim.Replace(" ", "").Replace("-", ""))
If hLKWCheck2 <> "" Then
Dim antwort As MsgBoxResult = MsgBox(hLKWCheck2 & vbCrLf & vbCrLf & "Wollen Sie den Eintrag trotzdem speichern?", CType(MsgBoxStyle.YesNo + MsgBoxStyle.Exclamation, MsgBoxStyle),
"Aviso-Eintrag")
If antwort = vbNo Then
Exit Sub
End If
End If
If hLKWCheck2 = "" Then
'jetzt eine Prüfung, ob dieser LKW bereits vor kurzem erfasst wurde
Dim hLKWCheck As String = AvisoDAL.Suche_LKW(txtLKW_Nr.Text.Trim.Replace(" ", "").Replace("-", ""))
If hLKWCheck <> "" Then
Dim antwort As MsgBoxResult = MsgBox(hLKWCheck & vbCrLf & vbCrLf & "Wollen Sie den Eintrag trotzdem speichern?", CType(MsgBoxStyle.YesNo + MsgBoxStyle.Exclamation, MsgBoxStyle),
"Aviso-Eintrag")
Dim ListOfLKWNr = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkLKWNr(txtLKW_Nr.Text.Trim.Replace(" ", "").Replace("-", ""))
For Each LKWNr In ListOfLKWNr
Dim hLKWCheck2 As String = AvisoDAL.Suche_LKWStatus(LKWNr)
If hLKWCheck2 <> "" Then
Dim antwort As MsgBoxResult = MsgBox(hLKWCheck2 & vbCrLf & vbCrLf & "Wollen Sie den Eintrag trotzdem speichern?", CType(MsgBoxStyle.YesNo + MsgBoxStyle.Exclamation, MsgBoxStyle),
"Aviso-Eintrag")
If antwort = vbNo Then
Exit Sub
Else
EintragMehrfach = True
End If
End If
End If
If hLKWCheck2 = "" Then
'jetzt eine Prüfung, ob dieser LKW bereits vor kurzem erfasst wurde
Dim hLKWCheck As String = AvisoDAL.Suche_LKW(LKWNr)
If hLKWCheck <> "" Then
Dim antwort As MsgBoxResult = MsgBox(hLKWCheck & vbCrLf & vbCrLf & "Wollen Sie den Eintrag trotzdem speichern?", CType(MsgBoxStyle.YesNo + MsgBoxStyle.Exclamation, MsgBoxStyle),
"Aviso-Eintrag")
If antwort = vbNo Then
Exit Sub
Else
EintragMehrfach = True
End If
End If
End If
Next
End If
@@ -894,6 +908,7 @@ Public Class frmEintragAviso
' myAviso.Auftraggeber_KdNr = IIf(kdAvisierer.KdNr_value > 0, kdAvisierer.KdNr_value, "")
myAviso.Handling = cbxHandling.Checked
myAviso.EintragMehrfach = EintragMehrfach

View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("4.2.2.9")>
<Assembly: AssemblyFileVersion("4.2.2.9")>
<Assembly: AssemblyVersion("4.2.3.3")>
<Assembly: AssemblyFileVersion("4.2.3.3")>

View File

@@ -214,6 +214,7 @@ Partial Class frmHauptfenster
Me.VERAGWIKIToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.WikiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.MitarbeiterverzeichnisToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ServicesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.BREXITToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.GVMSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.GVMSUKIMportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -305,12 +306,12 @@ Partial Class frmHauptfenster
Me.picAVISOMessenger = New System.Windows.Forms.PictureBox()
Me.pic = New System.Windows.Forms.PictureBox()
Me.SplitContainer3 = New System.Windows.Forms.SplitContainer()
Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
Me.pnl = New System.Windows.Forms.Panel()
Me.Button10 = New System.Windows.Forms.Button()
Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Panel6 = New System.Windows.Forms.Panel()
Me.cbx_My_Brexit = New System.Windows.Forms.CheckBox()
Me.cbx_My_CBAM = New System.Windows.Forms.CheckBox()
Me.btnColor = New System.Windows.Forms.Button()
Me.lblMeineAviso = New System.Windows.Forms.Label()
Me.cboMy_Grenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -417,10 +418,10 @@ Partial Class frmHauptfenster
Me.ZertifikateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.HomepageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.pnlLeft = New System.Windows.Forms.Panel()
Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen()
Me.Panel5 = New System.Windows.Forms.Panel()
Me.Panel7 = New System.Windows.Forms.Panel()
Me.ServicesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen()
Me.conMenuAviso.SuspendLayout()
Me.MenuStrip1.SuspendLayout()
Me.pnlDetailsRechts.SuspendLayout()
@@ -469,7 +470,7 @@ Partial Class frmHauptfenster
'mnuInfo
'
Me.mnuInfo.Name = "mnuInfo"
Me.mnuInfo.Size = New System.Drawing.Size(222, 30)
Me.mnuInfo.Size = New System.Drawing.Size(214, 22)
Me.mnuInfo.Text = "Info"
'
'conÜbernehmen
@@ -1509,7 +1510,7 @@ Partial Class frmHauptfenster
'
Me.VerfahrenshandbücherToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem})
Me.VerfahrenshandbücherToolStripMenuItem.Name = "VerfahrenshandbücherToolStripMenuItem"
Me.VerfahrenshandbücherToolStripMenuItem.Size = New System.Drawing.Size(222, 30)
Me.VerfahrenshandbücherToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
Me.VerfahrenshandbücherToolStripMenuItem.Text = "Verfahrenshandbücher"
'
'VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem
@@ -1522,7 +1523,7 @@ Partial Class frmHauptfenster
'
Me.ChecklistenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ChecklisteWOCHECKLISTEZEallgemein, Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem, Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem, Me.ToolStripSeparator22, Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem, Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1, Me.ToolStripSeparator21, Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem, Me.WOCECKLISTEZEWDHToolStripMenuItem})
Me.ChecklistenToolStripMenuItem.Name = "ChecklistenToolStripMenuItem"
Me.ChecklistenToolStripMenuItem.Size = New System.Drawing.Size(222, 30)
Me.ChecklistenToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
Me.ChecklistenToolStripMenuItem.Text = "DE-Warenorte/Checklisten"
'
'ChecklisteWOCHECKLISTEZEallgemein
@@ -1580,7 +1581,7 @@ Partial Class frmHauptfenster
'HandbuchToolStripMenuItem
'
Me.HandbuchToolStripMenuItem.Name = "HandbuchToolStripMenuItem"
Me.HandbuchToolStripMenuItem.Size = New System.Drawing.Size(222, 30)
Me.HandbuchToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
Me.HandbuchToolStripMenuItem.Text = "Handbuch"
'
'VERAGWIKIToolStripMenuItem
@@ -1588,7 +1589,7 @@ Partial Class frmHauptfenster
Me.VERAGWIKIToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.WikiToolStripMenuItem, Me.MitarbeiterverzeichnisToolStripMenuItem})
Me.VERAGWIKIToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.wiki
Me.VERAGWIKIToolStripMenuItem.Name = "VERAGWIKIToolStripMenuItem"
Me.VERAGWIKIToolStripMenuItem.Size = New System.Drawing.Size(222, 30)
Me.VERAGWIKIToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
Me.VERAGWIKIToolStripMenuItem.Text = "VERAG-WIKI"
'
'WikiToolStripMenuItem
@@ -1603,6 +1604,12 @@ Partial Class frmHauptfenster
Me.MitarbeiterverzeichnisToolStripMenuItem.Size = New System.Drawing.Size(190, 22)
Me.MitarbeiterverzeichnisToolStripMenuItem.Text = "Mitarbeiterverzeichnis"
'
'ServicesToolStripMenuItem
'
Me.ServicesToolStripMenuItem.Name = "ServicesToolStripMenuItem"
Me.ServicesToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
Me.ServicesToolStripMenuItem.Text = "Services"
'
'BREXITToolStripMenuItem
'
Me.BREXITToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GVMSToolStripMenuItem, Me.GVMSUKIMportToolStripMenuItem, Me.GVMSBeschreibungToolStripMenuItem, Me.ToolStripSeparator14, Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem, Me.TicketIBFBeschreibungToolStripMenuItem, Me.IBFStatusToolStripMenuItem, Me.ToolStripSeparator15, Me.FREnveloppeSmartBorderToolStripMenuItem, Me.ToolStripSeparator16, Me.PBNIrelandFähreToolStripMenuItem, Me.ToolStripSeparator20, Me.WARENORTToolStripMenuItem, Me.ToolStripMenuItem14, Me.ToolStripSeparator18, Me.EORIUKGeneriertenToolStripMenuItem, Me.KAPKentAccessPermitToolStripMenuItem})
@@ -2651,15 +2658,6 @@ Partial Class frmHauptfenster
Me.SplitContainer3.SplitterDistance = 99
Me.SplitContainer3.TabIndex = 3
'
'UsrCntlBenachrichtigungen1
'
Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill
Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0)
Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1"
Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(99, 300)
Me.UsrCntlBenachrichtigungen1.TabIndex = 0
'
'pnl
'
Me.pnl.Controls.Add(Me.Button10)
@@ -2733,6 +2731,7 @@ Partial Class frmHauptfenster
'
Me.Panel6.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.Panel6.Controls.Add(Me.cbx_My_Brexit)
Me.Panel6.Controls.Add(Me.cbx_My_CBAM)
Me.Panel6.Controls.Add(Me.btnColor)
Me.Panel6.Controls.Add(Me.lblMeineAviso)
Me.Panel6.Controls.Add(Me.cboMy_Grenzstelle)
@@ -2762,6 +2761,19 @@ Partial Class frmHauptfenster
Me.cbx_My_Brexit.UseVisualStyleBackColor = True
Me.cbx_My_Brexit.Visible = False
'
'cbx_My_CBAM
'
Me.cbx_My_CBAM.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.cbx_My_CBAM.AutoSize = True
Me.cbx_My_CBAM.ForeColor = System.Drawing.Color.White
Me.cbx_My_CBAM.Location = New System.Drawing.Point(-310, 3)
Me.cbx_My_CBAM.Name = "cbx_My_CBAM"
Me.cbx_My_CBAM.Size = New System.Drawing.Size(56, 17)
Me.cbx_My_CBAM.TabIndex = 29
Me.cbx_My_CBAM.Text = "CBAM"
Me.cbx_My_CBAM.UseVisualStyleBackColor = True
Me.cbx_My_CBAM.Visible = False
'
'btnColor
'
Me.btnColor.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -4001,15 +4013,6 @@ Partial Class frmHauptfenster
Me.pnlLeft.TabIndex = 88
Me.pnlLeft.Visible = False
'
'UsrCntlBenachrichtigungen2
'
Me.UsrCntlBenachrichtigungen2.Dock = System.Windows.Forms.DockStyle.Fill
Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 51)
Me.UsrCntlBenachrichtigungen2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.UsrCntlBenachrichtigungen2.Name = "UsrCntlBenachrichtigungen2"
Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(252, 243)
Me.UsrCntlBenachrichtigungen2.TabIndex = 1
'
'Panel5
'
Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom
@@ -4027,11 +4030,23 @@ Partial Class frmHauptfenster
Me.Panel7.Size = New System.Drawing.Size(252, 51)
Me.Panel7.TabIndex = 4
'
'ServicesToolStripMenuItem
'UsrCntlBenachrichtigungen1
'
Me.ServicesToolStripMenuItem.Name = "ServicesToolStripMenuItem"
Me.ServicesToolStripMenuItem.Size = New System.Drawing.Size(222, 30)
Me.ServicesToolStripMenuItem.Text = "Services"
Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill
Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0)
Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1"
Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(99, 300)
Me.UsrCntlBenachrichtigungen1.TabIndex = 0
'
'UsrCntlBenachrichtigungen2
'
Me.UsrCntlBenachrichtigungen2.Dock = System.Windows.Forms.DockStyle.Fill
Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 51)
Me.UsrCntlBenachrichtigungen2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.UsrCntlBenachrichtigungen2.Name = "UsrCntlBenachrichtigungen2"
Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(252, 243)
Me.UsrCntlBenachrichtigungen2.TabIndex = 1
'
'frmHauptfenster
'
@@ -4494,4 +4509,5 @@ Partial Class frmHauptfenster
Friend WithEvents Button9 As Button
Friend WithEvents FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ServicesToolStripMenuItem As ToolStripMenuItem
Friend WithEvents cbx_My_CBAM As CheckBox
End Class

View File

@@ -298,7 +298,7 @@
<value>17, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value>
<value>172</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>

View File

@@ -509,6 +509,10 @@ Public Class frmHauptfenster
cbx_My_Brexit.Checked = True
End If
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("CBAM", "AVISO") Then
cbx_My_CBAM.Checked = True
End If
'If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Speditionsbuch", "AVISO") Then
' btnSpedBuch.Visible = False
'End If
@@ -1238,6 +1242,7 @@ ELSE_ATILLA:
End If
If cbx_My_Brexit.Visible AndAlso Not cbx_My_Brexit.Checked Then hSQL &= " AND FilialenNr NOT IN ('7001','7002','7003') "
If cbx_My_CBAM.Visible AndAlso Not cbx_My_CBAM.Checked Then hSQL &= " AND tblSnd_Abfertigungsart_ID NOT IN (65) "
'Farbe
If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
@@ -1598,11 +1603,12 @@ ELSE_ATILLA:
Else
If cboMy_Grenzstelle._value.Replace("ALLE_BACK", "") <> "" Then sqlStr &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'"
If cboMy_Grenzstelle._value = "ALLE_BACK" Then sqlStr &= " AND FilialenNr NOT IN ('7001','7002','7003') "
If cboMy_Grenzstelle._value = "ALLE_BACK" Then sqlStr &= " AND FilialenNr NOT IN ('7001','7002','7003') AND tblSnd_Abfertigungsart_ID NOT IN (65) "
End If
If cbx_My_Brexit.Visible AndAlso Not cbx_My_Brexit.Checked Then sqlStr &= " AND FilialenNr NOT IN ('7001','7002','7003') "
If cbx_My_CBAM.Visible AndAlso Not cbx_My_CBAM.Checked Then sqlStr &= " AND tblSnd_Abfertigungsart_ID NOT IN (65) "
'Farbe
If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
@@ -4465,7 +4471,7 @@ ELSE_ATILLA:
End Sub
Private Sub cboMyAvisoAnzeige_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboMyAvisoAnzeige.SelectedIndexChanged, cbx_My_LKW.CheckedChanged, cbx_My_Brexit.CheckedChanged, cboMy_Grenzstelle.SelectedIndexChanged, cboMy_QS.CheckStateChanged, cboMy_VB.CheckStateChanged
Private Sub cboMyAvisoAnzeige_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboMyAvisoAnzeige.SelectedIndexChanged, cbx_My_LKW.CheckedChanged, cbx_My_Brexit.CheckedChanged, cboMy_Grenzstelle.SelectedIndexChanged, cboMy_QS.CheckStateChanged, cboMy_VB.CheckStateChanged, cbx_My_CBAM.CheckStateChanged
If Grid_aktiv Then
'Wenn VERIMEX/T1 und cboMyAvisoAnzeige geändert --> Checkboxes richtig setzen
If sender Is cboMyAvisoAnzeige Then
@@ -4498,9 +4504,11 @@ ELSE_ATILLA:
If cbx_My_LKW.Checked Then
lblMeineAviso.Text = "Meine Aviso:"
cbx_My_Brexit.Visible = False
cbx_My_CBAM.Visible = False
Else
lblMeineAviso.Text = "Meine Sendungen:"
cbx_My_Brexit.Visible = True
cbx_My_CBAM.Visible = True
End If
End Sub