This commit is contained in:
2020-11-27 22:56:38 +01:00
parent 24dd462073
commit 65ee38135e
72 changed files with 16680 additions and 587 deletions

View File

@@ -241,11 +241,7 @@ Public Class frmSendungsdetailsNEU
End If
cboVorpapier.Items.Clear()
AVISO.LOAD_Vorpapiere()
For Each VP In AVISO.VORPAPIERE
cboVorpapier.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(VP.vp_Nr, VP.vp_Nr))
Next
initVorpapiere()
If AVISO.Abgeschlossen Then
Label8.Visible = True
@@ -579,7 +575,7 @@ Public Class frmSendungsdetailsNEU
lbleori_Pruef.Text = "-"
If kdSB IsNot Nothing Then
If kdSB.KdData_KUNDE IsNot Nothing AndAlso kdSB.KdData_KUNDE.EORITIN IsNot Nothing Then
lbleori_Pruef.Text = kdSB.KdData_KUNDE.EORITIN & If(kdSB.KdData_KUNDE.EORITIN_NL, "")
lbleori_Pruef.Text = kdSB.KdData_KUNDE.EORITIN ' & If(kdSB.KdData_KUNDE.EORITIN_NL, "")
btnEORIPruef.Visible = True
End If
If kdSB.KdData_ADRESSEN IsNot Nothing AndAlso kdSB.KdData_ADRESSEN.UstIdKz IsNot Nothing AndAlso kdSB.KdData_ADRESSEN.UstIdNr IsNot Nothing Then
@@ -878,7 +874,7 @@ Public Class frmSendungsdetailsNEU
newRow.tblSnd_Gewicht = ""
newRow.tblSnd_Colli = ""
newRow.tblSnd_SendungID = -1
newRow.ABRECHNUNG.Clear()
SENDUNG_LIST.Add(newRow)
SAVE_ME()
@@ -1136,9 +1132,7 @@ Public Class frmSendungsdetailsNEU
txtFrachtfuehrer.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtfuehrer 'IIf(SENDUNG_LIST(CURRENT_INDEX).tblSnd_frachtfuehrer Is Nothing, "", SENDUNG_LIST(CURRENT_INDEX).tblSnd_frachtfuehrer)
End If
cboVorpapier.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier
txtVorpapierPos.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier_Pos
setVorpapiere()
initFraechterAvisererFromAkt()
@@ -1273,6 +1267,33 @@ Public Class frmSendungsdetailsNEU
' GEAENDERT = False
End Sub
Sub initVorpapiere()
cboVorpapier.Items.Clear()
cboVorpapier2.Items.Clear()
cboVorpapier3.Items.Clear()
AVISO.LOAD_Vorpapiere()
cboVorpapier.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
cboVorpapier2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
cboVorpapier3.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
For Each VP In AVISO.VORPAPIERE
cboVorpapier.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(VP.vp_Nr, VP.vp_Nr))
cboVorpapier2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(VP.vp_Nr, VP.vp_Nr))
cboVorpapier3.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(VP.vp_Nr, VP.vp_Nr))
Next
End Sub
Sub setVorpapiere()
cboVorpapier.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier
txtVorpapierPos.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier_Pos
cboVorpapier2.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier2
txtVorpapier2Pos.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier2_Pos
cboVorpapier3.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier3
txtVorpapier3Pos.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier3_Pos
End Sub
Sub initFraechterAvisererFromAkt()
'Übergangsphase Aviso/Sendung
@@ -1554,8 +1575,12 @@ Public Class frmSendungsdetailsNEU
SENDUNG_LIST(CURRENT_INDEX).tblSnd_KdAuftragsNrFrachtfuehrer = txtKdAuftragsNrFrachtfuehrer.Text
SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier = cboVorpapier.Text
SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier_Pos = txtVorpapierPos.Text
SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier = cboVorpapier.Text.Trim
SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier_Pos = txtVorpapierPos.Text.Trim
SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier2 = cboVorpapier2.Text.Trim
SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier2_Pos = txtVorpapier2Pos.Text.Trim
SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier3 = cboVorpapier3.Text.Trim
SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier3_Pos = txtVorpapier3Pos.Text.Trim
End Sub
@@ -2813,7 +2838,7 @@ Public Class frmSendungsdetailsNEU
End Sub
Sub initAnhang()
Dim hSQL As String = " SELECT [anh_id],[anh_Name],[anh_docId],CASE WHEN (anh_SendungsId is null OR anh_SendungsId <=0) AND anh_Art='' THEN '***' ELSE [anh_Art] END as [anh_Art],[anh_Typ],anh_LaufzettelDruck FROM [tblAvisoAnhaenge]
Dim hSQL As String = " SELECT [anh_id],[anh_Name],[anh_docId],CASE WHEN (anh_SendungsId is null OR anh_SendungsId <=0) AND anh_Art='' THEN '***' ELSE [anh_Art] END as [anh_Art],[anh_Typ],anh_LaufzettelDruck,anh_GestellungslisteAnfuegen 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
@@ -2874,6 +2899,11 @@ Public Class frmSendungsdetailsNEU
.Columns("anh_LaufzettelDruck").Width = 150
.Columns("anh_LaufzettelDruck").HeaderText = "Laufzettel-Druck"
.Columns("anh_GestellungslisteAnfuegen").Width = 150
.Columns("anh_GestellungslisteAnfuegen").HeaderText = "GestListe anfügen"
.ClearSelection()
End With
End Sub
@@ -3977,37 +4007,132 @@ Public Class frmSendungsdetailsNEU
End Sub
Private Sub Button24_Click(sender As Object, e As EventArgs) Handles btnEORIPruef.Click
MsgBox("Noch nicht verfügbar!")
Exit sub
Me.Cursor = Cursors.WaitCursor
Try
If lbleori_Pruef.Text.Replace("-", "").Trim = "" Then Me.Cursor = Cursors.Default : Exit Sub
Dim url = "https://ec.europa.eu/taxation_customs/dds2/eos/eori_validation.jsp?Lang=de&EoriNumb=" & lbleori_Pruef.Text.Replace(" ", "") & "&Expand=true"
Dim path = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURL(url)
Dim EORI_NR = lbleori_Pruef.Text.Replace("-", "").Replace(" ", "").Trim
If EORI_NR = "" Then Me.Cursor = Cursors.Default : Exit Sub
Dim EORI_ERG As Integer = -1
Dim path = SDL.cEORIWebService.genEORI_Formular(EORI_NR, AvisoId, SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, EORI_ERG)
btnEORIPruef.BackgroundImage = My.Resources.fragezeichen
MsgBox("1:" & path)
If path <> "" AndAlso IO.File.Exists(path) Then 'ADD
Dim fi As New IO.FileInfo(path)
Dim filename = fi.Name
If filename = "" Then
MsgBox("Dateiname konnte nicht ermittelt werden." & vbNewLine & path)
Else
MsgBox("2:" & path)
If frmSendungAnhangImport.saveToDS(AvisoId, filename, path, "EORI", "PDF", , , , SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) Then
initAnhang()
End If
End If
End If
Select Case EORI_ERG
Case 0 : btnEORIPruef.BackgroundImage = My.Resources.ok
'If path <> "" AndAlso IO.File.Exists(path) Then 'ADD
' Dim fi As New IO.FileInfo(path)
' Dim filename = fi.Name
' If filename = "" Then
' MsgBox("Dateiname konnte nicht ermittelt werden." & vbNewLine & path)
' Else
' If frmSendungAnhangImport.saveToDS(AvisoId, filename, path, "UID", "PDF", , , , SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) Then
' initAnhang()
' End If
' End If
'End If
initAnhang()
Case 1 : btnEORIPruef.BackgroundImage = My.Resources.del
End Select
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
End Try
Me.Cursor = Cursors.Default
'MsgBox("Noch nicht verfügbar!")
'Exit sub
'Me.Cursor = Cursors.WaitCursor
'Try
' If lbleori_Pruef.Text.Replace("-", "").Trim = "" Then Me.Cursor = Cursors.Default : Exit Sub
' Dim url = "https://ec.europa.eu/taxation_customs/dds2/eos/eori_validation.jsp?Lang=de&EoriNumb=" & lbleori_Pruef.Text.Replace(" ", "") & "&Expand=true"
' Dim path = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURL(url)
' btnEORIPruef.BackgroundImage = My.Resources.fragezeichen
' MsgBox("1:" & path)
' If path <> "" AndAlso IO.File.Exists(path) Then 'ADD
' Dim fi As New IO.FileInfo(path)
' Dim filename = fi.Name
' If filename = "" Then
' MsgBox("Dateiname konnte nicht ermittelt werden." & vbNewLine & path)
' Else
' MsgBox("2:" & path)
' If frmSendungAnhangImport.saveToDS(AvisoId, filename, path, "EORI", "PDF", , , , SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) Then
' initAnhang()
' End If
' End If
' End If
'Catch ex As Exception
' MsgBox(ex.Message & ex.StackTrace)
'End Try
'Me.Cursor = Cursors.Default
End Sub
Private Sub Button24_Click_1(sender As Object, e As EventArgs) Handles Button24.Click
Dim f As New frmAviso_Vorpapiere(AVISO)
f.ShowDialog(Me)
initVorpapiere()
setVorpapiere()
End Sub
Private Sub GestellungslisteAnfügenJANEINToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GestellungslisteAnfügenJANEINToolStripMenuItem.Click
If dgvAnhang.SelectedRows.Count >= 1 Then
Dim errShown = False
For Each r As DataGridViewRow In dgvAnhang.SelectedRows
' If r.Cells("anh_typ").Value = "PDF" Then
VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.toggleGestellungslisteAnfuegen(r.Cells("anh_Id").Value)
'ElseIf Not errShown Then
' MsgBox("Nur bei PDF möglich!")
' errShown = True
'End If
Next
initAnhang()
End If
End Sub
'Private Sub dgvAnhang_CellMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles dgvAnhang.CellMouseClick
' If e.Button = MouseButtons.Right Then
' MsgBox("HM1")
' dgvAnhang.ClearSelection()
' dgvAnhang.Rows(e.RowIndex).Selected = True
' End If
'End Sub
'Private Sub dgvAnhang_MouseClick(sender As Object, e As MouseEventArgs) Handles dgvAnhang.MouseClick
' If e.Button = MouseButtons.Right Then
' MsgBox("HM2")
' dgvAnhang.ClearSelection()
' ' dgvAnhang.Rows(e.RowIndex).Selected = True
' End If
'End Sub
Private Sub grid_CellMouseClick(sender As Object, e As System.Windows.Forms.DataGridViewCellMouseEventArgs) Handles dgvAnhang.CellMouseClick
If e.Button = MouseButtons.Right Then
If Not dgvAnhang.Rows(e.RowIndex).Selected Then
If e.RowIndex < 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt
dgvAnhang.ClearSelection()
dgvAnhang.Rows(e.RowIndex).Selected = True
End If
cntxtAnh.Show(Cursor.Position)
End If
'If e.Button = MouseButtons.Right Then
' If AVISO.Abgeschlossen Then Exit Sub
' If sender Is gridVermerke Then
' If gridVermerke.SelectedRows.Count = 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt
' ' AvisoID = CInt(gridVermerke.Rows(e.RowIndex).Cells("AvisoId").Value)
' gridVermerke.CurrentCell = gridVermerke.Rows(e.RowIndex).Cells(e.ColumnIndex)
' conMenuVermerke.Show(Cursor.Position)
' ToolUeberweisungsBeleg.Visible = (gridVermerke.SelectedRows(0).Cells("VermerkeCode").Value = "13")
' toolVkReminder.Visible = (gridVermerke.SelectedRows(0).Cells("VermerkeCode").Value = "13")
' End If
'End If
End Sub
End Class