This commit is contained in:
2021-01-19 20:26:05 +01:00
parent f25ff457b2
commit 2f7746d9ca
28 changed files with 2921 additions and 329 deletions

View File

@@ -109,10 +109,12 @@ Public Class frmSendungsdetailsNEU
For Each s In SENDUNG_LIST
If s.SAVE() = False Then SAVE_ME = False
s.SAVE_HANDLING() 'derzeit ohne Funktion
s.SAVE_VORKOSTEN() 'derzeit ohne Funktion
Next
Else
SENDUNG_LIST(CURRENT_INDEX).SAVE() 'Nur noch aktuelle Sendung speichern
SENDUNG_LIST(CURRENT_INDEX).SAVE_HANDLING() 'derzeit ohne Funktion
SENDUNG_LIST(CURRENT_INDEX).SAVE_VORKOSTEN() 'derzeit ohne Funktion
End If
SAVE_ABRECHUNG()
@@ -988,7 +990,7 @@ Public Class frmSendungsdetailsNEU
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER
Case "FRONTOFFICE"
whereFiliale = " AND FilialenNr IN (4803,4805,4811,5003,5303,5103,4839,5501,5601,5801) "
whereFiliale = " AND FilialenNr IN (4803,4805,4811,5003,5303,5103,4839,5501,5601,5701,5801) "
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
whereFiliale = " AND FilialenNr IN (4803,4805,4811,5003,5303,5103,4839,5501,5601,5801,5701) "
End If
@@ -1030,6 +1032,8 @@ Public Class frmSendungsdetailsNEU
txtFrachtkosten.Text = If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtkosten, "")
txtWarenwert.Text = If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, "")
txtWarenwertWaehrung.SET_VALUE(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung, ""))
@@ -1248,8 +1252,12 @@ Public Class frmSendungsdetailsNEU
initTab()
initGesColliGewicht()
initKdInfo(-1)
If tbcntr.SelectedTab Is TabPage5 Then
SENDUNG_LIST(CURRENT_INDEX).LOAD_VORKOSTEN()
If tbcntr.SelectedTab Is tbBAR Then
initDGVBelege()
ElseIf tbcntr.SelectedTab Is tbVorkosten Then
initDGVVorkosten()
End If
@@ -1556,6 +1564,8 @@ Public Class frmSendungsdetailsNEU
End Select
SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtkosten = SQL.isNullNothingDbl(txtFrachtkosten.Text)
SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert = SQL.isNullNothingDbl(txtWarenwert.Text)
SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung = SQL.isNullNothing(txtWarenwertWaehrung._value)
@@ -3575,11 +3585,20 @@ Public Class frmSendungsdetailsNEU
End Sub
Private Sub tbcntr_SelectedIndexChanged(sender As Object, e As EventArgs) Handles tbcntr.SelectedIndexChanged
If tbcntr.SelectedTab Is TabPage5 Then
If tbcntr.SelectedTab Is tbVorkosten Then
initDGVVorkosten
ElseIf tbcntr.SelectedTab Is tbBAR Then
initDGVBelege()
End If
End If
End Sub
Sub initDGVVorkosten()
dgvVorkosten.Rows.Clear()
For Each VK In SENDUNG_LIST(CURRENT_INDEX).VORKOSTEN
dgvVorkosten.Rows.Add(SENDUNG_LIST(CURRENT_INDEX).VORKOSTEN.IndexOf(VK), VK.sndvk_Firma, VK.sndvk_LeistungsBez, VK.sndvk_Preis)
Next
End Sub
Private Sub ToolStripMenuItem13_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem13.Click
End Sub
@@ -4136,4 +4155,90 @@ Public Class frmSendungsdetailsNEU
'End If
End Sub
Private Sub Button17_Click_1(sender As Object, e As EventArgs) Handles btnVorkostenAdd.Click
If txtVK_Leistung.Text.Trim = "" Then Exit Sub
If txtVK_Firma.Text.Trim = "" Then Exit Sub
If txtVK_Preis._value = "" Then Exit Sub
Try
If VK_ID >= 0 Then
'Dim VK = SENDUNG_LIST(CURRENT_INDEX).VORKOSTEN.Find(Function(x) x.sndvk_id = VK_ID)
Dim VK = SENDUNG_LIST(CURRENT_INDEX).VORKOSTEN(VK_ID)
VK.sndvk_LeistungsNr = 499
VK.sndvk_LeistungsBez = txtVK_Leistung.Text.Trim
VK.sndvk_Firma = txtVK_Firma.Text.Trim
VK.sndvk_Preis = txtVK_Preis._value
'SENDUNG_LIST(CURRENT_INDEX).SAVE()
btnVorkostenAdd.BackgroundImage = My.Resources.plus
Else
Dim VK As New VERAG_PROG_ALLGEMEIN.cSendVorkosten
VK.sndvk_LeistungsNr = 499
VK.sndvk_LeistungsBez = txtVK_Leistung.Text.Trim
VK.sndvk_Firma = txtVK_Firma.Text.Trim
VK.sndvk_Preis = txtVK_Preis._value
SENDUNG_LIST(CURRENT_INDEX).VORKOSTEN.Add(VK)
End If
VK_ID = -1
lblVK_BEarbeitungAbbrechen.Visible = False
txtVK_Leistung.Text = ""
txtVK_Firma.Text = ""
txtVK_Preis.Text = ""
initDGVVorkosten()
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
End Try
End Sub
Private Sub dgvVorkosten_KeyDown(sender As Object, e As KeyEventArgs) Handles dgvVorkosten.KeyDown
If dgvVorkosten.SelectedRows.Count = 0 Then Exit Sub
If e.KeyCode = Keys.Delete Then
If vbYes = MsgBox("Möchten Sie die Vorkosten-Position wirklich löschen?", vbYesNoCancel) Then
Dim VK = SENDUNG_LIST(CURRENT_INDEX).VORKOSTEN.Find(Function(x) x.sndvk_id = dgvVorkosten.SelectedRows(0).Cells("clmnVK_id").Value)
SENDUNG_LIST(CURRENT_INDEX).VORKOSTEN.Remove(VK)
SENDUNG_LIST(CURRENT_INDEX).SAVE()
initDGVVorkosten()
End If
End If
End Sub
Dim VK_ID = -1
Private Sub dgvVorkosten_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvVorkosten.CellDoubleClick, dgvVorkosten.CellContentDoubleClick
If e.RowIndex >=0 Then
Try
' Dim VK = SENDUNG_LIST(CURRENT_INDEX).VORKOSTEN.Find(Function(x) x.sndvk_id = dgvVorkosten.SelectedRows(0).Cells("clmnVK_id").Value)
Dim VK = SENDUNG_LIST(CURRENT_INDEX).VORKOSTEN(dgvVorkosten.SelectedRows(0).Cells("clmnVK_id").Value)
txtVK_Firma.Text = VK.sndvk_Firma
txtVK_Leistung.Text = VK.sndvk_LeistungsBez
txtVK_Preis.Text = CDbl(VK.sndvk_Preis).ToString("N2")
'VK_ID = VK.sndvk_id
VK_ID = dgvVorkosten.SelectedRows(0).Cells("clmnVK_id").Value
lblVK_BEarbeitungAbbrechen.Visible = True
btnVorkostenAdd.BackgroundImage = My.Resources.stift
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
End Try
End If
End Sub
Private Sub lblVK_BEarbeitungAbbrechen_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles lblVK_BEarbeitungAbbrechen.LinkClicked
VK_ID = -1
lblVK_BEarbeitungAbbrechen.Visible = False
btnVorkostenAdd.BackgroundImage = My.Resources.plus
txtVK_Leistung.Text = ""
txtVK_Firma.Text = ""
txtVK_Preis.Text = ""
End Sub
Private Sub ZollstoppAMBARToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZollstoppAMBARToolStripMenuItem.Click
Me.Cursor = Cursors.WaitCursor
SAVE_ME()
Dim f As New frmZollstopp(SENDUNG_LIST(CURRENT_INDEX))
f.ShowDialog(Me)
Me.Cursor = DefaultCursor
End Sub
End Class