edv/AVISO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Andreas Luxbauer
2026-10-06 09:23:52 +02:00
parent d702783d1b eb162cc981
commit 7b979a3815
12 changed files with 677 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb generated
View File

@@ -23,7 +23,7 @@ Partial Class usrCntlBenachrichtigungen
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.Panel2 = New System.Windows.Forms.Panel()
Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.gridAvisoBenachrichtigungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
@@ -38,6 +38,7 @@ Partial Class usrCntlBenachrichtigungen
Me.cbxTeams = New System.Windows.Forms.CheckBox()
Me.Label22 = New System.Windows.Forms.Label()
Me.Label25 = New System.Windows.Forms.Label()
Me.cbxFotoVerwahrung = New System.Windows.Forms.CheckBox()
Me.Panel2.SuspendLayout()
CType(Me.gridAvisoBenachrichtigungen, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel4.SuspendLayout()
@@ -80,8 +81,8 @@ Partial Class usrCntlBenachrichtigungen
Me.gridAvisoBenachrichtigungen.AllowUserToDeleteRows = False
Me.gridAvisoBenachrichtigungen.AllowUserToOrderColumns = True
Me.gridAvisoBenachrichtigungen.AllowUserToResizeRows = False
DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
DataGridViewCellStyle4.BackColor = System.Drawing.Color.Azure
Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
Me.gridAvisoBenachrichtigungen.BackgroundColor = System.Drawing.Color.White
Me.gridAvisoBenachrichtigungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.gridAvisoBenachrichtigungen.Dock = System.Windows.Forms.DockStyle.Fill
@@ -96,6 +97,7 @@ Partial Class usrCntlBenachrichtigungen
'
Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.Panel4.Controls.Add(Me.cbxTaskForce)
Me.Panel4.Controls.Add(Me.cbxFotoVerwahrung)
Me.Panel4.Controls.Add(Me.cbxVerwarung)
Me.Panel4.Controls.Add(Me.cbxNeukunden)
Me.Panel4.Controls.Add(Me.Button10)
@@ -109,8 +111,9 @@ Partial Class usrCntlBenachrichtigungen
'cbxTaskForce
'
Me.cbxTaskForce.AutoSize = True
Me.cbxTaskForce.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
Me.cbxTaskForce.ForeColor = System.Drawing.Color.Black
Me.cbxTaskForce.Location = New System.Drawing.Point(174, 30)
Me.cbxTaskForce.Location = New System.Drawing.Point(265, 30)
Me.cbxTaskForce.Name = "cbxTaskForce"
Me.cbxTaskForce.Size = New System.Drawing.Size(77, 17)
Me.cbxTaskForce.TabIndex = 33
@@ -121,8 +124,9 @@ Partial Class usrCntlBenachrichtigungen
'cbxVerwarung
'
Me.cbxVerwarung.AutoSize = True
Me.cbxVerwarung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
Me.cbxVerwarung.ForeColor = System.Drawing.Color.Black
Me.cbxVerwarung.Location = New System.Drawing.Point(85, 30)
Me.cbxVerwarung.Location = New System.Drawing.Point(84, 30)
Me.cbxVerwarung.Name = "cbxVerwarung"
Me.cbxVerwarung.Size = New System.Drawing.Size(83, 17)
Me.cbxVerwarung.TabIndex = 32
@@ -133,8 +137,9 @@ Partial Class usrCntlBenachrichtigungen
'cbxNeukunden
'
Me.cbxNeukunden.AutoSize = True
Me.cbxNeukunden.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
Me.cbxNeukunden.ForeColor = System.Drawing.Color.Black
Me.cbxNeukunden.Location = New System.Drawing.Point(7, 30)
Me.cbxNeukunden.Location = New System.Drawing.Point(0, 30)
Me.cbxNeukunden.Name = "cbxNeukunden"
Me.cbxNeukunden.Size = New System.Drawing.Size(82, 17)
Me.cbxNeukunden.TabIndex = 30
@@ -226,6 +231,18 @@ Partial Class usrCntlBenachrichtigungen
Me.Label25.Text = "0 Akte vom Arbeitsplatz übernommen"
Me.Label25.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'cbxFotoVerwahrung
'
Me.cbxFotoVerwahrung.AutoSize = True
Me.cbxFotoVerwahrung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
Me.cbxFotoVerwahrung.ForeColor = System.Drawing.Color.Black
Me.cbxFotoVerwahrung.Location = New System.Drawing.Point(164, 30)
Me.cbxFotoVerwahrung.Name = "cbxFotoVerwahrung"
Me.cbxFotoVerwahrung.Size = New System.Drawing.Size(104, 17)
Me.cbxFotoVerwahrung.TabIndex = 34
Me.cbxFotoVerwahrung.Text = "FotoVerwahrung"
Me.cbxFotoVerwahrung.UseVisualStyleBackColor = True
'
'usrCntlBenachrichtigungen
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -257,4 +274,5 @@ Partial Class usrCntlBenachrichtigungen
Friend WithEvents txtVermerk As TextBox
Friend WithEvents cbxVerwarung As CheckBox
Friend WithEvents cbxTaskForce As CheckBox
Friend WithEvents cbxFotoVerwahrung As CheckBox
End Class

16
Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb
View File

@@ -33,6 +33,12 @@ Public Class usrCntlBenachrichtigungen
'End If
Dim whereMA = " AND ( 1<>1 "
Dim whereVerwahrungsFotos = ""
If Not cbxFotoVerwahrung.Checked Then
whereVerwahrungsFotos = " AND ab_BenachrichtigungCode <> 20 "
End If
'WARENORT
If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then
@@ -93,7 +99,7 @@ Public Class usrCntlBenachrichtigungen
whereMA &= " ) "
Dim sqlStr As String = "SELECT tblAvisoBenachrichtigungen.*, LKW_Nr, Status, Grenzstelle FROM [tblAvisoBenachrichtigungen] INNER JOIN AVISO on AvisoId=ab_AvisoID WHERE ab_status=0 " & whereMA & " ORDER BY CASE WHEN ANKUNFT <'01.01.2001' THEN '01.01.2999' ELSE ANKUNFT end ASC,ab_Datum ASC"
Dim sqlStr As String = "SELECT tblAvisoBenachrichtigungen.*, LKW_Nr, Status, Grenzstelle FROM [tblAvisoBenachrichtigungen] INNER JOIN AVISO on AvisoId=ab_AvisoID WHERE ab_status=0 " & whereMA & whereVerwahrungsFotos & " ORDER BY CASE WHEN ANKUNFT <'01.01.2001' THEN '01.01.2999' ELSE ANKUNFT end ASC,ab_Datum ASC"
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
' List.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("maId", VERAG_PROG_ALLGEMEIN.cAllgemein.USRID))
@@ -248,7 +254,6 @@ Public Class usrCntlBenachrichtigungen
'MyComboBox2.changeItem("Benutzer")
' MyComboBox2.chang
MyComboBox2.Items.Clear()
MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
@@ -285,6 +290,10 @@ Public Class usrCntlBenachrichtigungen
End If
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED" Then
cbxTeams.Checked = True
End If
'NEIN; weils zB Waidhaus dann alles sieht und übernimmt
'If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER IsNot Nothing Then
' If CInt(If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId, "-1")) <= 0 Then cbxTeams.Checked = True
@@ -427,4 +436,7 @@ Public Class usrCntlBenachrichtigungen
End Sub
Private Sub cbxFotoVerwahrung_CheckedChanged(sender As Object, e As EventArgs) Handles cbxFotoVerwahrung.CheckedChanged
initDgvAvisoBenachrichtigungen(True, Me.Font)
End Sub
End Class

224
Aviso/Benachrichtigung/usrCntlBenachrichtigungenNEW.Designer.vb generated
View File

@@ -23,8 +23,8 @@ Partial Class usrCntlBenachrichtigungenNEW
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.Panel2 = New System.Windows.Forms.Panel()
Me.gridAvisoBenachrichtigungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Panel4 = New System.Windows.Forms.Panel()
@@ -35,16 +35,17 @@ Partial Class usrCntlBenachrichtigungenNEW
Me.cbxVerwarung = New System.Windows.Forms.CheckBox()
Me.cbxNeukunden = New System.Windows.Forms.CheckBox()
Me.Panel3 = New System.Windows.Forms.Panel()
Me.txtSearch = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label2 = New System.Windows.Forms.Label()
Me.Label1 = New System.Windows.Forms.Label()
Me.txtDatumAb = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.CheckBox1 = New System.Windows.Forms.CheckBox()
Me.Label22 = New System.Windows.Forms.Label()
Me.Label25 = New System.Windows.Forms.Label()
Me.txtVermerk = New System.Windows.Forms.TextBox()
Me.Button10 = New System.Windows.Forms.Button()
Me.CheckBox1 = New System.Windows.Forms.CheckBox()
Me.txtDatumAb = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label1 = New System.Windows.Forms.Label()
Me.Label2 = New System.Windows.Forms.Label()
Me.txtSearch = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
Me.cbxFotoVerwahrung = New System.Windows.Forms.CheckBox()
Me.Panel2.SuspendLayout()
CType(Me.gridAvisoBenachrichtigungen, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel4.SuspendLayout()
@@ -69,18 +70,18 @@ Partial Class usrCntlBenachrichtigungenNEW
Me.gridAvisoBenachrichtigungen.AllowUserToDeleteRows = False
Me.gridAvisoBenachrichtigungen.AllowUserToOrderColumns = True
Me.gridAvisoBenachrichtigungen.AllowUserToResizeRows = False
DataGridViewCellStyle7.BackColor = System.Drawing.Color.Azure
Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
Me.gridAvisoBenachrichtigungen.BackgroundColor = System.Drawing.Color.White
Me.gridAvisoBenachrichtigungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText
DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.gridAvisoBenachrichtigungen.DefaultCellStyle = DataGridViewCellStyle8
DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.gridAvisoBenachrichtigungen.DefaultCellStyle = DataGridViewCellStyle2
Me.gridAvisoBenachrichtigungen.Dock = System.Windows.Forms.DockStyle.Fill
Me.gridAvisoBenachrichtigungen.Location = New System.Drawing.Point(0, 76)
Me.gridAvisoBenachrichtigungen.Name = "gridAvisoBenachrichtigungen"
@@ -93,6 +94,7 @@ Partial Class usrCntlBenachrichtigungenNEW
'
Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.Panel4.Controls.Add(Me.MyComboBox2)
Me.Panel4.Controls.Add(Me.cbxFotoVerwahrung)
Me.Panel4.Controls.Add(Me.cbxCluster)
Me.Panel4.Controls.Add(Me.cbxTaskForce)
Me.Panel4.Controls.Add(Me.cbxTeams)
@@ -115,7 +117,7 @@ Partial Class usrCntlBenachrichtigungenNEW
Me.MyComboBox2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
Me.MyComboBox2.FormattingEnabled = True
Me.MyComboBox2.Location = New System.Drawing.Point(185, -2)
Me.MyComboBox2.Location = New System.Drawing.Point(247, 0)
Me.MyComboBox2.Name = "MyComboBox2"
Me.MyComboBox2.Size = New System.Drawing.Size(71, 21)
Me.MyComboBox2.TabIndex = 27
@@ -137,7 +139,7 @@ Partial Class usrCntlBenachrichtigungenNEW
'
Me.cbxTaskForce.AutoSize = True
Me.cbxTaskForce.ForeColor = System.Drawing.Color.Black
Me.cbxTaskForce.Location = New System.Drawing.Point(174, 19)
Me.cbxTaskForce.Location = New System.Drawing.Point(169, 2)
Me.cbxTaskForce.Name = "cbxTaskForce"
Me.cbxTaskForce.Size = New System.Drawing.Size(77, 17)
Me.cbxTaskForce.TabIndex = 33
@@ -198,6 +200,92 @@ Partial Class usrCntlBenachrichtigungenNEW
Me.Panel3.Size = New System.Drawing.Size(319, 76)
Me.Panel3.TabIndex = 3
'
'txtSearch
'
Me.txtSearch._DateTimeOnly = False
Me.txtSearch._numbersOnly = False
Me.txtSearch._numbersOnlyKommastellen = ""
Me.txtSearch._numbersOnlyTrennzeichen = True
Me.txtSearch._Prozent = False
Me.txtSearch._ShortDateNew = False
Me.txtSearch._ShortDateOnly = False
Me.txtSearch._TimeOnly = False
Me.txtSearch._TimeOnly_Seconds = False
Me.txtSearch._value = ""
Me.txtSearch._Waehrung = False
Me.txtSearch._WaehrungZeichen = True
Me.txtSearch.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.txtSearch.ForeColor = System.Drawing.Color.Black
Me.txtSearch.Location = New System.Drawing.Point(50, 50)
Me.txtSearch.MaxLineLength = -1
Me.txtSearch.MaxLines_Warning = ""
Me.txtSearch.MaxLines_Warning_Label = Nothing
Me.txtSearch.Name = "txtSearch"
Me.txtSearch.Size = New System.Drawing.Size(128, 20)
Me.txtSearch.TabIndex = 35
Me.txtSearch.Visible = False
'
'Label2
'
Me.Label2.AutoSize = True
Me.Label2.ForeColor = System.Drawing.Color.White
Me.Label2.Location = New System.Drawing.Point(5, 53)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(41, 13)
Me.Label2.TabIndex = 36
Me.Label2.Text = "Suche:"
Me.Label2.Visible = False
'
'Label1
'
Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label1.AutoSize = True
Me.Label1.ForeColor = System.Drawing.Color.White
Me.Label1.Location = New System.Drawing.Point(185, 53)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(22, 13)
Me.Label1.TabIndex = 34
Me.Label1.Text = "ab:"
Me.Label1.Visible = False
'
'txtDatumAb
'
Me.txtDatumAb._DateTimeOnly = False
Me.txtDatumAb._numbersOnly = False
Me.txtDatumAb._numbersOnlyKommastellen = ""
Me.txtDatumAb._numbersOnlyTrennzeichen = True
Me.txtDatumAb._Prozent = False
Me.txtDatumAb._ShortDateNew = True
Me.txtDatumAb._ShortDateOnly = False
Me.txtDatumAb._TimeOnly = False
Me.txtDatumAb._TimeOnly_Seconds = False
Me.txtDatumAb._value = ""
Me.txtDatumAb._Waehrung = False
Me.txtDatumAb._WaehrungZeichen = True
Me.txtDatumAb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.txtDatumAb.ForeColor = System.Drawing.Color.Black
Me.txtDatumAb.Location = New System.Drawing.Point(213, 50)
Me.txtDatumAb.MaxLength = 10
Me.txtDatumAb.MaxLineLength = -1
Me.txtDatumAb.MaxLines_Warning = ""
Me.txtDatumAb.MaxLines_Warning_Label = Nothing
Me.txtDatumAb.Name = "txtDatumAb"
Me.txtDatumAb.Size = New System.Drawing.Size(100, 20)
Me.txtDatumAb.TabIndex = 33
Me.txtDatumAb.Visible = False
'
'CheckBox1
'
Me.CheckBox1.AutoSize = True
Me.CheckBox1.ForeColor = System.Drawing.Color.White
Me.CheckBox1.Location = New System.Drawing.Point(3, 25)
Me.CheckBox1.Name = "CheckBox1"
Me.CheckBox1.Size = New System.Drawing.Size(86, 17)
Me.CheckBox1.TabIndex = 32
Me.CheckBox1.Text = "Alte Einträge"
Me.CheckBox1.UseVisualStyleBackColor = True
'
'Label22
'
Me.Label22.AutoSize = True
@@ -247,95 +335,22 @@ Partial Class usrCntlBenachrichtigungenNEW
Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button10.UseVisualStyleBackColor = True
'
'CheckBox1
'
Me.CheckBox1.AutoSize = True
Me.CheckBox1.ForeColor = System.Drawing.Color.White
Me.CheckBox1.Location = New System.Drawing.Point(3, 25)
Me.CheckBox1.Name = "CheckBox1"
Me.CheckBox1.Size = New System.Drawing.Size(86, 17)
Me.CheckBox1.TabIndex = 32
Me.CheckBox1.Text = "Alte Einträge"
Me.CheckBox1.UseVisualStyleBackColor = True
'
'txtDatumAb
'
Me.txtDatumAb._DateTimeOnly = False
Me.txtDatumAb._numbersOnly = False
Me.txtDatumAb._numbersOnlyKommastellen = ""
Me.txtDatumAb._numbersOnlyTrennzeichen = True
Me.txtDatumAb._Prozent = False
Me.txtDatumAb._ShortDateNew = True
Me.txtDatumAb._ShortDateOnly = False
Me.txtDatumAb._TimeOnly = False
Me.txtDatumAb._TimeOnly_Seconds = False
Me.txtDatumAb._value = ""
Me.txtDatumAb._Waehrung = False
Me.txtDatumAb._WaehrungZeichen = True
Me.txtDatumAb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.txtDatumAb.ForeColor = System.Drawing.Color.Black
Me.txtDatumAb.Location = New System.Drawing.Point(213, 50)
Me.txtDatumAb.MaxLineLength = -1
Me.txtDatumAb.MaxLines_Warning = ""
Me.txtDatumAb.MaxLines_Warning_Label = Nothing
Me.txtDatumAb.Name = "txtDatumAb"
Me.txtDatumAb.Size = New System.Drawing.Size(100, 20)
Me.txtDatumAb.TabIndex = 33
Me.txtDatumAb.Visible = False
'
'Label1
'
Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label1.AutoSize = True
Me.Label1.ForeColor = System.Drawing.Color.White
Me.Label1.Location = New System.Drawing.Point(185, 53)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(22, 13)
Me.Label1.TabIndex = 34
Me.Label1.Text = "ab:"
Me.Label1.Visible = False
'
'Label2
'
Me.Label2.AutoSize = True
Me.Label2.ForeColor = System.Drawing.Color.White
Me.Label2.Location = New System.Drawing.Point(5, 53)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(41, 13)
Me.Label2.TabIndex = 36
Me.Label2.Text = "Suche:"
Me.Label2.Visible = False
'
'txtSearch
'
Me.txtSearch._DateTimeOnly = False
Me.txtSearch._numbersOnly = False
Me.txtSearch._numbersOnlyKommastellen = ""
Me.txtSearch._numbersOnlyTrennzeichen = True
Me.txtSearch._Prozent = False
Me.txtSearch._ShortDateNew = False
Me.txtSearch._ShortDateOnly = False
Me.txtSearch._TimeOnly = False
Me.txtSearch._TimeOnly_Seconds = False
Me.txtSearch._value = ""
Me.txtSearch._Waehrung = False
Me.txtSearch._WaehrungZeichen = True
Me.txtSearch.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.txtSearch.ForeColor = System.Drawing.Color.Black
Me.txtSearch.Location = New System.Drawing.Point(50, 50)
Me.txtSearch.MaxLineLength = -1
Me.txtSearch.MaxLines_Warning = ""
Me.txtSearch.MaxLines_Warning_Label = Nothing
Me.txtSearch.Name = "txtSearch"
Me.txtSearch.Size = New System.Drawing.Size(128, 20)
Me.txtSearch.TabIndex = 35
Me.txtSearch.Visible = False
'
'Timer1
'
Me.Timer1.Interval = 5000
'
'cbxFotoVerwahrung
'
Me.cbxFotoVerwahrung.AutoSize = True
Me.cbxFotoVerwahrung.ForeColor = System.Drawing.Color.Black
Me.cbxFotoVerwahrung.Location = New System.Drawing.Point(169, 19)
Me.cbxFotoVerwahrung.Name = "cbxFotoVerwahrung"
Me.cbxFotoVerwahrung.Size = New System.Drawing.Size(107, 17)
Me.cbxFotoVerwahrung.TabIndex = 34
Me.cbxFotoVerwahrung.Text = "Foto Verwahrung"
Me.cbxFotoVerwahrung.UseVisualStyleBackColor = True
Me.cbxFotoVerwahrung.Visible = False
'
'usrCntlBenachrichtigungenNEW
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -373,4 +388,5 @@ Partial Class usrCntlBenachrichtigungenNEW
Friend WithEvents Label2 As Label
Friend WithEvents Label1 As Label
Friend WithEvents Timer1 As Timer
Friend WithEvents cbxFotoVerwahrung As CheckBox
End Class

10
Aviso/Benachrichtigung/usrCntlBenachrichtigungenNEW.vb
View File

@@ -34,6 +34,11 @@ Public Class usrCntlBenachrichtigungenNEW
If .Columns IsNot Nothing AndAlso .Columns.Count > 0 Then .Columns.Clear()
Dim whereMA = " AND ( 1<>1 "
Dim whereVerwahrungsFotos = ""
If Not cbxFotoVerwahrung.Checked Then
whereVerwahrungsFotos = " AND ab_BenachrichtigungCode <> 20 "
End If
'WARENORT
If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then
@@ -130,6 +135,7 @@ Public Class usrCntlBenachrichtigungenNEW
"WHERE 1=1 " &
whereStatus &
whereMA &
whereVerwahrungsFotos &
" ORDER BY CASE WHEN ANKUNFT<'20010101' THEN '29990101' ELSE ANKUNFT END ASC,ab_Datum ASC"
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
@@ -527,4 +533,8 @@ Public Class usrCntlBenachrichtigungenNEW
initDgvAvisoBenachrichtigungen(True, Me.Font)
End If
End Sub
Private Sub cbxFotoVerwahrung_CheckedChanged(sender As Object, e As EventArgs) Handles cbxFotoVerwahrung.CheckedChanged
initDgvAvisoBenachrichtigungen(True, Me.Font)
End Sub
End Class

10
Aviso/frmGesamtsicherheitenMenu.vb
View File

@@ -20,7 +20,7 @@ Public Class frmGesamtsicherheitenMenu
frmHauptfenster.EnableDoubleBuffered(dgvListe)
GesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort)
'GesSichRef.LOAD("standort", Standort)
lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N")
lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo_new()).ToString("N")
txtVon._ShortDateOnly = True
txtbis._ShortDateOnly = True
@@ -102,7 +102,7 @@ Public Class frmGesamtsicherheitenMenu
'lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.gsr_referenzwert.ToString("N")
lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.getReferenzbetrag(Now()).ToString()
lblZollsatz.Text = "Zollsatz: " & GesSichRef.brgakto_gs_zollsatz & "%"
lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N")
lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo_new()).ToString("N")
End Sub
@@ -122,7 +122,7 @@ Public Class frmGesamtsicherheitenMenu
End With
AddHandler frm.FormClosing, Function()
GesSichRef.CalcSaldo()
GesSichRef.CalcSaldo_new()
ShowStandort()
LoadDGV()
Me.BringToFront()
@@ -142,7 +142,7 @@ Public Class frmGesamtsicherheitenMenu
.Neu = True
End With
AddHandler frm.FormClosing, Function()
GesSichRef.CalcSaldo()
GesSichRef.CalcSaldo_new()
ShowStandort()
LoadDGV()
Me.BringToFront()
@@ -151,7 +151,7 @@ Public Class frmGesamtsicherheitenMenu
End Sub
Private Sub lblSaldo_Click(sender As Object, e As EventArgs) Handles lblSaldo.Click
lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N")
lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo_new()).ToString("N")
LoadDGV()
End Sub

147
Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb generated
View File

@@ -37,14 +37,13 @@ Partial Class frmGesamtsicherheitenMenuNEU
Me.SicherheitsbetragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.MehrfacheATBNrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.cbxAUTO = New System.Windows.Forms.CheckBox()
Me.PictureBox5 = New System.Windows.Forms.PictureBox()
Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton()
Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label26 = New System.Windows.Forms.Label()
Me.btnBisTag = New System.Windows.Forms.Button()
Me.btnVonTag = New System.Windows.Forms.Button()
Me.btnTag = New System.Windows.Forms.Button()
Me.txtDatVon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label24 = New System.Windows.Forms.Label()
Me.btnJahr = New System.Windows.Forms.Button()
Me.btnBisJahr = New System.Windows.Forms.Button()
@@ -70,7 +69,9 @@ Partial Class frmGesamtsicherheitenMenuNEU
Me.lblReferenzwert = New System.Windows.Forms.Label()
Me.btnExcel = New VERAG_PROG_ALLGEMEIN.FlatButton()
Me.dgvListe = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.cbxAUTO = New System.Windows.Forms.CheckBox()
Me.GestellungenInDerZukunftToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtDatVon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.ContextMenuStrip1.SuspendLayout()
Me.Panel1.SuspendLayout()
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -81,7 +82,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
'
Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem, Me.SaldenNeuBerechnenToolStripMenuItem, Me.SaldoZumStichtagToolStripMenuItem, Me.PrüfungAusPlausibilitätToolStripMenuItem})
Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
Me.ContextMenuStrip1.Size = New System.Drawing.Size(202, 92)
Me.ContextMenuStrip1.Size = New System.Drawing.Size(202, 114)
'
'ExportCSVToolStripMenuItem
'
@@ -113,6 +114,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
Me.RLZollamtBereinigtToolStripMenuItem.Name = "RLZollamtBereinigtToolStripMenuItem"
Me.RLZollamtBereinigtToolStripMenuItem.Size = New System.Drawing.Size(183, 22)
Me.RLZollamtBereinigtToolStripMenuItem.Text = "RL-Zollamt bereinigt"
Me.RLZollamtBereinigtToolStripMenuItem.Visible = False
'
'SaldenNeuBerechnenToolStripMenuItem
'
@@ -128,7 +130,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
'
'PrüfungAusPlausibilitätToolStripMenuItem
'
Me.PrüfungAusPlausibilitätToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AusgangEingangToolStripMenuItem, Me.SicherheitsbetragToolStripMenuItem, Me.MehrfacheATBNrToolStripMenuItem})
Me.PrüfungAusPlausibilitätToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AusgangEingangToolStripMenuItem, Me.SicherheitsbetragToolStripMenuItem, Me.MehrfacheATBNrToolStripMenuItem, Me.GestellungenInDerZukunftToolStripMenuItem})
Me.PrüfungAusPlausibilitätToolStripMenuItem.Name = "PrüfungAusPlausibilitätToolStripMenuItem"
Me.PrüfungAusPlausibilitätToolStripMenuItem.Size = New System.Drawing.Size(201, 22)
Me.PrüfungAusPlausibilitätToolStripMenuItem.Text = "Prüfung auf Plausibilität"
@@ -136,19 +138,19 @@ Partial Class frmGesamtsicherheitenMenuNEU
'AusgangEingangToolStripMenuItem
'
Me.AusgangEingangToolStripMenuItem.Name = "AusgangEingangToolStripMenuItem"
Me.AusgangEingangToolStripMenuItem.Size = New System.Drawing.Size(178, 22)
Me.AusgangEingangToolStripMenuItem.Size = New System.Drawing.Size(221, 22)
Me.AusgangEingangToolStripMenuItem.Text = "Ausgang < Eingang"
'
'SicherheitsbetragToolStripMenuItem
'
Me.SicherheitsbetragToolStripMenuItem.Name = "SicherheitsbetragToolStripMenuItem"
Me.SicherheitsbetragToolStripMenuItem.Size = New System.Drawing.Size(178, 22)
Me.SicherheitsbetragToolStripMenuItem.Size = New System.Drawing.Size(221, 22)
Me.SicherheitsbetragToolStripMenuItem.Text = "Sicherheitsbetrag"
'
'MehrfacheATBNrToolStripMenuItem
'
Me.MehrfacheATBNrToolStripMenuItem.Name = "MehrfacheATBNrToolStripMenuItem"
Me.MehrfacheATBNrToolStripMenuItem.Size = New System.Drawing.Size(178, 22)
Me.MehrfacheATBNrToolStripMenuItem.Size = New System.Drawing.Size(221, 22)
Me.MehrfacheATBNrToolStripMenuItem.Text = "mehrfache ATB-Nr"
'
'Panel1
@@ -192,6 +194,19 @@ Partial Class frmGesamtsicherheitenMenuNEU
Me.Panel1.Size = New System.Drawing.Size(706, 288)
Me.Panel1.TabIndex = 0
'
'cbxAUTO
'
Me.cbxAUTO.AutoSize = True
Me.cbxAUTO.Checked = True
Me.cbxAUTO.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxAUTO.ForeColor = System.Drawing.SystemColors.ButtonHighlight
Me.cbxAUTO.Location = New System.Drawing.Point(36, 233)
Me.cbxAUTO.Name = "cbxAUTO"
Me.cbxAUTO.Size = New System.Drawing.Size(56, 17)
Me.cbxAUTO.TabIndex = 133
Me.cbxAUTO.Text = "AUTO"
Me.cbxAUTO.UseVisualStyleBackColor = True
'
'PictureBox5
'
Me.PictureBox5.BackColor = System.Drawing.Color.White
@@ -218,31 +233,6 @@ Partial Class frmGesamtsicherheitenMenuNEU
Me.btnOpenOver85Days.UseVisualStyleBackColor = False
Me.btnOpenOver85Days.Visible = False
'
'txtDatBis
'
Me.txtDatBis._DateTimeOnly = False
Me.txtDatBis._numbersOnly = False
Me.txtDatBis._numbersOnlyKommastellen = ""
Me.txtDatBis._numbersOnlyTrennzeichen = True
Me.txtDatBis._Prozent = False
Me.txtDatBis._ShortDateNew = False
Me.txtDatBis._ShortDateOnly = True
Me.txtDatBis._TimeOnly = False
Me.txtDatBis._TimeOnly_Seconds = False
Me.txtDatBis._value = ""
Me.txtDatBis._Waehrung = False
Me.txtDatBis._WaehrungZeichen = True
Me.txtDatBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtDatBis.ForeColor = System.Drawing.Color.Black
Me.txtDatBis.Location = New System.Drawing.Point(62, 170)
Me.txtDatBis.MaxLength = 10
Me.txtDatBis.MaxLineLength = -1
Me.txtDatBis.MaxLines_Warning = ""
Me.txtDatBis.MaxLines_Warning_Label = Nothing
Me.txtDatBis.Name = "txtDatBis"
Me.txtDatBis.Size = New System.Drawing.Size(63, 20)
Me.txtDatBis.TabIndex = 25
'
'Label26
'
Me.Label26.AutoSize = True
@@ -301,31 +291,6 @@ Partial Class frmGesamtsicherheitenMenuNEU
Me.btnTag.Text = "Heute"
Me.btnTag.UseVisualStyleBackColor = False
'
'txtDatVon
'
Me.txtDatVon._DateTimeOnly = False
Me.txtDatVon._numbersOnly = False
Me.txtDatVon._numbersOnlyKommastellen = ""
Me.txtDatVon._numbersOnlyTrennzeichen = True
Me.txtDatVon._Prozent = False
Me.txtDatVon._ShortDateNew = False
Me.txtDatVon._ShortDateOnly = True
Me.txtDatVon._TimeOnly = False
Me.txtDatVon._TimeOnly_Seconds = False
Me.txtDatVon._value = ""
Me.txtDatVon._Waehrung = False
Me.txtDatVon._WaehrungZeichen = True
Me.txtDatVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtDatVon.ForeColor = System.Drawing.Color.Black
Me.txtDatVon.Location = New System.Drawing.Point(62, 146)
Me.txtDatVon.MaxLength = 10
Me.txtDatVon.MaxLineLength = -1
Me.txtDatVon.MaxLines_Warning = ""
Me.txtDatVon.MaxLines_Warning_Label = Nothing
Me.txtDatVon.Name = "txtDatVon"
Me.txtDatVon.Size = New System.Drawing.Size(63, 20)
Me.txtDatVon.TabIndex = 18
'
'Label24
'
Me.Label24.AutoSize = True
@@ -648,18 +613,61 @@ Partial Class frmGesamtsicherheitenMenuNEU
Me.dgvListe.Size = New System.Drawing.Size(706, 394)
Me.dgvListe.TabIndex = 1
'
'cbxAUTO
'GestellungenInDerZukunftToolStripMenuItem
'
Me.cbxAUTO.AutoSize = True
Me.cbxAUTO.Checked = True
Me.cbxAUTO.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxAUTO.ForeColor = System.Drawing.SystemColors.ButtonHighlight
Me.cbxAUTO.Location = New System.Drawing.Point(36, 233)
Me.cbxAUTO.Name = "cbxAUTO"
Me.cbxAUTO.Size = New System.Drawing.Size(56, 17)
Me.cbxAUTO.TabIndex = 133
Me.cbxAUTO.Text = "AUTO"
Me.cbxAUTO.UseVisualStyleBackColor = True
Me.GestellungenInDerZukunftToolStripMenuItem.Name = "GestellungenInDerZukunftToolStripMenuItem"
Me.GestellungenInDerZukunftToolStripMenuItem.Size = New System.Drawing.Size(221, 22)
Me.GestellungenInDerZukunftToolStripMenuItem.Text = "Gestellungen in der Zukunft"
'
'txtDatBis
'
Me.txtDatBis._DateTimeOnly = False
Me.txtDatBis._numbersOnly = False
Me.txtDatBis._numbersOnlyKommastellen = ""
Me.txtDatBis._numbersOnlyTrennzeichen = True
Me.txtDatBis._Prozent = False
Me.txtDatBis._ShortDateNew = False
Me.txtDatBis._ShortDateOnly = True
Me.txtDatBis._TimeOnly = False
Me.txtDatBis._TimeOnly_Seconds = False
Me.txtDatBis._value = ""
Me.txtDatBis._Waehrung = False
Me.txtDatBis._WaehrungZeichen = True
Me.txtDatBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtDatBis.ForeColor = System.Drawing.Color.Black
Me.txtDatBis.Location = New System.Drawing.Point(62, 170)
Me.txtDatBis.MaxLength = 10
Me.txtDatBis.MaxLineLength = -1
Me.txtDatBis.MaxLines_Warning = ""
Me.txtDatBis.MaxLines_Warning_Label = Nothing
Me.txtDatBis.Name = "txtDatBis"
Me.txtDatBis.Size = New System.Drawing.Size(63, 20)
Me.txtDatBis.TabIndex = 25
'
'txtDatVon
'
Me.txtDatVon._DateTimeOnly = False
Me.txtDatVon._numbersOnly = False
Me.txtDatVon._numbersOnlyKommastellen = ""
Me.txtDatVon._numbersOnlyTrennzeichen = True
Me.txtDatVon._Prozent = False
Me.txtDatVon._ShortDateNew = False
Me.txtDatVon._ShortDateOnly = True
Me.txtDatVon._TimeOnly = False
Me.txtDatVon._TimeOnly_Seconds = False
Me.txtDatVon._value = ""
Me.txtDatVon._Waehrung = False
Me.txtDatVon._WaehrungZeichen = True
Me.txtDatVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtDatVon.ForeColor = System.Drawing.Color.Black
Me.txtDatVon.Location = New System.Drawing.Point(62, 146)
Me.txtDatVon.MaxLength = 10
Me.txtDatVon.MaxLineLength = -1
Me.txtDatVon.MaxLines_Warning = ""
Me.txtDatVon.MaxLines_Warning_Label = Nothing
Me.txtDatVon.Name = "txtDatVon"
Me.txtDatVon.Size = New System.Drawing.Size(63, 20)
Me.txtDatVon.TabIndex = 18
'
'frmGesamtsicherheitenMenuNEU
'
@@ -731,4 +739,5 @@ Partial Class frmGesamtsicherheitenMenuNEU
Friend WithEvents RLZollamtBereinigtToolStripMenuItem As ToolStripMenuItem
Friend WithEvents MehrfacheATBNrToolStripMenuItem As ToolStripMenuItem
Friend WithEvents cbxAUTO As CheckBox
Friend WithEvents GestellungenInDerZukunftToolStripMenuItem As ToolStripMenuItem
End Class

180
Aviso/frmGesamtsicherheitenMenuNEU.vb
View File

@@ -81,6 +81,10 @@ Public Class frmGesamtsicherheitenMenuNEU
If txtSuchbegriff.Text <> "" Then
Dim sqlWhereZusatz As String = ""
If IsNumeric(txtSuchbegriff.Text) Then
sqlWhereZusatz = " OR gs.gs_gsNr = " & txtSuchbegriff.Text
End If
sqlWhere = " AND ( gs.gs_freitext LIKE '%" & txtSuchbegriff.Text.Trim() & "%' OR
gs.gs_abfertigungsNr LIKE '%" & txtSuchbegriff.Text.Trim() & "%' OR
@@ -89,42 +93,14 @@ Public Class frmGesamtsicherheitenMenuNEU
gs.gs_VeralteteWeitereRegistriernummer LIKE '%" & txtSuchbegriff.Text.Trim() & "%' OR
gs.gs_MRNNr LIKE '%" & txtSuchbegriff.Text.Trim() & "%' OR
gs.gs_LKWKZ LIKE '%" & txtSuchbegriff.Text.Trim() & "%' OR
gs.gs_warenort LIKE '%" & txtSuchbegriff.Text.Trim() & "%'
)"
gs.gs_warenort LIKE '%" & txtSuchbegriff.Text.Trim() & "%'" & sqlWhereZusatz &
")"
End If
'Dim sqlstring As String =
' " select * from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort, MIN(gs_warenort) as gs_warenort, MIN(gs_filialenNr) as gs_filialenNr, min(gs_abfertigungsNr) as gs_abfertigungsNr, MIN(gs_avisoId) as gs_avisoId,
' max(gs_LKWKZ) as gs_LKWKZ, min (gs_datum) as gs_datum, FORMAT(
' (Select SUM( Case
'when gs_art = 'Open' then (gs_sicherheitsbetrag * -1)
'when gs_art = 'Close' then gs_sicherheitsbetrag
' End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheit] where gs_gsnr = meh.gs_gsnr
' )
' +
' (Select SUM( Case
'when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1)
'when gsp_art = 'Close' then gsp_sicherheitsbetrag
' End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheitsPositionen] where gsp_gsnr = meh.gs_gsnr
' ) , 'C', 'de-DE') as gs_SicherheitsSaldo
' From (select * from (select gs_gsnr as ding from [tblGesamtsicherheit] where
' gs_freitext like '%" & txtSuchbegriff.Text & "%' OR
' gs_abfertigungsNr like '%" & txtSuchbegriff.Text & "%' OR
' gs_avisoId like '%" & txtSuchbegriff.Text & "%' OR
' gs_ATBNr like '%" & txtSuchbegriff.Text & "%' OR
' gs_LKWKZ like '%" & txtSuchbegriff.Text & "%' OR
' gs_warenort like '%" & txtSuchbegriff.Text & "%'
' ) as tb1 left join [tblGesamtsicherheit] as tb2 on tb1.ding = tb2.gs_gsnr) as meh group by gs_gsnr) as meh2
' Where gs_standort = '" & Standort & "' " & sqladdon & "
' AND gs_datum > '" & Date.Parse(txtDatVon.Text) & "'
' AND gs_datum < '" & Date.Parse(txtDatBis.Text).AddDays(1).AddSeconds(-1) & "' ORDER BY gs_gsnr"
Dim sqlstring As String = "WITH SicherheitsSaldo AS (
SELECT
@@ -581,7 +557,14 @@ Public Class frmGesamtsicherheitenMenuNEU
Exit Sub
End If
If Not zollliste_bereinigt Then SDL.cProgramFunctions.genExcelFromDT_NEW(frm.dtSicherheiten)
If Not zollliste_bereinigt Then
If detailINfo Then
SDL.cProgramFunctions.genExcelFromDT_NEW(frm.dtSicherheiten, {"N1:N" & (frm.dtSicherheiten.Rows.Count + 1)})
Else
SDL.cProgramFunctions.genExcelFromDT_NEW(frm.dtSicherheiten, {"K1:K" & (frm.dtSicherheiten.Rows.Count + 1)})
End If
End If
End Sub
@@ -629,7 +612,7 @@ Public Class frmGesamtsicherheitenMenuNEU
Dim f As New frmDatumsabfrage("Saldo zum Stichtag", False)
f.ShowDialog()
If f.DialogResult = DialogResult.OK Then
GesSichRef.CalcSaldo(, f.Datum, True)
GesSichRef.CalcSaldo_new(, f.Datum, True)
End If
@@ -639,9 +622,16 @@ Public Class frmGesamtsicherheitenMenuNEU
Dim SQLPlausPruefung = "select gs_gsnr as Nr,gs_ATBNr as ATBNr, gs_Sicherheitsbetrag as Sicherheitsbetrag ,gsp_ATCNr as ATCNr , cast(gs_datum as Date) as Ausgangsdatum, cast(gsp_datum as Date) as Eingangsdatum, [gs_erstellungsdatum] as Erstellungsdatum, [gs_zuletztgeandert] as GeänderAm, [gs_systemuser] as Benutzer from tblGesamtsicherheit
inner join tblGesamtsicherheitsPositionen on gs_gsId = gsp_gsId
where cast(gsp_datum as Date) < cast(gs_datum as Date) and not ( [gs_sicherheitsbetrag] = 0.00 and [gsp_sicherheitsbetrag] = 0.00) and gs_standort = '" & Standort & "'"
Dim SQLPlausPruefung = "SELECT
gs.gs_gsId,
gs.gs_datum AS GestellungDatum,
gsp.gsp_datum AS PositionDatum,
gsp.gsp_sicherheitsbetrag
FROM dbo.tblGesamtsicherheit AS gs
INNER JOIN dbo.tblGesamtsicherheitsPositionen AS gsp
ON gsp.gsp_gsId = gs.gs_gsId
WHERE gs.gs_standort = '" & Standort & "'
AND gsp.gsp_datum < gs.gs_datum;"
Dim dt As New DataTable
@@ -666,29 +656,45 @@ Public Class frmGesamtsicherheitenMenuNEU
Private Sub SicherheitsbetragToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SicherheitsbetragToolStripMenuItem.Click
Dim SQLPlausPruefung = "SELECT
gs.gs_gsnr,
gs.Sicherheitbetrag_Ausgang,
gsp.Sicherheitbetrag_Eingang,
gs.gs_standort
FROM
(
SELECT
gs_gsnr,
gs_standort,
SUM(gs_sicherheitsbetrag) AS Sicherheitbetrag_Ausgang
FROM tblGesamtsicherheit
GROUP BY gs_standort, gs_gsnr
) gs
JOIN
(
SELECT
gsp_gsnr,
SUM(gsp_sicherheitsbetrag) AS Sicherheitbetrag_Eingang
FROM tblGesamtsicherheitsPositionen
GROUP BY gsp_gsnr
) gsp
ON gs.gs_gsnr = gsp.gsp_gsnr WHERE gs.Sicherheitbetrag_Ausgang < gsp.Sicherheitbetrag_Eingang and gs_standort = '" & Standort & "' and gs_gsnr <> 2030 order by gs.gs_gsnr"
Dim SQLPlausPruefung = "DECLARE @Standort varchar(100) = '" & Standort & "';
SELECT
gs.gs_gsnr,
gs.Sicherheitsbetrag_Eingang,
gsp.Sicherheitsbetrag_Ausgang,
gs.gs_standort,
gsp.Sicherheitsbetrag_Ausgang
- gs.Sicherheitsbetrag_Eingang AS Differenz
FROM
(
SELECT
gs_gsnr,
gs_standort,
SUM(ISNULL(gs_sicherheitsbetrag, 0))
AS Sicherheitsbetrag_Eingang
FROM dbo.tblGesamtsicherheit
WHERE gs_standort = @Standort
AND gs_gsnr <> 2030
GROUP BY
gs_gsnr,
gs_standort
) AS gs
INNER JOIN
(
SELECT
gsp_gsnr,
SUM(ISNULL(gsp_sicherheitsbetrag, 0))
AS Sicherheitsbetrag_Ausgang
FROM dbo.tblGesamtsicherheitsPositionen
GROUP BY
gsp_gsnr
) AS gsp
ON gsp.gsp_gsnr = gs.gs_gsnr
WHERE
gs.Sicherheitsbetrag_Eingang
< gsp.Sicherheitsbetrag_Ausgang
ORDER BY
gs.gs_gsnr;"
Dim dt As New DataTable
@@ -697,7 +703,7 @@ JOIN
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
MsgBox(dt.Rows.Count & " Datensätze müssen korrigiert werden (S-Betrag des Gestellungseinganges darf nicht größer als der des dem Gestellungsausganges)! " & vbNewLine & "Ansonsten können keine korrekten Werte über die Saldenliste ermittelt werden.")
MsgBox(dt.Rows.Count & " Datensätze müssen korrigiert werden (S-Betrag des Gestellungseinganges darf nicht größer als der des Gestellungsausganges)! " & vbNewLine & "Ansonsten können keine korrekten Werte über die Saldenliste ermittelt werden.")
SDL.cProgramFunctions.genExcelFromDT_NEW(dt)
Else
@@ -737,4 +743,60 @@ JOIN
End If
End Sub
Private Sub GestellungenInDerZukunftToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GestellungenInDerZukunftToolStripMenuItem.Click
Dim SQLPlausPruefung = "DECLARE @Heute date = CAST(GETDATE() AS date) DECLARE @Standort varchar(100) = '" & Standort & "';
-- Zukünftige Gestellungen
SELECT
gs.gs_gsnr AS Nummer,
'Gestellung' AS Typ,
gs.gs_datum AS Datum,
gs.gs_standort AS Standort,
gs.gs_ATBNr AS Registriernummer,
gs.gs_MRNNr AS MRN,
gs.gs_sicherheitsbetrag AS Sicherheitsbetrag
FROM tblGesamtsicherheit AS gs
WHERE gs.gs_datum >= DATEADD(day, 1, @Heute) AND gs.gs_standort = @Standort
UNION ALL
-- Zukünftige Gestellungspositionen
SELECT
gsp.gsp_gsnr AS Nummer,
'Gestellungsposition' AS Typ,
gsp.gsp_datum AS Datum,
gs.gs_standort AS Standort,
gsp.gsp_ATCNr AS Registriernummer,
gsp.gsp_MRNNr AS MRN,
gsp.gsp_sicherheitsbetrag AS Sicherheitsbetrag
FROM tblGesamtsicherheitsPositionen AS gsp
INNER JOIN tblGesamtsicherheit AS gs
ON gs.gs_gsnr = gsp.gsp_gsnr
WHERE gsp.gsp_datum >= DATEADD(day, 1, @Heute) AND gs.gs_standort = @Standort
ORDER BY
Datum,
Nummer,
Typ;"
Dim dt As New DataTable
dt = SQL.loadDgvBySql(SQLPlausPruefung, "AVISO", 100, True)
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
MsgBox(dt.Rows.Count & " Datensätze befinden sich in der Zukunft, bitte korrektes Datum eintragen. " & vbNewLine & "Ansonsten können keine korrekten Werte über die Saldenliste ermittelt werden.")
SDL.cProgramFunctions.genExcelFromDT_NEW(dt)
Else
MsgBox("keine fehlerhaften Eingaben vorhanden!")
End If
End Sub
End Class

177
Aviso/frmGesamtsicherheitenNEU.vb
View File

@@ -80,7 +80,7 @@ Public Class frmGesamtsicherheitenNEU
End Select
currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort, firmaId)
SaldoNew = Decimal.Parse(currentGesSichRef.CalcSaldo())
SaldoNew = Decimal.Parse(currentGesSichRef.CalcSaldo_new())
lblSaldo.Text = "Saldo: €" & SaldoNew.ToString("N")
Me.Text = "Gesamtsicherheit " & Standort
@@ -253,6 +253,7 @@ Public Class frmGesamtsicherheitenNEU
Case Sicherheiten_Standort.IMEX : firmaId = 20
Case Sicherheiten_Standort.VERAG_CS : firmaId = 11
Case Sicherheiten_Standort.UNISPED : firmaId = 21
Case Sicherheiten_Standort.ZOLLERN : firmaId = 90
Case Else
End Select
@@ -295,7 +296,7 @@ Public Class frmGesamtsicherheitenNEU
and isnull(gs_sicherheitsbetrag,0) <> 0
and gs_datum is not null
UNION
Select gsp_gsnr, [gsp_ATCNr],gsp_MRNNr,'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],'',[gsp_ust] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") & " From [tblGesamtsicherheitsPositionen]
Select gsp_gsnr, [gsp_ATCNr],gsp_MRNNr,'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") & " From [tblGesamtsicherheitsPositionen]
Where gsp_gsnr In (
SELECT [gs_gsnr] FROM tblGesamtsicherheit WHERE gs_standort = '" & standort & "' AND cast(gs_datum as Date) > '" & datumVon.ToShortDateString & "' AND cast(gs_datum as Date) <= '" & datumBis.ToShortDateString & "'
@@ -305,41 +306,159 @@ Public Class frmGesamtsicherheitenNEU
) as Temp order by Temp.Datum, Temp.Uhrzeit "
Dim SQLStringSicherheit_new_new As String = " select * from (select gs_gsnr as 'Nr',[gs_ATBNr] as 'Reg-Nr. Verwahrlager " & standort & "', gs_MRNNr as MRN,'Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt' " & IIf(detailinfo, ", [gs_erstellungsdatum] as Erstellungsdatum, [gs_zuletztgeandert] as GeänderAm, [gs_systemuser] as Benutzer ", "") & "
Dim SQLStringSicherheit_new_new As String = " select * from (select gs_gsnr as 'Nr',[gs_ATBNr] as 'Reg-Nr. Verwahrlager " & standort & "', gs_MRNNr as MRN,'Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc " & IIf(detailinfo, ", [gs_erstellungsdatum] as Erstellungsdatum, [gs_zuletztgeandert] as GeänderAm, [gs_systemuser] as Benutzer ", "") & "
From [tblGesamtsicherheit]
Where gs_standort = '" & standort & "' AND cast(gs_datum as Date) > '" & datumVon.ToShortDateString & "' AND cast(gs_datum as Date) <= '" & datumBis.ToShortDateString & "' and gs_datum is not null
UNION
Select gsp_gsnr, [gsp_ATCNr],gsp_MRNNr,'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],'',[gsp_ust] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") & " From [tblGesamtsicherheitsPositionen]
Select gsp_gsnr, [gsp_ATCNr],gsp_MRNNr,'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") & " From [tblGesamtsicherheitsPositionen]
Where gsp_gsnr In ( SELECT [gs_gsnr] FROM tblGesamtsicherheit WHERE gs_standort = '" & standort & "' )
and gsp_datum is not null AND cast(gsp_datum as Date) >= '" & datumVon.ToShortDateString & "'
) as Temp order by Temp.Datum, Temp.Uhrzeit "
dtSicherheiten = SQL.loadDgvBySql(SQLStringSicherheit_new_new, "AVISO", 100, True)
Dim SQLStringSicherheit_refactored As String = " DECLARE @DatumVon date = '" & datumVon.ToShortDateString & "';
DECLARE @DatumBis date = '" & datumBis.ToShortDateString & "';
DECLARE @Standort varchar(100) = '" & standort & "';
dtSicherheiten.Columns.Add("Saldo")
;WITH ReferenzHistorie AS
(
SELECT
k.brgakto_gs_standort AS Standort,
r.brgarefb_id,
r.brgarefb_refbetrag,
r.brgarefb_gueltig_ab,
LAG(r.brgarefb_refbetrag, 1, 0) OVER
(
PARTITION BY k.brgakto_gs_standort
ORDER BY
r.brgarefb_gueltig_ab,
r.brgarefb_id
) AS VorherigerReferenzbetrag
FROM [ADMIN].[dbo].[tblBrgAufschubKonten] AS k
INNER JOIN [ADMIN].[dbo].[tblBrgAufschubReferenzberaege] AS r
ON r.brgarefb_gsid = k.brgakto_id
WHERE k.brgakto_gs_standort = @Standort
AND ISNULL(r.brgarefb_gs_aktiv, 1) = 1
),
Saldenliste AS
(
/* Referenzbetragsänderungen nach dem Anfangssaldo */
SELECT
0 AS Nr,
CAST(NULL AS varchar(100)) AS RegNr,
CAST(NULL AS varchar(100)) AS MRN,
'Änderung Referenzbetrag' AS Typ,
CAST(rh.brgarefb_gueltig_ab AS date) AS Datum,
CAST('00:00:00' AS time) AS Uhrzeit,
CAST(NULL AS decimal(18,2)) AS Warenwert,
rh.brgarefb_refbetrag AS Sicherheitbetrag,
rh.brgarefb_refbetrag
- rh.VorherigerReferenzbetrag AS Sicherheitbetrag_Calc,
rh.Standort,
0 AS Sortierung " & IIf(detailinfo, ", CAST(NULL AS datetime) AS Erstellungsdatum, CAST(NULL AS datetime) AS GeändertAm, CAST(NULL AS varchar(100)) AS Benutzer ", "") & "
FROM ReferenzHistorie AS rh
WHERE rh.brgarefb_gueltig_ab > @DatumVon
AND rh.brgarefb_gueltig_ab < DATEADD(day, 1, @DatumBis)
AND rh.brgarefb_refbetrag <> rh.VorherigerReferenzbetrag
UNION ALL
/* Eingang Verwahrlager */
SELECT
gs.gs_gsnr AS Nr,
gs.gs_ATBNr AS RegNr,
gs.gs_MRNNr AS MRN,
'Eingang Verwahrlager' AS Typ,
CAST(gs.gs_datum AS date) AS Datum,
CAST(gs.gs_datum AS time) AS Uhrzeit,
gs.gs_warenwert AS Warenwert,
gs.gs_sicherheitsbetrag AS Sicherheitbetrag,
gs.gs_sicherheitsbetrag * -1 AS Sicherheitbetrag_Calc,
gs.gs_standort AS Standort,
1 AS Sortierung " & IIf(detailinfo, ",[gs_erstellungsdatum] as Erstellungsdatum, [gs_zuletztgeandert] as GeändertAm, [gs_systemuser] as Benutzer ", "") & "
FROM dbo.tblGesamtsicherheit AS gs
WHERE gs.gs_standort = @Standort
AND gs.gs_datum >= @DatumVon
AND gs.gs_datum < DATEADD(day, 1, @DatumBis)
AND gs.gs_datum IS NOT NULL
AND ISNULL(gs.gs_ReferenzAenderung, 0) = 0
UNION ALL
/* Ausgang Verwahrlager */
SELECT
gsp.gsp_gsnr AS Nr,
gsp.gsp_ATCNr AS RegNr,
gsp.gsp_MRNNr AS MRN,
'Ausgang Verwahrlager' AS Typ,
CAST(gsp.gsp_datum AS date) AS Datum,
CAST(gsp.gsp_datum AS time) AS Uhrzeit,
gsp.gsp_warenwert AS Warenwert,
gsp.gsp_sicherheitsbetrag AS Sicherheitbetrag,
gsp.gsp_sicherheitsbetrag AS Sicherheitbetrag_Calc,
@Standort AS Standort,
1 AS Sortierung " & IIf(detailinfo, ",[gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeändertAm, [gsp_systemuser] as Benutzer", "") & "
FROM dbo.tblGesamtsicherheitsPositionen AS gsp
WHERE gsp.gsp_datum >= @DatumVon
AND gsp.gsp_datum < DATEADD(day, 1, @DatumBis)
AND gsp.gsp_datum IS NOT NULL
AND EXISTS
(
SELECT 1
FROM dbo.tblGesamtsicherheit AS gs
WHERE gs.gs_gsId = gsp.gsp_gsId
AND gs.gs_standort = @Standort
AND gs.gs_datum IS NOT NULL
AND gs.gs_datum < DATEADD(day, 1, @DatumBis)
AND ISNULL(gs.gs_ReferenzAenderung, 0) = 0
)
)
SELECT
Nr,
RegNr,
MRN,
Typ,
Datum,
Uhrzeit,
Warenwert,
Sicherheitbetrag,
Sicherheitbetrag_Calc,
Standort " & IIf(detailinfo, ",Erstellungsdatum,GeändertAm, Benutzer", "") & "
FROM Saldenliste
ORDER BY
Datum ASC,
Sortierung ASC,
Uhrzeit ASC,
Nr ASC;"
dtSicherheiten = SQL.loadDgvBySql(SQLStringSicherheit_refactored, "AVISO", 100, True)
dtSicherheiten.Columns.Add("Saldo", GetType(Decimal))
Dim drFirst = dtSicherheiten.NewRow
drFirst.Item("Nr") = 0
drFirst.Item("Typ") = "Uebertrag vom"
drFirst.Item("Datum") = CDate(datumVon).ToShortDateString
Dim DefaultSaldo As Double = currentGesSichRef.getReferenzbetrag(CDate(datumVon).ToShortDateString)
drFirst.Item("Saldo") = currentGesSichRef.CalcSaldo(, datumVon) 'SQL.getValueTxtBySql("SELECT TOP 1 isnull([gs_saldo],0) FROM [tblGesamtsicherheit] where gs_standort = '" & standort & "' AND gs_datum <'" & CDate(datumVon).ToShortDateString & "' order by gs_datum desc", "AVISO",,, DefaultSaldo) 'CDbl(dtSicherheiten.Rows(0).Item("Saldo"))
drFirst.Item("Saldo") = currentGesSichRef.CalcSaldo_new(, datumVon) 'SQL.getValueTxtBySql("SELECT TOP 1 isnull([gs_saldo],0) FROM [tblGesamtsicherheit] where gs_standort = '" & standort & "' AND gs_datum <'" & CDate(datumVon).ToShortDateString & "' order by gs_datum desc", "AVISO",,, DefaultSaldo) 'CDbl(dtSicherheiten.Rows(0).Item("Saldo"))
dtSicherheiten.Rows.InsertAt(drFirst, 0)
Dim sicherheitsbetrag As Double
Dim saldo As Double
Dim c1 As Double
Dim saldoStart As Double
Dim sicherheitsbetrag As Decimal
Dim saldo As Decimal
Dim c1 As Decimal
Dim saldoStart As Decimal
For i As Integer = 1 To dtSicherheiten.Rows.Count - 1
saldoStart = CDbl(dtSicherheiten.Rows(0).Item("Saldo"))
saldo = CDbl(dtSicherheiten.Rows(i - 1).Item("Saldo"))
saldoStart = CDec(dtSicherheiten.Rows(0).Item("Saldo"))
saldo = CDec(dtSicherheiten.Rows(i - 1).Item("Saldo"))
sicherheitsbetrag = IIf(dtSicherheiten.Rows(i).Item("Sicherheitbetrag_Calc") IsNot Nothing, CDbl(dtSicherheiten.Rows(i).Item("Sicherheitbetrag_Calc")), 0)
sicherheitsbetrag = If(IsDBNull(dtSicherheiten.Rows(i)("Sicherheitbetrag_Calc")), 0, CDec(dtSicherheiten.Rows(i)("Sicherheitbetrag_Calc")))
c1 = saldo + sicherheitsbetrag
@@ -351,7 +470,7 @@ Public Class frmGesamtsicherheitenNEU
drLast.Item("Nr") = 0
drLast.Item("Typ") = "Saldo zum"
drLast.Item("Datum") = CDate(datumBis).ToShortDateString
drLast.Item("Saldo") = CDbl(dtSicherheiten.Rows(dtSicherheiten.Rows.Count - 1).Item("Saldo"))
drLast.Item("Saldo") = CDec(dtSicherheiten.Rows(dtSicherheiten.Rows.Count - 1).Item("Saldo"))
dtSicherheiten.Rows.InsertAt(drLast, dtSicherheiten.Rows.Count)
@@ -410,7 +529,7 @@ Public Class frmGesamtsicherheitenNEU
drFirst_new.Item("Nr") = 0
drFirst_new.Item("Typ") = "Uebertrag vom"
drFirst_new.Item("Datum") = CDate(datumVon).ToShortDateString
drFirst_new.Item("Saldo") = CDbl(startSaldo)
drFirst_new.Item("Saldo") = CDec(startSaldo)
sicherheiten_cleared.Rows.InsertAt(drFirst_new, 0)
@@ -419,11 +538,19 @@ Public Class frmGesamtsicherheitenNEU
drLast_new.Item("Nr") = 0
drLast_new.Item("Typ") = "Saldo zum"
drLast_new.Item("Datum") = CDate(datumBis).ToShortDateString
drLast_new.Item("Saldo") = CDbl(endSaldo)
drLast_new.Item("Saldo") = CDec(endSaldo)
sicherheiten_cleared.Rows.InsertAt(drLast_new, sicherheiten_cleared.Rows.Count)
If sicherheiten_cleared.Rows.Count > 2 Then SDL.cProgramFunctions.genExcelFromDT_NEW(sicherheiten_cleared)
If sicherheiten_cleared.Rows.Count > 2 Then
If detailinfo Then
SDL.cProgramFunctions.genExcelFromDT_NEW(sicherheiten_cleared, {"N1:N" & (sicherheiten_cleared.Rows.Count + 1)})
Else
SDL.cProgramFunctions.genExcelFromDT_NEW(sicherheiten_cleared, {"K1:K" & (sicherheiten_cleared.Rows.Count + 1)})
End If
End If
End If
@@ -466,7 +593,7 @@ Public Class frmGesamtsicherheitenNEU
Next
Dim SQLStringSicherheit As String = "select [gs_ATBNr] as 'Reg-Nr. Verwahrlager',[gs_gsnr] as 'GS Nr', gs_MRNNr as MRN, CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt', gs_art,
Dim SQLStringSicherheit As String = "select [gs_ATBNr] as 'Reg-Nr. Verwahrlager',[gs_gsnr] as 'GS Nr', gs_MRNNr as MRN, CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, gs_art,
[gsp_MRNNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext, gsp_art" &
IIf(detailinfo, ", gs_erstellungsdatum as 'Eingang erstellt am', gs_systemuser as 'von', gs_zuletztgeandert as ' Eingang geändert am', gsp_erstellungsdatum as 'Ausgang erstellt am', gsp_systemuser as 'von_', gsp_zuletztgeandert as ' Ausgang geändert am'", "") &
"from [tblGesamtsicherheit]
@@ -477,7 +604,7 @@ Public Class frmGesamtsicherheitenNEU
Dim SQLStringSicherheit_new As String = " select [gs_ATBNr] as 'Reg-Nr. Verwahrlager',[gs_gsnr] as 'GS Nr', gs_MRNNr as MRN, CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt',
Dim SQLStringSicherheit_new As String = " select [gs_ATBNr] as 'Reg-Nr. Verwahrlager',[gs_gsnr] as 'GS Nr', gs_MRNNr as MRN, CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo,
[gsp_MRNNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext" &
IIf(detailinfo, ", gs_erstellungsdatum as 'Eingang erstellt am', gs_systemuser as 'von', gs_zuletztgeandert as ' Eingang geändert am', gsp_erstellungsdatum as 'Ausgang erstellt am', gsp_systemuser as 'von_', gsp_zuletztgeandert as ' Ausgang geändert am'", "") &
"From tblGesamtsicherheit
@@ -500,7 +627,7 @@ Public Class frmGesamtsicherheitenNEU
Dim drFirst = dtSicherheiten.NewRow
drFirst.Item("Reg-Nr. Verwahrlager") = "Uebertrag vom " & datumVon
drFirst.Item("SSaldo") = currentGesSichRef.CalcSaldo(, datumVon) 'CDbl(dtSicherheiten.Rows(0).Item("Saldo"))
drFirst.Item("SSaldo") = currentGesSichRef.CalcSaldo_new(, datumVon) 'CDbl(dtSicherheiten.Rows(0).Item("Saldo"))
dtSicherheiten.Rows.InsertAt(drFirst, 0)
@@ -805,7 +932,7 @@ Public Class frmGesamtsicherheitenNEU
Private Sub btnAddSicherheit_Click(sender As Object, e As EventArgs) Handles btnAddSicherheit.Click
Try
SaldoNew = Decimal.Parse(currentGesSichRef.CalcSaldo())
SaldoNew = Decimal.Parse(currentGesSichRef.CalcSaldo_new())
lblSaldo.Text = "Saldo: €" & SaldoNew.ToString("N")
If (txtSicherheitATBNr.Text = "") Then
@@ -940,7 +1067,7 @@ Public Class frmGesamtsicherheitenNEU
Private Sub btnAddPos_Click(sender As Object, e As EventArgs) Handles btnAddPos.Click
SaldoNew = Decimal.Parse(currentGesSichRef.CalcSaldo())
SaldoNew = Decimal.Parse(currentGesSichRef.CalcSaldo_new())
lblSaldo.Text = "Saldo: €" & SaldoNew.ToString("N")
If dgvGesamtsicherheit.SelectedRows.Count = 0 Then
@@ -1023,7 +1150,7 @@ Public Class frmGesamtsicherheitenNEU
End Function
Sub AfterButton()
'currentGesSichRef.CalcSaldo()
lblSaldo.Text = "Saldo: €" & Decimal.Parse(currentGesSichRef.CalcSaldo()).ToString("N")
lblSaldo.Text = "Saldo: €" & Decimal.Parse(currentGesSichRef.CalcSaldo_new()).ToString("N")
LoadDGVSicherheiten(True)
EmptyTXT()
End Sub
@@ -2136,7 +2263,7 @@ Public Class frmGesamtsicherheitenNEU
Private Sub btnRundungsdifAusgl_Click(sender As Object, e As EventArgs) Handles btnRundungsdifAusgl.Click
Try
SaldoNew = Decimal.Parse(currentGesSichRef.CalcSaldo())
SaldoNew = Decimal.Parse(currentGesSichRef.CalcSaldo_new())
lblSaldo.Text = "Saldo: €" & SaldoNew.ToString("N")
If (rundungsdiff <> 0) AndAlso checkIfRundungsPosExists() = False Then

102
Aviso/frmHauptfenster.Designer.vb generated
View File

@@ -82,6 +82,7 @@ Partial Class frmHauptfenster
Me.UNBescheinigungAusTFEinlesenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.PrüfeBilderAufBase64ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.BerechtigungenNeuLadenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
Me.FirmaWechselnToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.VERAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -319,6 +320,7 @@ Partial Class frmHauptfenster
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.cbx_My_VW = 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()
@@ -429,7 +431,6 @@ Partial Class frmHauptfenster
Me.Panel7 = New System.Windows.Forms.Panel()
Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen()
Me.BerechtigungenNeuLadenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.conMenuAviso.SuspendLayout()
Me.MenuStrip1.SuspendLayout()
Me.pnlDetailsRechts.SuspendLayout()
@@ -783,6 +784,12 @@ Partial Class frmHauptfenster
Me.PrüfeBilderAufBase64ToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
Me.PrüfeBilderAufBase64ToolStripMenuItem.Text = "Prüfe Bilder auf Base64"
'
'BerechtigungenNeuLadenToolStripMenuItem1
'
Me.BerechtigungenNeuLadenToolStripMenuItem1.Name = "BerechtigungenNeuLadenToolStripMenuItem1"
Me.BerechtigungenNeuLadenToolStripMenuItem1.Size = New System.Drawing.Size(257, 22)
Me.BerechtigungenNeuLadenToolStripMenuItem1.Text = "Berechtigungen neu laden"
'
'ToolStripSeparator4
'
Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
@@ -961,26 +968,26 @@ Partial Class frmHauptfenster
'GenerelleGestellungenDurchsuchenToolStripMenuItem
'
Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Name = "GenerelleGestellungenDurchsuchenToolStripMenuItem"
Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Text = "Generelle Gestellungen durchsuchen"
Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Visible = False
'
'KundenVonFremdenSpeditionenToolStripMenuItem
'
Me.KundenVonFremdenSpeditionenToolStripMenuItem.Name = "KundenVonFremdenSpeditionenToolStripMenuItem"
Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.KundenVonFremdenSpeditionenToolStripMenuItem.Text = "Kunden von fremden Speditionen"
'
'KundenverwaltungToolStripMenuItem
'
Me.KundenverwaltungToolStripMenuItem.Name = "KundenverwaltungToolStripMenuItem"
Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.KundenverwaltungToolStripMenuItem.Text = "Kundenverwaltung"
'
'MDMParkplatzkartenToolStripMenuItem
'
Me.MDMParkplatzkartenToolStripMenuItem.Name = "MDMParkplatzkartenToolStripMenuItem"
Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.MDMParkplatzkartenToolStripMenuItem.Text = "MDM - Parkplatzkarten"
'
'SMSSendenToolStripMenuItem
@@ -988,7 +995,7 @@ Partial Class frmHauptfenster
Me.SMSSendenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueSMSSendenToolStripMenuItem, Me.GesendeteSMSToolStripMenuItem})
Me.SMSSendenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.handy2
Me.SMSSendenToolStripMenuItem.Name = "SMSSendenToolStripMenuItem"
Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.SMSSendenToolStripMenuItem.Text = "SMS"
'
'NeueSMSSendenToolStripMenuItem
@@ -1006,57 +1013,57 @@ Partial Class frmHauptfenster
'ZollprogrammeNachEORIDurchsuchenToolStripMenuItem
'
Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Name = "ZollprogrammeNachEORIDurchsuchenToolStripMenuItem"
Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Text = "Zollprogramme nach EORI durchsuchen"
'
'MRNBarcodedruckToolStripMenuItem
'
Me.MRNBarcodedruckToolStripMenuItem.Name = "MRNBarcodedruckToolStripMenuItem"
Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.MRNBarcodedruckToolStripMenuItem.Text = "MRN Barcodedruck"
'
'NewsletterToolStripMenuItem
'
Me.NewsletterToolStripMenuItem.Name = "NewsletterToolStripMenuItem"
Me.NewsletterToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.NewsletterToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.NewsletterToolStripMenuItem.Text = "Newsletter"
'
'ToolStripSeparator12
'
Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
Me.ToolStripSeparator12.Size = New System.Drawing.Size(388, 6)
Me.ToolStripSeparator12.Size = New System.Drawing.Size(380, 6)
'
'tool_BRGXLS
'
Me.tool_BRGXLS.Name = "tool_BRGXLS"
Me.tool_BRGXLS.Size = New System.Drawing.Size(391, 30)
Me.tool_BRGXLS.Size = New System.Drawing.Size(383, 22)
Me.tool_BRGXLS.Text = "Bürgschaften Excel"
'
'ToolStripMenuItem4
'
Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4"
Me.ToolStripMenuItem4.Size = New System.Drawing.Size(391, 30)
Me.ToolStripMenuItem4.Size = New System.Drawing.Size(383, 22)
Me.ToolStripMenuItem4.Text = "DE | Gesamtsicherheit VERAG GmbH - Excel"
Me.ToolStripMenuItem4.Visible = False
'
'ToolStripMenuItem5
'
Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5"
Me.ToolStripMenuItem5.Size = New System.Drawing.Size(391, 30)
Me.ToolStripMenuItem5.Size = New System.Drawing.Size(383, 22)
Me.ToolStripMenuItem5.Text = "AT | Gesamtsicherheit VERAG AG - Excel"
Me.ToolStripMenuItem5.Visible = False
'
'BürgschaftenExcelToolStripMenuItem
'
Me.BürgschaftenExcelToolStripMenuItem.Name = "BürgschaftenExcelToolStripMenuItem"
Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.BürgschaftenExcelToolStripMenuItem.Text = "AT | Gesamtsicherheit VERAG Customs Service - Excel"
Me.BürgschaftenExcelToolStripMenuItem.Visible = False
'
'ToolStripMenuItem6
'
Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6"
Me.ToolStripMenuItem6.Size = New System.Drawing.Size(391, 30)
Me.ToolStripMenuItem6.Size = New System.Drawing.Size(383, 22)
Me.ToolStripMenuItem6.Text = "AT | Gesamtsicherheit IMEX Customs Service GmbH - Excel"
Me.ToolStripMenuItem6.Visible = False
'
@@ -1064,7 +1071,7 @@ Partial Class frmHauptfenster
'
Me.GesamtsicherheitenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATVeragAGToolStripMenuItem, Me.ATImexCSToolStripMenuItem, Me.ATVeragCSToolStripMenuItem, Me.DEVeragGmbHToolStripMenuItem, Me.ATUnispedGmbHToolStripMenuItem, Me.DEAmbarToolStripMenuItem, Me.ATAtillaToolStripMenuItem, Me.DEZollernToolStripMenuItem, Me.ReferenzwerteToolStripMenuItem})
Me.GesamtsicherheitenToolStripMenuItem.Name = "GesamtsicherheitenToolStripMenuItem"
Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.GesamtsicherheitenToolStripMenuItem.Text = "Gesamtsicherheiten"
Me.GesamtsicherheitenToolStripMenuItem.Visible = False
'
@@ -1126,25 +1133,25 @@ Partial Class frmHauptfenster
'ToolStripMenuItem10
'
Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10"
Me.ToolStripMenuItem10.Size = New System.Drawing.Size(391, 30)
Me.ToolStripMenuItem10.Size = New System.Drawing.Size(383, 22)
Me.ToolStripMenuItem10.Text = "TICKET Parkplatz"
'
'TICKETWaidhausToolStripMenuItem
'
Me.TICKETWaidhausToolStripMenuItem.Name = "TICKETWaidhausToolStripMenuItem"
Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.TICKETWaidhausToolStripMenuItem.Text = "Infoschreiben Parkplatz"
'
'ToolStripSeparator10
'
Me.ToolStripSeparator10.Name = "ToolStripSeparator10"
Me.ToolStripSeparator10.Size = New System.Drawing.Size(388, 6)
Me.ToolStripSeparator10.Size = New System.Drawing.Size(380, 6)
'
'DAKOSYToolStripMenuItem
'
Me.DAKOSYToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StammreferenzenVerwaltenToolStripMenuItem})
Me.DAKOSYToolStripMenuItem.Name = "DAKOSYToolStripMenuItem"
Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.DAKOSYToolStripMenuItem.Text = "DAKOSY"
'
'StammreferenzenVerwaltenToolStripMenuItem
@@ -1156,76 +1163,76 @@ Partial Class frmHauptfenster
'ToolStripSeparator23
'
Me.ToolStripSeparator23.Name = "ToolStripSeparator23"
Me.ToolStripSeparator23.Size = New System.Drawing.Size(388, 6)
Me.ToolStripSeparator23.Size = New System.Drawing.Size(380, 6)
'
'toolOriginalATR
'
Me.toolOriginalATR.Image = Global.AVISO.My.Resources.Resources.atr
Me.toolOriginalATR.Name = "toolOriginalATR"
Me.toolOriginalATR.Size = New System.Drawing.Size(391, 30)
Me.toolOriginalATR.Size = New System.Drawing.Size(383, 22)
Me.toolOriginalATR.Text = "Original-ATR"
'
'SDLAbholaufträgeToolStripMenuItem
'
Me.SDLAbholaufträgeToolStripMenuItem.Name = "SDLAbholaufträgeToolStripMenuItem"
Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.SDLAbholaufträgeToolStripMenuItem.Text = "SDL Abholaufträge"
'
'ToolStripMenuItem13
'
Me.ToolStripMenuItem13.Name = "ToolStripMenuItem13"
Me.ToolStripMenuItem13.Size = New System.Drawing.Size(391, 30)
Me.ToolStripMenuItem13.Size = New System.Drawing.Size(383, 22)
Me.ToolStripMenuItem13.Text = "Postversand (Einschreiben)"
'
'VerträgeToolStripMenuItem
'
Me.VerträgeToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.spedbuch_small
Me.VerträgeToolStripMenuItem.Name = "VerträgeToolStripMenuItem"
Me.VerträgeToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.VerträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.VerträgeToolStripMenuItem.Text = "Verträge"
'
'VorauskassenToolStripMenuItem
'
Me.VorauskassenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.vorauszahlung
Me.VorauskassenToolStripMenuItem.Name = "VorauskassenToolStripMenuItem"
Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.VorauskassenToolStripMenuItem.Text = "Vorauskassen"
'
'ToolStripSeparator11
'
Me.ToolStripSeparator11.Name = "ToolStripSeparator11"
Me.ToolStripSeparator11.Size = New System.Drawing.Size(388, 6)
Me.ToolStripSeparator11.Size = New System.Drawing.Size(380, 6)
'
'EssensbestellungenToolStripMenuItem
'
Me.EssensbestellungenToolStripMenuItem.Name = "EssensbestellungenToolStripMenuItem"
Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.EssensbestellungenToolStripMenuItem.Text = "Essensbestellungen"
Me.EssensbestellungenToolStripMenuItem.Visible = False
'
'AdministrationEssensbestellungenToolStripMenuItem
'
Me.AdministrationEssensbestellungenToolStripMenuItem.Name = "AdministrationEssensbestellungenToolStripMenuItem"
Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.AdministrationEssensbestellungenToolStripMenuItem.Text = "Administration Essensbestellungen"
Me.AdministrationEssensbestellungenToolStripMenuItem.Visible = False
'
'ToolStripSeparator24
'
Me.ToolStripSeparator24.Name = "ToolStripSeparator24"
Me.ToolStripSeparator24.Size = New System.Drawing.Size(388, 6)
Me.ToolStripSeparator24.Size = New System.Drawing.Size(380, 6)
'
'WarenorteToolStripMenuItem
'
Me.WarenorteToolStripMenuItem.Name = "WarenorteToolStripMenuItem"
Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.WarenorteToolStripMenuItem.Text = "Warenorte"
'
'DatevBuchungsexportToolStripMenuItem
'
Me.DatevBuchungsexportToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EMAILToolStripMenuItem, Me.FTPToolStripMenuItem})
Me.DatevBuchungsexportToolStripMenuItem.Name = "DatevBuchungsexportToolStripMenuItem"
Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.DatevBuchungsexportToolStripMenuItem.Text = "Datev Buchungsexport"
Me.DatevBuchungsexportToolStripMenuItem.Visible = False
'
@@ -1244,13 +1251,13 @@ Partial Class frmHauptfenster
'APIToolStripMenuItem
'
Me.APIToolStripMenuItem.Name = "APIToolStripMenuItem"
Me.APIToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.APIToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.APIToolStripMenuItem.Text = "API"
'
'FIBUSachkontenToolStripMenuItem
'
Me.FIBUSachkontenToolStripMenuItem.Name = "FIBUSachkontenToolStripMenuItem"
Me.FIBUSachkontenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
Me.FIBUSachkontenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.FIBUSachkontenToolStripMenuItem.Text = "FIBU Sachkonten"
Me.FIBUSachkontenToolStripMenuItem.Visible = False
'
@@ -2762,7 +2769,7 @@ Partial Class frmHauptfenster
DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle3
Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Fill
Me.gridMyAviso.Location = New System.Drawing.Point(0, 21)
Me.gridMyAviso.Location = New System.Drawing.Point(0, 22)
Me.gridMyAviso.Name = "gridMyAviso"
Me.gridMyAviso.ReadOnly = True
DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
@@ -2775,7 +2782,7 @@ Partial Class frmHauptfenster
Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle4
Me.gridMyAviso.RowHeadersVisible = False
Me.gridMyAviso.RowHeadersWidth = 62
Me.gridMyAviso.Size = New System.Drawing.Size(328, 279)
Me.gridMyAviso.Size = New System.Drawing.Size(328, 278)
Me.gridMyAviso.TabIndex = 0
'
'Panel6
@@ -2783,6 +2790,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.cbx_My_VW)
Me.Panel6.Controls.Add(Me.btnColor)
Me.Panel6.Controls.Add(Me.lblMeineAviso)
Me.Panel6.Controls.Add(Me.cboMy_Grenzstelle)
@@ -2796,7 +2804,7 @@ Partial Class frmHauptfenster
Me.Panel6.Dock = System.Windows.Forms.DockStyle.Top
Me.Panel6.Location = New System.Drawing.Point(0, 0)
Me.Panel6.Name = "Panel6"
Me.Panel6.Size = New System.Drawing.Size(328, 21)
Me.Panel6.Size = New System.Drawing.Size(328, 22)
Me.Panel6.TabIndex = 1
'
'cbx_My_Brexit
@@ -2825,6 +2833,19 @@ Partial Class frmHauptfenster
Me.cbx_My_CBAM.UseVisualStyleBackColor = True
Me.cbx_My_CBAM.Visible = False
'
'cbx_My_VW
'
Me.cbx_My_VW.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.cbx_My_VW.AutoSize = True
Me.cbx_My_VW.ForeColor = System.Drawing.Color.White
Me.cbx_My_VW.Location = New System.Drawing.Point(-370, 3)
Me.cbx_My_VW.Name = "cbx_My_VW"
Me.cbx_My_VW.Size = New System.Drawing.Size(44, 17)
Me.cbx_My_VW.TabIndex = 30
Me.cbx_My_VW.Text = "VW"
Me.cbx_My_VW.UseVisualStyleBackColor = True
Me.cbx_My_VW.Visible = False
'
'btnColor
'
Me.btnColor.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -4099,12 +4120,6 @@ Partial Class frmHauptfenster
Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(252, 243)
Me.UsrCntlBenachrichtigungen2.TabIndex = 1
'
'BerechtigungenNeuLadenToolStripMenuItem1
'
Me.BerechtigungenNeuLadenToolStripMenuItem1.Name = "BerechtigungenNeuLadenToolStripMenuItem1"
Me.BerechtigungenNeuLadenToolStripMenuItem1.Size = New System.Drawing.Size(257, 22)
Me.BerechtigungenNeuLadenToolStripMenuItem1.Text = "Berechtigungen neu laden"
'
'frmHauptfenster
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -4575,4 +4590,5 @@ Partial Class frmHauptfenster
Friend WithEvents ToolStripMenuItem25 As ToolStripMenuItem
Friend WithEvents DEZollernToolStripMenuItem As ToolStripMenuItem
Friend WithEvents BerechtigungenNeuLadenToolStripMenuItem1 As ToolStripMenuItem
Friend WithEvents cbx_My_VW As CheckBox
End Class

110
Aviso/frmHauptfenster.vb
View File

@@ -512,6 +512,10 @@ Public Class frmHauptfenster
cbx_My_CBAM.Checked = True
End If
'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("CBAM", "AVISO") Then
' cbx_My_VW.Checked = True
'End If
'If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Speditionsbuch", "AVISO") Then
' btnSpedBuch.Visible = False
'End If
@@ -699,12 +703,6 @@ Public Class frmHauptfenster
DatevBuchungsexportToolStripMenuItem.Visible = True
End If
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED" Then
cbx_My_LKW.Checked = True
End If
Panel1.Height -= pnlSearch.Height
If Now.ToShortDateString >= DateTime.Parse("01/01/2023") Then
@@ -1247,6 +1245,7 @@ ELSE_ATILLA:
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) "
If cbx_My_VW.Visible AndAlso Not cbx_My_VW.Checked Then sqlStr &= " AND tblSnd_Abfertigungsart_ID NOT IN (67,68,69) "
'Farbe
If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
@@ -1361,57 +1360,57 @@ ELSE_ATILLA:
'Dim originalImage = Image.FromFile("\\share01\Datenarchiv\DOKUMENTE\MITARBEITER\PERSONAL_FOTOS\20200419_000451_Hofer_375.jpg") 'My.Resources.Koerfez61
'Dim originalImage = Image.FromFile("\\share01\Datenarchiv\DOKUMENTE\MITARBEITER\PERSONAL_FOTOS\20220620_091930_Luxbauer_4.jpg") 'My.Resources.Koerfez61
Dim originalImage = Image.FromFile(cDATENSERVER.GET_PDFPath_BY_DocID(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_foto_DocId)) 'My.Resources.Koerfez61
'Dim originalImage = Image.FromFile("C:\Users\DEVELOPER1\Desktop\grund.png") 'My.Resources.Koerfez61
'Dim originalImage = Image.FromFile("C:\Users\DEVELOPER1\Desktop\grund.png") 'My.Resources.Koerfez61
' MsgBox(cDATENSERVER.GET_PDFPath_BY_DocID(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_foto_DocId))
' MsgBox(cDATENSERVER.GET_PDFPath_BY_DocID(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_foto_DocId))
Dim picSize = 35
Dim picSize = 35
Dim space_X As Integer = 0
Dim space_Y As Integer = 0
Dim picWidth As Integer = 0
Dim picHheight As Integer = 0
Dim space_X As Integer = 0
Dim space_Y As Integer = 0
Dim picWidth As Integer = 0
Dim picHheight As Integer = 0
Dim factor As Double = 1
If originalImage.Height < originalImage.Width Then
factor = picSize / originalImage.Height
picWidth = originalImage.Width * factor
picHheight = originalImage.Height * factor
' space_X = (picWidth - picHheight) / 2
Dim factor As Double = 1
If originalImage.Height < originalImage.Width Then
factor = picSize / originalImage.Height
picWidth = originalImage.Width * factor
picHheight = originalImage.Height * factor
' space_X = (picWidth - picHheight) / 2
Else
factor = picSize / originalImage.Width
picWidth = originalImage.Width * factor
picHheight = originalImage.Height * factor
' space_X = (picHheight - picWidth) / 2
End If
' MsgBox(picWidth & " - " & picHheight)
'Create a new, blank image with the same dimensions.
Dim croppedImage As New Bitmap(picWidth, picHheight)
'Prepare to draw on the new image.
Using g = Graphics.FromImage(croppedImage)
Dim path As New GraphicsPath
'Create an ellipse that fills the image in both directions.
'path.AddEllipse(0, 0, croppedImage.Width, croppedImage.Height)
path.AddEllipse(0, 0, picSize, picSize)
Dim reg As New Region(path)
'Draw only within the specified ellipse.
g.Clip = reg
'g.DrawImage(originalImage, 0, 0, picSize, picSize)
g.DrawImage(originalImage, 0, 0, picWidth, picHheight)
End Using
'Display the new image.
btnMitarbeiterKonto.Image = croppedImage
Exit Sub
Else
factor = picSize / originalImage.Width
picWidth = originalImage.Width * factor
picHheight = originalImage.Height * factor
' space_X = (picHheight - picWidth) / 2
End If
' MsgBox(picWidth & " - " & picHheight)
'Create a new, blank image with the same dimensions.
Dim croppedImage As New Bitmap(picWidth, picHheight)
'Prepare to draw on the new image.
Using g = Graphics.FromImage(croppedImage)
Dim path As New GraphicsPath
'Create an ellipse that fills the image in both directions.
'path.AddEllipse(0, 0, croppedImage.Width, croppedImage.Height)
path.AddEllipse(0, 0, picSize, picSize)
Dim reg As New Region(path)
'Draw only within the specified ellipse.
g.Clip = reg
'g.DrawImage(originalImage, 0, 0, picSize, picSize)
g.DrawImage(originalImage, 0, 0, picWidth, picHheight)
End Using
'Display the new image.
btnMitarbeiterKonto.Image = croppedImage
Exit Sub
End If
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
@@ -1518,7 +1517,7 @@ ELSE_ATILLA:
sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR CLUSTER='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' OR FIRMA='ATILLA' ) "
Else
sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR CLUSTER='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' ) "
' MsgBox(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
' MsgBox(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then
' '+AMBAR
' sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR (tblSendungen.FilialenNr IN('5701') AND tblSnd_Abfertigungsart_ID IN(1,38,39,46,66)) ) "
@@ -1620,6 +1619,7 @@ ELSE_ATILLA:
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) "
If cbx_My_VW.Visible AndAlso Not cbx_My_VW.Checked Then sqlStr &= " AND tblSnd_Abfertigungsart_ID NOT IN (67,68,69) "
'Farbe
If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
@@ -3453,7 +3453,7 @@ ELSE_ATILLA:
Try
'Dim MIC = New VERAG_PROG_ALLGEMEIN.MicCustImportInvoiceComponent.InsertImportShipment
'Dim MIC = New VERAG_PROG_ALLGEMEIN.MIC_IMPORT.InsertImportShipment
'MIC.ImportShipmentMessage.ImportShipment.Shipment.company = "UK"
'MIC.SaveToFile("C:\VeragTMP\Test2.xml")
@@ -3523,7 +3523,7 @@ ELSE_ATILLA:
Dim path = SDL.cFinanzOnlineWebService.genUID_Formular("ATU74813856")
If path <> "" Then
Process.Start(path)
process.Start(path)
End If
'If SDL.cFinanzOnlineWebService.Call_Web_Service_MethodUID_Abfrage_NEU2020(firma, "ATU74813856") = 0 Then
' MsgBox("HURRA2" & vbNewLine & firma)
@@ -4484,7 +4484,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, cbx_My_CBAM.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, cbx_My_VW.CheckStateChanged
If Grid_aktiv Then
'Wenn VERIMEX/T1 und cboMyAvisoAnzeige geändert --> Checkboxes richtig setzen
If sender Is cboMyAvisoAnzeige Then
@@ -4518,10 +4518,12 @@ ELSE_ATILLA:
lblMeineAviso.Text = "Meine Aviso:"
cbx_My_Brexit.Visible = False
cbx_My_CBAM.Visible = False
cbx_My_VW.Visible = False
Else
lblMeineAviso.Text = "Meine Sendungen:"
cbx_My_Brexit.Visible = True
cbx_My_CBAM.Visible = True
cbx_My_VW.Visible = True
End If
End Sub

62
Aviso/frmSendungsdetailsNEU.vb
View File

@@ -1129,28 +1129,34 @@ Public Class frmSendungsdetailsNEU
initZollTarife(c.KdNr)
End Sub
Private Sub frmSendungsdetailsShown(sender As Object, e As EventArgs) Handles Me.Shown
If False Then 'VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", Me) Then
Dim u As New SDL.usrCntlATLAS_NCTS(DAKOSY_Worker.cDakosy_ZollanmeldungenArten.T2, AvisoId, SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, Now.ToString("yy"), "")
u.Dock = DockStyle.Fill
tbZollabfertigung.Controls.Clear()
tbZollabfertigung.Controls.Add(u)
Else
'TabControl1.TabPages.Remove(tbZollabfertigung)
End If
Try
If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("frmSendungsdetails", Me) And Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("frmSendungsdetailsNEU", Me) Then
Me.Close()
End If
If TabControl1.SelectedTab Is tbKundenInfo Then
txtAuftraggeber.Focus() ' Damit in tbKundeninfo ausgewählt
End If
' Button13.Location = New Point(Button13.Left, 0)
' Dim ber As Integer = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG(Me)
' If ber >= 99 Then
'Me.Dispose()
'Me.Close()
' Exit Sub
'nd If
If False Then 'VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", Me) Then
Dim u As New SDL.usrCntlATLAS_NCTS(DAKOSY_Worker.cDakosy_ZollanmeldungenArten.T2, AvisoId, SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, Now.ToString("yy"), "")
u.Dock = DockStyle.Fill
tbZollabfertigung.Controls.Clear()
tbZollabfertigung.Controls.Add(u)
Else
'TabControl1.TabPages.Remove(tbZollabfertigung)
End If
If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("frmSendungsdetails", Me) And Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("frmSendungsdetailsNEU", Me) Then
Me.Close()
End If
If TabControl1.SelectedTab Is tbKundenInfo Then
txtAuftraggeber.Focus() ' Damit in tbKundeninfo ausgewählt
End If
' Button13.Location = New Point(Button13.Left, 0)
' Dim ber As Integer = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG(Me)
' If ber >= 99 Then
'Me.Dispose()
'Me.Close()
' Exit Sub
'nd If
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
Sub changeSelectedButton()
@@ -4425,7 +4431,7 @@ Public Class frmSendungsdetailsNEU
Dim f As SDL.frmFormulare = Nothing
SDL.FormularManagerNEU.OPEN_FORM_Byref(SDL.FormularManagerArten.Importaviso, kdnrFrm, {kdnrFrm, FirmaFrm, SENDUNG_LIST(CURRENT_INDEX), AVISO, ROLLE},, f)
AddHandler f.FormClosing, Sub()
If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Firma <> 24 Then
If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Firma <> "24" Then
If f.printed Then AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "Auftrag fehlt - angefordert", 1)
End If
@@ -8303,7 +8309,7 @@ Public Class frmSendungsdetailsNEU
Private Sub btnStatusAbklaerungTR_Click(sender As Object, e As EventArgs) Handles btnStatusAbklaerungTR.Click
Me.Cursor = Cursors.WaitCursor
SAVE_ME()
If AVISOFUNC.setSendungAbklaerungTR(SendungID, AvisoId) Then
If AVISOFUNC.setSendungAbklaerungTR(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId) Then
initDataBinding()
End If
Me.Cursor = Cursors.Default
@@ -8312,7 +8318,7 @@ Public Class frmSendungsdetailsNEU
Private Sub btnStatusVorbereitetQS_Click(sender As Object, e As EventArgs) Handles btnStatusVorbereitetQS.Click
Me.Cursor = Cursors.WaitCursor
SAVE_ME()
If AVISOFUNC.setSendungVorbereitetQS(SendungID, AvisoId) Then
If AVISOFUNC.setSendungVorbereitetQS(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId) Then
initDataBinding()
End If
Me.Cursor = Cursors.Default
@@ -8321,7 +8327,7 @@ Public Class frmSendungsdetailsNEU
Private Sub btnStatusVorgeschrieben_Click(sender As Object, e As EventArgs) Handles btnStatusVorgeschrieben.Click
Me.Cursor = Cursors.WaitCursor
SAVE_ME()
If AVISOFUNC.setSendungVorgeschrieben(SendungID, AvisoId) Then
If AVISOFUNC.setSendungVorgeschrieben(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId) Then
initDataBinding()
End If
Me.Cursor = Cursors.Default
@@ -8330,7 +8336,7 @@ Public Class frmSendungsdetailsNEU
Private Sub btnStatusAbfertigungTR_Click(sender As Object, e As EventArgs) Handles btnStatusAbfertigungTR.Click
Me.Cursor = Cursors.WaitCursor
SAVE_ME()
If AVISOFUNC.setSendungAbfertigungTR(SendungID, AvisoId) Then
If AVISOFUNC.setSendungAbfertigungTR(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId) Then
initDataBinding()
End If
Me.Cursor = Cursors.Default
@@ -8340,7 +8346,7 @@ Public Class frmSendungsdetailsNEU
Me.Cursor = Cursors.WaitCursor
SAVE_ME()
If Not cbxFremdspedition.Checked Then
If AVISOFUNC.setSendungSpeditionsbuchEintrag(SendungID, AvisoId) Then
If AVISOFUNC.setSendungSpeditionsbuchEintrag(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId) Then
initDataBinding()
End If
End If
@@ -8350,7 +8356,7 @@ Public Class frmSendungsdetailsNEU
Private Sub btnSendungFakturiert_Click(sender As Object, e As EventArgs) Handles btnSendungFakturiert.Click
Me.Cursor = Cursors.WaitCursor
SAVE_ME()
If AVISOFUNC.setSendungFakturiert(SendungID, AvisoId) Then
If AVISOFUNC.setSendungFakturiert(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId) Then
initDataBinding()
End If
Me.Cursor = Cursors.Default

8
Aviso/usrCntlSND_ATBGestellung.vb
View File

@@ -136,9 +136,9 @@ Public Class usrCntlSND_ATBGestellung
Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort, firmaID)
If GesSichRef Is Nothing Then MsgBox("Verwahrungsreferenz kann nicht ermittelt werden!") : Exit Sub
Dim saldo = CDbl(GesSichRef.CalcSaldo())
Dim saldo = CDbl(GesSichRef.CalcSaldo_new())
Dim sicherheitsbertrag As Double = WarenwertEUR * (GesSichRef.brgakto_gs_zollsatz / 100)
Dim sicherheitsbertrag As Double = WarenwertEUR * (GesSichRef.brgakto_gs_zollsatz / 100)
If sicherheitsbertrag > saldo Then
If MsgBox(Standort & vbNewLine & "Gestellung kann NICHT durchgeführt werden!" & vbNewLine & "Eingetragener Warenwert in EUR: " & WarenwertEUR & " (Sicherheitsbetrag: " & sicherheitsbertrag & ") übersteigt den vorhandenen Sicherheitssaldo von: " & saldo & vbNewLine & "Trotzdem fortfahren", vbYesNoCancel) <> vbYes Then Exit Sub
@@ -228,7 +228,7 @@ Public Class usrCntlSND_ATBGestellung
End With
AddHandler frm.FormClosing, Function()
GesSichRef.CalcSaldo()
GesSichRef.CalcSaldo_new()
Me.BringToFront()
End Function
frm.Show()
@@ -305,7 +305,7 @@ Public Class usrCntlSND_ATBGestellung
.txtSicherheitATBNr.Text = txtATBT1.Text
End With
AddHandler frm.FormClosing, Function()
GesSichRef.CalcSaldo()
GesSichRef.CalcSaldo_new()
Me.BringToFront()
End Function
frm.Show(Me)