neu
This commit is contained in:
@@ -42,7 +42,7 @@ Public Class frmSendungsdetailsNEU
|
||||
|
||||
Private Sub frmSendungsdetails_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
|
||||
If Not closeWithoutSave Then
|
||||
loadDataInLIST()
|
||||
' loadDataInLIST()
|
||||
If Not SAVE_ME() Then
|
||||
e.Cancel = True
|
||||
End If
|
||||
@@ -92,17 +92,22 @@ Public Class frmSendungsdetailsNEU
|
||||
SENDUNG_LIST(CURRENT_INDEX).SAVE_Abrechnung()
|
||||
End Sub
|
||||
|
||||
Function SAVE_ME() As Boolean
|
||||
Function SAVE_ME(Optional saveAll = False) As Boolean
|
||||
loadDataInLIST()
|
||||
|
||||
If AVISO.Abgeschlossen Then
|
||||
'MsgBox("Keine Änderung möglich - Akt bereits abgeschlossen.")
|
||||
Return True
|
||||
End If
|
||||
|
||||
SAVE_ME = True
|
||||
For Each s In SENDUNG_LIST
|
||||
If s.SAVE() = False Then SAVE_ME = False
|
||||
Next
|
||||
|
||||
If saveAll Then
|
||||
For Each s In SENDUNG_LIST
|
||||
If s.SAVE() = False Then SAVE_ME = False
|
||||
Next
|
||||
Else
|
||||
SENDUNG_LIST(CURRENT_INDEX).SAVE() 'Nur noch aktuelle Sendung speichern
|
||||
End If
|
||||
SAVE_ABRECHUNG()
|
||||
|
||||
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
@@ -633,7 +638,7 @@ Public Class frmSendungsdetailsNEU
|
||||
b.value = SENDUNG_LIST.IndexOf(s)
|
||||
|
||||
AddHandler b.MECLICK, Sub(send As Object)
|
||||
Me.loadDataInLIST()
|
||||
' Me.loadDataInLIST()
|
||||
If SAVE_ME() Then
|
||||
Me.CURRENT_INDEX = send.value
|
||||
Me.initDataBinding()
|
||||
@@ -730,7 +735,7 @@ Public Class frmSendungsdetailsNEU
|
||||
|
||||
End Select
|
||||
|
||||
loadDataInLIST()
|
||||
' loadDataInLIST()
|
||||
If SAVE_ME() Then 'aktuelle Änderungen sichern
|
||||
' Dim abfnr_tmp As Integer = IIf(filiale_tmp > 0, ADMIN.getMaxPosNrIncrement(filiale_tmp, Now.Year), 0)
|
||||
|
||||
@@ -759,7 +764,7 @@ Public Class frmSendungsdetailsNEU
|
||||
|
||||
|
||||
Public Sub Duplicate(index)
|
||||
loadDataInLIST()
|
||||
' loadDataInLIST()
|
||||
SAVE_ME()
|
||||
Dim newRow As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(index).Clone
|
||||
newRow.tblSnd_PosUnterNr = SENDUNG_LIST.Count + 1
|
||||
@@ -1075,8 +1080,7 @@ Public Class frmSendungsdetailsNEU
|
||||
i.tblSnd_PosUnterNr = cnt
|
||||
cnt += 1
|
||||
Next
|
||||
SAVE_ME()
|
||||
|
||||
SAVE_ME(True)
|
||||
End Sub
|
||||
|
||||
|
||||
@@ -1303,7 +1307,7 @@ Public Class frmSendungsdetailsNEU
|
||||
End Sub
|
||||
|
||||
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
|
||||
loadDataInLIST()
|
||||
' loadDataInLIST()
|
||||
If SAVE_ME() Then
|
||||
Me.Close()
|
||||
End If
|
||||
@@ -1342,7 +1346,7 @@ Public Class frmSendungsdetailsNEU
|
||||
|
||||
Private Sub Button3_Click_1(sender As Object, e As EventArgs) Handles Button3.Click, Button8.Click, LaufzettelDruckenToolStripMenuItem.Click
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
loadDataInLIST()
|
||||
' loadDataInLIST()
|
||||
SAVE_ME()
|
||||
Dim Printername = cboPrinter.Text
|
||||
|
||||
@@ -1478,7 +1482,7 @@ Public Class frmSendungsdetailsNEU
|
||||
|
||||
Private Sub btn_Click_1(sender As Object, e As EventArgs) Handles btn.Click
|
||||
|
||||
loadDataInLIST()
|
||||
'loadDataInLIST()
|
||||
If Not SAVE_ME() Then
|
||||
If vbNo = MsgBox("Fehler beim Speichern. Möchten Sie das Speditionsbuch dennoch öffenen?" & vbNewLine & "(Einige Daten werden möglicherweise nicht übernommen)", vbYesNo) Then
|
||||
Exit Sub
|
||||
@@ -1882,7 +1886,7 @@ Public Class frmSendungsdetailsNEU
|
||||
|
||||
Private Sub btnNeueAbfertigungNrVergeben_Click(sender As Object, e As EventArgs) Handles btnNeueAbfertigungNrVergeben.Click
|
||||
increasePosNr()
|
||||
loadDataInLIST()
|
||||
' loadDataInLIST()
|
||||
SAVE_ME()
|
||||
lblAbfNrExists.Visible = checkDoppelAbfNr()
|
||||
End Sub
|
||||
@@ -1919,7 +1923,7 @@ Public Class frmSendungsdetailsNEU
|
||||
End Sub
|
||||
|
||||
Private Sub Button9_Click_1(sender As Object, e As EventArgs) Handles Button9.Click
|
||||
Me.loadDataInLIST()
|
||||
'Me.loadDataInLIST()
|
||||
If SAVE_ME() Then
|
||||
Dim frmSendungsdetailsAbrechnung As New frmSendungsdetailsAbrechnung
|
||||
|
||||
@@ -1950,7 +1954,7 @@ Public Class frmSendungsdetailsNEU
|
||||
End Sub
|
||||
|
||||
Private Sub btnKassenbuchEintrag_Click(sender As Object, e As EventArgs) Handles btnKassenbuchEintrag.Click, Button1.Click
|
||||
loadDataInLIST()
|
||||
' loadDataInLIST()
|
||||
SAVE_ME()
|
||||
Dim PERSONAL As SDL.cPersonal = Nothing
|
||||
Dim frmSecureLoginKassenbuch As New SDL.frmSecureLoginKassenbuch
|
||||
@@ -2211,7 +2215,7 @@ Public Class frmSendungsdetailsNEU
|
||||
If vbYes = MsgBox("Möchten Sie alle Aktendeckel drucken?", vbYesNoCancel) Then
|
||||
'GC.Collect()
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
loadDataInLIST()
|
||||
'loadDataInLIST()
|
||||
SAVE_ME()
|
||||
For Each s In SENDUNG_LIST
|
||||
If Not s.tblSnd_Fremdspedition Then If CInt(s.AbfertigungsNr) < 100000 Then MsgBox("Es wurden nicht alle Abfertigungsnummern vergeben!") : Exit Sub
|
||||
@@ -2230,7 +2234,7 @@ Public Class frmSendungsdetailsNEU
|
||||
End Sub
|
||||
|
||||
Private Sub Button4_Click(sender As Object, e As EventArgs) Handles GelangensbestätigungToolStripMenuItem.Click, toolGelangensbestätigung.Click
|
||||
loadDataInLIST()
|
||||
' loadDataInLIST()
|
||||
SAVE_ME()
|
||||
Dim SND_TMP = SENDUNG_LIST(CURRENT_INDEX)
|
||||
Dim frmGB As New frmGelangensbestaetigung
|
||||
@@ -2467,8 +2471,8 @@ Public Class frmSendungsdetailsNEU
|
||||
End Sub
|
||||
|
||||
Sub initAnhang()
|
||||
Dim hSQL As String = " SELECT [anh_id],[anh_Name],[anh_docId],CASE WHEN anh_SendungsId is null THEN '***' ELSE [anh_Art] END as [anh_Art],[anh_Typ] FROM [tblAvisoAnhaenge]
|
||||
WHERE anh_AvisoId=" & AvisoId & " AND (anh_SendungsId is null OR anh_SendungsId=" & SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID & ")
|
||||
Dim hSQL As String = " SELECT [anh_id],[anh_Name],[anh_docId],CASE WHEN anh_SendungsId is null OR anh_SendungsId <=0 THEN '***' ELSE [anh_Art] END as [anh_Art],[anh_Typ] FROM [tblAvisoAnhaenge]
|
||||
WHERE anh_AvisoId=" & AvisoId & " AND (anh_SendungsId is null OR anh_SendungsId <=0 OR anh_SendungsId=" & SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID & ")
|
||||
ORDER BY anh_SendungsId desc,
|
||||
case
|
||||
when [anh_Art] ='ATR' then 0
|
||||
@@ -2511,7 +2515,7 @@ Public Class frmSendungsdetailsNEU
|
||||
End Sub
|
||||
Private Sub btnAutomatischeNacherfassung_Click(sender As Object, e As EventArgs) Handles btnAutomatischeNacherfassung.Click
|
||||
' ZollSystem: 0=ATLAS 1= EZOLL
|
||||
loadDataInLIST()
|
||||
' loadDataInLIST()
|
||||
SAVE_ME()
|
||||
Dim ZOLL_IMPORT As New DAKOSY_Worker.cZOLL_IMPORT
|
||||
ZOLL_IMPORT.AUTO_IMPORT(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID)
|
||||
@@ -2533,7 +2537,7 @@ Public Class frmSendungsdetailsNEU
|
||||
Private Sub Button7_Click_1(sender As Object, e As EventArgs) Handles Button7.Click
|
||||
lblZollsysErr.Text = ""
|
||||
Try
|
||||
loadDataInLIST()
|
||||
'loadDataInLIST()
|
||||
SAVE_ME()
|
||||
If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID <= 0 Then
|
||||
lblZollsysErr.Text = "Keine Abfertigungsart gewählt!" : Exit Sub
|
||||
@@ -3066,7 +3070,8 @@ Public Class frmSendungsdetailsNEU
|
||||
End Sub
|
||||
|
||||
Private Sub EZAToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem13.Click
|
||||
Me.loadDataInLIST() : SAVE_ME()
|
||||
' Me.loadDataInLIST()
|
||||
SAVE_ME()
|
||||
If Not IsNumeric(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) OrElse CInt(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
|
||||
Dim frMZA As New SDL.frmZollanmeldung("EZA", Nothing, AVISO, SENDUNG_LIST(CURRENT_INDEX), Now.ToString("yy"))
|
||||
' Dim u As New SDL.usrCntlATLAS_EZA(DAKOSY_Worker.cDakosy_ZollanmeldungenArten.EZA, AvisoId, SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, Now.ToString("yy"), "")
|
||||
@@ -3080,7 +3085,8 @@ Public Class frmSendungsdetailsNEU
|
||||
End Sub
|
||||
|
||||
Private Sub NCTSToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem8.Click
|
||||
Me.loadDataInLIST() : SAVE_ME()
|
||||
' Me.loadDataInLIST()
|
||||
SAVE_ME()
|
||||
If Not IsNumeric(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) OrElse CInt(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
|
||||
Dim frMZA As New SDL.frmZollanmeldung("T1", Nothing, AVISO, SENDUNG_LIST(CURRENT_INDEX), Now.ToString("yy"))
|
||||
frMZA.Show()
|
||||
@@ -3090,7 +3096,8 @@ Public Class frmSendungsdetailsNEU
|
||||
End Sub
|
||||
|
||||
Private Sub NCTST2ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem9.Click
|
||||
Me.loadDataInLIST() : SAVE_ME()
|
||||
' Me.loadDataInLIST()
|
||||
SAVE_ME()
|
||||
If Not IsNumeric(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) OrElse CInt(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
|
||||
Dim frMZA As New SDL.frmZollanmeldung("T2", Nothing, AVISO, SENDUNG_LIST(CURRENT_INDEX), Now.ToString("yy"))
|
||||
frMZA.Show()
|
||||
@@ -3100,7 +3107,8 @@ Public Class frmSendungsdetailsNEU
|
||||
End Sub
|
||||
|
||||
Private Sub AESToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem11.Click
|
||||
Me.loadDataInLIST() : SAVE_ME()
|
||||
'Me.loadDataInLIST()
|
||||
SAVE_ME()
|
||||
If Not IsNumeric(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) OrElse CInt(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
|
||||
Dim frMZA As New SDL.frmZollanmeldung("AES", Nothing, AVISO, SENDUNG_LIST(CURRENT_INDEX), Now.ToString("yy"))
|
||||
frMZA.Show()
|
||||
@@ -3117,7 +3125,8 @@ Public Class frmSendungsdetailsNEU
|
||||
End Sub
|
||||
|
||||
Private Sub ToolStripMenuItem10_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem10.Click
|
||||
Me.loadDataInLIST() : SAVE_ME()
|
||||
' Me.loadDataInLIST()
|
||||
SAVE_ME()
|
||||
If Not IsNumeric(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) OrElse CInt(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
|
||||
Dim frMZA As New SDL.frmZollanmeldung("ÜT", Nothing, AVISO, SENDUNG_LIST(CURRENT_INDEX), Now.ToString("yy"))
|
||||
frMZA.Show()
|
||||
@@ -3205,7 +3214,7 @@ Public Class frmSendungsdetailsNEU
|
||||
End Sub
|
||||
|
||||
Private Sub Button18_Click(sender As Object, e As EventArgs) Handles Button18.Click
|
||||
loadDataInLIST()
|
||||
'loadDataInLIST()
|
||||
SAVE_ME()
|
||||
|
||||
Dim f As New frmSendungAnhangImport(AvisoId, SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID)
|
||||
@@ -3332,7 +3341,8 @@ Public Class frmSendungsdetailsNEU
|
||||
|
||||
Private Sub KdAuftragsNrInAlleSendungenÜbernehmenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KdAuftragsNrInAlleSendungenÜbernehmenToolStripMenuItem.Click
|
||||
Dim Atrnr = txtKdAuftragsNrAvisierer.Text
|
||||
loadDataInLIST()
|
||||
' loadDataInLIST()
|
||||
SAVE_ME()
|
||||
|
||||
For Each s In SENDUNG_LIST
|
||||
s.tblSnd_KdAuftragsNrAvisierer = Atrnr
|
||||
|
||||
Reference in New Issue
Block a user