Mergekonflike ausbessern;
This commit is contained in:
@@ -4061,7 +4061,7 @@ Public Class frmSendungsdetailsNEU
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub EZAToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem13.Click
|
||||
Private Sub EZAToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles toolSendDyEZA.Click
|
||||
' 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
|
||||
@@ -4098,7 +4098,7 @@ Public Class frmSendungsdetailsNEU
|
||||
End Sub
|
||||
End Sub
|
||||
|
||||
Private Sub AESToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem11.Click
|
||||
Private Sub AESToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles toolSendDyAES.Click
|
||||
'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
|
||||
@@ -4195,7 +4195,7 @@ Public Class frmSendungsdetailsNEU
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub ToolStripMenuItem13_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem13.Click
|
||||
Private Sub ToolStripMenuItem13_Click(sender As Object, e As EventArgs) Handles toolSendDyEZA.Click
|
||||
|
||||
End Sub
|
||||
|
||||
@@ -6945,11 +6945,24 @@ Public Class frmSendungsdetailsNEU
|
||||
cboAbfertigungsart.changeItem(abfTmp)
|
||||
End If
|
||||
|
||||
toolSendDyEZA.Enabled = False
|
||||
toolSendDyAES.Enabled = False
|
||||
toolSendDyEXG.Enabled = False
|
||||
toolSendDyNCTS.Enabled = False
|
||||
toolSendDyModelTrans.Enabled = False
|
||||
toolSendTelotec.Enabled = False
|
||||
|
||||
Select Case cboAbfertigungsLand._value
|
||||
Case "UK", "GB"
|
||||
toolSendDyModelTrans.Enabled = True
|
||||
Case "AT"
|
||||
MenuStrip.Enabled = False
|
||||
toolSendTelotec.Enabled = True
|
||||
|
||||
Case Else
|
||||
MenuStrip.Enabled = True
|
||||
toolSendDyEZA.Enabled = True
|
||||
toolSendDyAES.Enabled = True
|
||||
toolSendDyEXG.Enabled = True
|
||||
toolSendDyNCTS.Enabled = True
|
||||
End Select
|
||||
End Sub
|
||||
|
||||
@@ -7600,68 +7613,123 @@ Public Class frmSendungsdetailsNEU
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub ToolStripMenuItem33_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem33.Click
|
||||
Private Sub ToolStripMenuItem33_Click(sender As Object, e As EventArgs) Handles toolSendDyEXG.Click
|
||||
' If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", Me.FindForm) Then
|
||||
|
||||
Me.Refresh()
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
|
||||
Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = Nothing
|
||||
If SENDUNG_LIST IsNot Nothing Then
|
||||
Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = Nothing
|
||||
If SENDUNG_LIST IsNot Nothing Then
|
||||
SND = SENDUNG_LIST(CURRENT_INDEX)
|
||||
Else
|
||||
MsgBox("Keine Sendung!")
|
||||
Exit Sub
|
||||
End If
|
||||
MsgBox("Keine Sendung!")
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
|
||||
|
||||
|
||||
If Not IsNumeric(SND.AbfertigungsNr) OrElse CInt(SND.AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
|
||||
If Not IsNumeric(SND.AbfertigungsNr) OrElse CInt(SND.AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
|
||||
|
||||
Dim Standort As String = ""
|
||||
Dim Standort As String = ""
|
||||
|
||||
Select Case SND.FilialenNr
|
||||
Case 4803, 4809
|
||||
Standort = "VERAG AG"
|
||||
Case 5601
|
||||
Standort = "Unisped GmbH"
|
||||
Case 5701
|
||||
Standort = "AMBAR GmbH"
|
||||
Case 4810, 5103, 5901
|
||||
Standort = "VERAG GmbH"
|
||||
Case 5501
|
||||
Standort = "IMEX"
|
||||
End Select
|
||||
|
||||
'sonderfälle lt. Mestan
|
||||
If SND.tblSnd_Zollsystem_Land = "DE" Then
|
||||
|
||||
Select Case SND.FilialenNr
|
||||
Case 4803, 4809
|
||||
Standort = "VERAG AG"
|
||||
Case 5601
|
||||
Standort = "Unisped GmbH"
|
||||
Case 5701
|
||||
Standort = "AMBAR GmbH"
|
||||
Case 4810, 5103, 5901
|
||||
Case 5501, 4803, 4809, 5103
|
||||
Standort = "VERAG GmbH"
|
||||
Case 5501
|
||||
Standort = "IMEX"
|
||||
End Select
|
||||
|
||||
'sonderfälle lt. Mestan
|
||||
If SND.tblSnd_Zollsystem_Land = "DE" Then
|
||||
ElseIf SND.tblSnd_Zollsystem_Land = "AT" Then
|
||||
|
||||
If SND.tblSnd_Abfertigungsart_ID = 1 Then 'ZA
|
||||
Standort = "VERAG CS"
|
||||
ElseIf SND.tblSnd_Abfertigungsart_ID = 38 Then 'EV-Verz
|
||||
Select Case SND.FilialenNr
|
||||
Case 5501, 4803, 4809, 5103
|
||||
Standort = "VERAG GmbH"
|
||||
Case 4803, 5303, 4809, 5103
|
||||
Standort = "VERAG CS"
|
||||
End Select
|
||||
|
||||
ElseIf SND.tblSnd_Zollsystem_Land = "AT" Then
|
||||
|
||||
If SND.tblSnd_Abfertigungsart_ID = 1 Then 'ZA
|
||||
Standort = "VERAG CS"
|
||||
ElseIf SND.tblSnd_Abfertigungsart_ID = 38 Then 'EV-Verz
|
||||
Select Case SND.FilialenNr
|
||||
Case 4803, 5303, 4809, 5103
|
||||
Standort = "VERAG CS"
|
||||
End Select
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
|
||||
Dim frMZA As New SDL.frmZollanmeldung("EXG", Nothing, AVISO, SND, Now.ToString("yy"))
|
||||
frMZA.Show()
|
||||
AddHandler frMZA.FormClosed, Sub()
|
||||
' initdgvZollAnmeldungen()
|
||||
End Sub
|
||||
Dim frMZA As New SDL.frmZollanmeldung("EXG", Nothing, AVISO, SND, Now.ToString("yy"))
|
||||
frMZA.Show()
|
||||
AddHandler frMZA.FormClosed, Sub()
|
||||
' initdgvZollAnmeldungen()
|
||||
End Sub
|
||||
|
||||
Me.Cursor = Cursors.Default
|
||||
Me.Cursor = Cursors.Default
|
||||
' End If
|
||||
End Sub
|
||||
|
||||
|
||||
|
||||
Private Sub IMPORTToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles toolModal_Import.Click
|
||||
Dim LRN = InputBox("Please insert unique LRN:", "Send Import Declaration", cboFiliale._value & "/" & txtAbfertigungsnummer.Text)
|
||||
|
||||
If vbYes = MsgBox("Do you want to create an import declaration with LRN '" & LRN & "' in ModalTrans?", vbYesNoCancel) Then
|
||||
If cModalTransIMPORT.ceateAndSend_IMP_FromSENDUNG(LRN, SENDUNG_LIST(CURRENT_INDEX), AVISO) Then
|
||||
'OK -> MSGBOX in Function
|
||||
End If
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub EXPORTToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles toolModal_Export.Click
|
||||
Dim LRN = InputBox("Please insert unique LRN:", "Send Export Declaration", cboFiliale._value & "/" & txtAbfertigungsnummer.Text)
|
||||
|
||||
If vbYes = MsgBox("Do you want to create an Export declaration with LRN '" & LRN & "' in ModalTrans?", vbYesNoCancel) Then
|
||||
If cModalTransIMPORT.ceateAndSend_EXP_FromSENDUNG(LRN, SENDUNG_LIST(CURRENT_INDEX), AVISO) Then
|
||||
'OK -> MSGBOX in Function
|
||||
End If
|
||||
End If
|
||||
|
||||
'goto https://app.modaltrans.com/traderdecs/455159-250000473
|
||||
End Sub
|
||||
|
||||
Private Sub TRANSITT1ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles toolModal_Transit.Click
|
||||
Dim LRN = InputBox("Please insert unique LRN:", "Send Transit Declaration", cboFiliale._value & "/" & txtAbfertigungsnummer.Text)
|
||||
|
||||
If vbYes = MsgBox("Do you want to create an Transit declaration with LRN '" & LRN & "' in ModalTrans?", vbYesNoCancel) Then
|
||||
If cModalTransNCTS.ceateAndSend_NCTS_FromSENDUNG(LRN, SENDUNG_LIST(CURRENT_INDEX), AVISO) Then
|
||||
'OK -> MSGBOX in Function
|
||||
End If
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub btnATEZNewEZA_Click(sender As Object, e As EventArgs) Handles btnATEZNewEZA.Click
|
||||
SAVE_ME()
|
||||
|
||||
Try
|
||||
If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then
|
||||
Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(CURRENT_INDEX)
|
||||
Dim frmAttilaATEZNCTS = New frmATEZ_EZA(AVISO, SND, Now.ToString("yy"), dgvATEZNCTS)
|
||||
frmAttilaATEZNCTS.Show(Me)
|
||||
|
||||
AddHandler frmAttilaATEZNCTS.FormClosing, Function()
|
||||
initdgvATEZ()
|
||||
Me.BringToFront()
|
||||
End Function
|
||||
End If
|
||||
|
||||
Catch ex As Exception
|
||||
MsgBox(ex.Message & ex.StackTrace)
|
||||
End Try
|
||||
Me.Cursor = Cursors.Default
|
||||
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
Reference in New Issue
Block a user