Merge branch 'master' of https://git.it.verag.ag/edv/AVISO
This commit is contained in:
@@ -1786,6 +1786,7 @@ Public Class frmSendungsdetailsNEU
|
||||
initSND_CHAT(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID)
|
||||
checkinitOLDAbfertigungsart(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID)
|
||||
|
||||
lblSendungsId.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID
|
||||
|
||||
initSendungs_Status()
|
||||
initZuteilung()
|
||||
@@ -2093,8 +2094,10 @@ Public Class frmSendungsdetailsNEU
|
||||
Dim gesGewicht As Double = 0
|
||||
|
||||
For Each s In SENDUNG_LIST
|
||||
If s.tblSnd_Colli IsNot Nothing AndAlso IsNumeric(s.tblSnd_Colli.Replace("Pk", "").Replace(".", "").Trim) Then gesColli += s.tblSnd_Colli
|
||||
If s.tblSnd_Gewicht IsNot Nothing AndAlso IsNumeric(s.tblSnd_Gewicht.Replace("kg", "").Trim) Then gesGewicht += s.tblSnd_Gewicht
|
||||
If s.tblSnd_Abfertigungsart_ID <> 45 Then
|
||||
If s.tblSnd_Colli IsNot Nothing AndAlso IsNumeric(s.tblSnd_Colli.Replace("Pk", "").Replace(".", "").Trim) Then gesColli += s.tblSnd_Colli
|
||||
If s.tblSnd_Gewicht IsNot Nothing AndAlso IsNumeric(s.tblSnd_Gewicht.Replace("kg", "").Trim) Then gesGewicht += s.tblSnd_Gewicht
|
||||
End If
|
||||
Next
|
||||
|
||||
'lblGesColli.Text = If(gesColli = 0, "-", gesColli.ToString("N0")) & " Pk"
|
||||
@@ -8151,6 +8154,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
|
||||
initDataBinding()
|
||||
End If
|
||||
@@ -8159,6 +8163,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
|
||||
initDataBinding()
|
||||
End If
|
||||
@@ -8167,6 +8172,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
|
||||
initDataBinding()
|
||||
End If
|
||||
@@ -8175,6 +8181,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
|
||||
initDataBinding()
|
||||
End If
|
||||
@@ -8183,6 +8190,7 @@ Public Class frmSendungsdetailsNEU
|
||||
|
||||
Private Sub btnSpeditionsbuchEintragen_Click(sender As Object, e As EventArgs) Handles btnSpeditionsbuchEintragen.Click
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
SAVE_ME()
|
||||
If Not cbxFremdspedition.Checked Then
|
||||
If AVISOFUNC.setSendungSpeditionsbuchEintrag(SendungID, AvisoId) Then
|
||||
initDataBinding()
|
||||
@@ -8193,6 +8201,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
|
||||
initDataBinding()
|
||||
End If
|
||||
|
||||
Reference in New Issue
Block a user