This commit is contained in:
2023-09-05 21:44:30 +02:00
3 changed files with 170 additions and 141 deletions

View File

@@ -108,7 +108,7 @@
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>Aviso_TemporaryKey.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>LME.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Accessibility" />

View File

@@ -9,7 +9,7 @@ Imports VERAG_PROG_ALLGEMEIN
Public Class frmATEZ_NCTS
Dim ART As String = ""
Dim FilialenNr As String = ""
Dim FilialenNr As Integer
Dim AbfertigungsNr As Integer
Dim JAHR As Integer = Now.ToString("yy")
Public isSTAMMREF As Boolean = False
@@ -27,6 +27,8 @@ Public Class frmATEZ_NCTS
Dim openExisting As Boolean = False
Dim id As Integer = -1
Dim dgv As DataGridView = Nothing
Dim atez_data As cATEZ_NCTS_DATA
Dim atez = New cATEZ_NCTS_IN
Property BezugsNr As String = ""
Property SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen
@@ -74,108 +76,66 @@ Public Class frmATEZ_NCTS
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
Try
If atez_data.status = "Sent" Then
MsgBox(IIf(atez_data.json <> "", atez_data.json, ""))
Exit Sub
End If
If Not checkAttachment() Then
Exit Sub
End If
If Not checkMandatoryField() Then
Exit Sub
End If
Me.Cursor = Cursors.WaitCursor
If id > 0 Then
lblInfo.Text = ""
Dim atezData = New cATEZ_NCTS_DATA(id)
If atezData.json <> "" And atezData.status <> "Draft" Then
MsgBox(atezData.json)
Else
Dim atez As New cATEZ_NCTS_IN
sendAtezData(atezData, atez)
End If
With atez_data
Else
.AvisoId = AVISO.AvisoID
.SendungsId = SENDUNG.tblSnd_SendungID
.VERAG_LRN = lblBezugsnummer.Text
.LicensePlateContainerNo = txtLKWId.Text
.DAKOSY_TemplateCode = cboStammreferenz._value
.DAKOSY_IOPartner = txtDyMandant.Text
.DAKOSY_Division3 = txtDyNiederlassung.Text
.DepartureCustomsOffice = sbAbgangZollstelle._value
.DestinationCustomsOffice = sbBestimmungsZollstelle._value
.DatDeterminationLimit = txtDat.Text
.CoolingTemperature = IIf(cbxTemperatur.Checked, txtTransporttemp.Text, "")
.Carrier_Name = usrCntl_Carrier.kdFirma.Text
.Carrier_Adress_City = usrCntl_Carrier.txtOrt.Text
.Carrier_Adress_Country = usrCntl_Carrier.sbLand._value
.Carrier_Adress_Postcode = usrCntl_Carrier.txtPlz.Text
.Carrier_Adress_Street = usrCntl_Carrier.txtStrasse.Text
.Carrier_EORI = usrCntl_Carrier.txtEORI.Text
.Guarantee_GRN = "" 'leer
lblInfo.Text = ""
Dim selectedDocuments As Boolean = False
For Each Row In dgvAnhaenge.Rows
selectedDocuments = IIf(DBNull.Value Is Row.Cells("anh_selekt").Value, False, Row.Cells("anh_selekt").Value)
If selectedDocuments Then Exit For
For Each doc As DataGridViewRow In dgvAnhaenge.Rows
Dim isSelected = IIf(DBNull.Value Is doc.Cells("anh_selekt").Value, False, doc.Cells("anh_selekt").Value)
If isSelected Then
.selectedDocuments &= doc.Cells("anh_docId").Value & ", "
End If
Next
If Not selectedDocuments Then
lblInfo.Text = "kein Anhang selektiert"
Cursor = Cursors.Default
Exit Sub
End If
.SAVE()
Dim atezData As New cATEZ_NCTS_DATA
Dim atez As New cATEZ_NCTS_IN
End With
saveDurchgangszollstelle(atez_data)
saveRoute(atez_data)
With atezData
sendAtezData(atez_data, atez)
.AvisoId = AVISO.AvisoID
.SendungsId = SENDUNG.tblSnd_SendungID
.VERAG_LRN = lblBezugsnummer.Text
.LicensePlateContainerNo = txtLKWId.Text
.DAKOSY_TemplateCode = cboStammreferenz._value
.DAKOSY_IOPartner = txtDyMandant.Text
.DAKOSY_Division3 = txtDyNiederlassung.Text
.DepartureCustomsOffice = sbAbgangZollstelle._value
.DestinationCustomsOffice = sbBestimmungsZollstelle._value
.DatDeterminationLimit = txtDat.Text
.CoolingTemperature = IIf(cbxTemperatur.Checked, txtTransporttemp.Text, "")
.Carrier_Name = usrCntl_Carrier.kdFirma.Text
.Carrier_Adress_City = usrCntl_Carrier.txtOrt.Text
.Carrier_Adress_Country = usrCntl_Carrier.sbLand._value
.Carrier_Adress_Postcode = usrCntl_Carrier.txtPlz.Text
.Carrier_Adress_Street = usrCntl_Carrier.txtStrasse.Text
.Carrier_EORI = usrCntl_Carrier.txtEORI.Text
.Guarantee_GRN = "" 'leer
Select Case SENDUNG.tblSnd_Abfertigungsart_ID
Case 5, 45 : .DAKOSY_Procedure = "T1"
Case 6 : .DAKOSY_Procedure = "T2"
Case 8 : .DAKOSY_Procedure = "TIR"
Case Else : .DAKOSY_Procedure = "T2"
End Select
For Each doc As DataGridViewRow In dgvAnhaenge.Rows
Dim isSelected = IIf(DBNull.Value Is doc.Cells("anh_selekt").Value, False, doc.Cells("anh_selekt").Value)
If isSelected Then
.selectedDocuments &= doc.Cells("anh_docId").Value & ", "
End If
Next
.SAVE()
End With
If sbDurchgangszollstelle1._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle1._value)
If sbDurchgangszollstelle2._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle2._value)
If sbDurchgangszollstelle3._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle3._value)
If sbDurchgangszollstelle4._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle4._value)
If sbDurchgangszollstelle5._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle5._value)
If sbDurchgangszollstelle6._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle6._value)
If sbDurchgangszollstelle7._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle7._value)
If sbDurchgangszollstelle8._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle8._value)
If sbDurchgangszollstelle9._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle9._value)
If sbRoute1._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute1._value)
If sbRoute2._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute2._value)
If sbRoute3._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute3._value)
If sbRoute4._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute4._value)
If sbRoute5._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute5._value)
If sbRoute6._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute6._value)
If sbRoute7._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute7._value)
If sbRoute8._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute8._value)
If sbRoute9._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute9._value)
sendAtezData(atezData, atez)
End If
Me.Cursor = Cursors.Default
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
Me.Cursor = Cursors.Default
End Try
@@ -193,21 +153,28 @@ Public Class frmATEZ_NCTS
End If
If Not atez.setJson(atezData, dgvAnhaenge) Then MsgBox("Fehler beim Erstellen der Daten" & vbNewLine & "Vorgang abgebrochen!")
If Not atez.setJson(atezData) Then MsgBox("Fehler beim Erstellen der Daten" & vbNewLine & "Vorgang abgebrochen!")
If Not atez.setJsonPDF(atezData, dgvAnhaenge) Then MsgBox("Fehler beim Erstellen der PDF-Daten, kein Anhang ausgewählt!" & vbNewLine & "Vorgang abgebrochen!")
Dim azetId = atez.SendRequestWithAuthHeader("application/json", failreDesc)
If failreDesc <> "" Then
If atezData.status = "Draft" Then
MsgBox("Fehler beim Senden")
MsgBox("Fehler beim Senden" & vbNewLine & failreDesc)
atezData.fehlerbeschreibung = failreDesc
atezData.SAVE()
Exit Sub
End If
Dim result As MsgBoxResult = MsgBox("Fehler beim Senden" & vbNewLine & "Soll NCTS wird als Entwurf gespeichert werden?", vbYesNoCancel)
Dim result As MsgBoxResult = MsgBox("Fehler beim Senden" & vbNewLine & failreDesc & vbNewLine & "Soll NCTS als Entwurf gespeichert werden?", vbYesNoCancel)
If result = vbYes Then
atezData.status = "Draft"
atezData.fehlerbeschreibung = failreDesc
atezData.SAVE()
End If
lblInfo.Text = "Fehler in der API"
lblInfo.Text = "Fehler in der API "
Else
atezData.status = "Sent"
@@ -261,13 +228,6 @@ Public Class frmATEZ_NCTS
Private Sub frmATEZNCTS_Load(sender As Object, e As EventArgs) Handles MyBase.Load
If FilialenNr = "" Then
MsgBox("Keine Filiale ausgewählt!")
Me.Close()
End If
FIRMA_DY = SDL.frmZollanmeldung.getFirma_DY(FilialenNr, Nothing)
Select Case FIRMA_DY
Case "VERAG" : txtDyMandant.Text = "VERG"
txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
@@ -277,14 +237,13 @@ Public Class frmATEZ_NCTS
Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO"
End Select
initSeachboxes()
initAttachment()
If openExisting Then
If id > 0 Then
Dim atez_data = New cATEZ_NCTS_DATA(id)
atez_data = New cATEZ_NCTS_DATA(id)
If atez_data.atezId <> "" Then
lblInfo.Text = "Atez-ID " & atez_data.atezId
@@ -316,39 +275,8 @@ Public Class frmATEZ_NCTS
usrCntl_Carrier.txtEORI.Text = atez_data.Carrier_EORI
Dim TCO_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_TransitCustomsOffice)
VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_TransitCustomsOffice.LOAD_LIST_ByNCTS(TCO_LIST, id)
Dim i As Integer = 0
For Each tco In TCO_LIST
If i = 0 Then sbDurchgangszollstelle1.SET_VALUE(If(tco.TransitCustomsOffice, ""))
If i = 1 Then sbDurchgangszollstelle2.SET_VALUE(If(tco.TransitCustomsOffice, ""))
If i = 2 Then sbDurchgangszollstelle3.SET_VALUE(If(tco.TransitCustomsOffice, ""))
If i = 3 Then sbDurchgangszollstelle4.SET_VALUE(If(tco.TransitCustomsOffice, ""))
If i = 4 Then sbDurchgangszollstelle5.SET_VALUE(If(tco.TransitCustomsOffice, ""))
If i = 5 Then sbDurchgangszollstelle6.SET_VALUE(If(tco.TransitCustomsOffice, ""))
If i = 6 Then sbDurchgangszollstelle7.SET_VALUE(If(tco.TransitCustomsOffice, ""))
If i = 7 Then sbDurchgangszollstelle8.SET_VALUE(If(tco.TransitCustomsOffice, ""))
If i = 8 Then sbDurchgangszollstelle9.SET_VALUE(If(tco.TransitCustomsOffice, ""))
i = i + 1
Next
Dim Route_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_Routen)
VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_Routen.LOAD_LIST_ByNCTS(Route_LIST, id)
i = 0
For Each route In Route_LIST
If i = 0 Then sbRoute1.SET_VALUE(route.Route_Country)
If i = 1 Then sbRoute2.SET_VALUE(route.Route_Country)
If i = 2 Then sbRoute3.SET_VALUE(route.Route_Country)
If i = 3 Then sbRoute4.SET_VALUE(route.Route_Country)
If i = 4 Then sbRoute5.SET_VALUE(route.Route_Country)
If i = 5 Then sbRoute6.SET_VALUE(route.Route_Country)
If i = 6 Then sbRoute7.SET_VALUE(route.Route_Country)
If i = 7 Then sbRoute8.SET_VALUE(route.Route_Country)
If i = 8 Then sbRoute9.SET_VALUE(route.Route_Country)
i = i + 1
Next
setDurchgangszolstellen()
setRoute()
If atez_data.status = "Draft" Then
Button1.Text = "An ATEZ senden -->"
@@ -368,7 +296,7 @@ Public Class frmATEZ_NCTS
End If
Else
atez_data = New cATEZ_NCTS_DATA()
Button1.Text = "An ATEZ senden -->"
pnlHead.Enabled = True
@@ -413,7 +341,7 @@ Public Class frmATEZ_NCTS
Sub initAttachment()
Dim hSQL As String = " SELECT [anh_id],anh_Datum,[anh_Name],[anh_docId],
CASE WHEN [anh_Art] = 'ATR-EUR1' then 'EUR'
CASE WHEN [anh_Art] = 'ATR-EUR1' then 'EUR'
when [anh_Art] = 'Rechnung' then 'INVOICE'
when [anh_Art] = 'eFatura' then 'INVOICE'
when [anh_Art] = 'CMR' then 'CMR'
@@ -431,7 +359,7 @@ CASE WHEN [anh_Art] = 'ATR-EUR1' then 'EUR'
when [anh_Art] = 'Sonstiges' then 'OTHER'
when [anh_Art] ='' then 'OTHER' End
[anh_Art],[anh_Typ] FROM [tblAvisoAnhaenge]
WHERE [anh_AvisoId]='" & AVISO.AvisoID & "' And anh_Typ = 'PDF'
WHERE [anh_AvisoId]='" & AVISO.AvisoID & "' AND isnull(anh_SendungsId,0) <=0 And anh_Typ = 'PDF'
Order BY [anh_Reihenfolge], anh_Datum desc, [anh_id]"
Dim dt = VermerkeDAL.Anzeigen_Vermerke(hSQL)
@@ -539,4 +467,104 @@ CASE WHEN [anh_Art] = 'ATR-EUR1' then 'EUR'
End Sub
Public Function checkAttachment() As Boolean
Dim selectedDocuments As Boolean = False
For Each Row In dgvAnhaenge.Rows
selectedDocuments = IIf(DBNull.Value Is Row.Cells("anh_selekt").Value, False, Row.Cells("anh_selekt").Value)
If selectedDocuments Then Exit For
Next
If Not selectedDocuments Then
lblInfo.Text = "kein Anhang selektiert"
Cursor = Cursors.Default
Return selectedDocuments
End If
Return selectedDocuments
End Function
Public Function checkMandatoryField() As Boolean
'TODO
Return True
End Function
Public Sub setDurchgangszolstellen()
Dim TCO_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_TransitCustomsOffice)
VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_TransitCustomsOffice.LOAD_LIST_ByNCTS(TCO_LIST, id)
Dim i As Integer = 0
For Each tco In TCO_LIST
If i = 0 Then sbDurchgangszollstelle1.SET_VALUE(If(tco.TransitCustomsOffice, ""))
If i = 1 Then sbDurchgangszollstelle2.SET_VALUE(If(tco.TransitCustomsOffice, ""))
If i = 2 Then sbDurchgangszollstelle3.SET_VALUE(If(tco.TransitCustomsOffice, ""))
If i = 3 Then sbDurchgangszollstelle4.SET_VALUE(If(tco.TransitCustomsOffice, ""))
If i = 4 Then sbDurchgangszollstelle5.SET_VALUE(If(tco.TransitCustomsOffice, ""))
If i = 5 Then sbDurchgangszollstelle6.SET_VALUE(If(tco.TransitCustomsOffice, ""))
If i = 6 Then sbDurchgangszollstelle7.SET_VALUE(If(tco.TransitCustomsOffice, ""))
If i = 7 Then sbDurchgangszollstelle8.SET_VALUE(If(tco.TransitCustomsOffice, ""))
If i = 8 Then sbDurchgangszollstelle9.SET_VALUE(If(tco.TransitCustomsOffice, ""))
i = i + 1
Next
End Sub
Public Sub setRoute()
Dim Route_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_Routen)
VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_Routen.LOAD_LIST_ByNCTS(Route_LIST, id)
Dim i = 0
For Each route In Route_LIST
If i = 0 Then sbRoute1.SET_VALUE(route.Route_Country)
If i = 1 Then sbRoute2.SET_VALUE(route.Route_Country)
If i = 2 Then sbRoute3.SET_VALUE(route.Route_Country)
If i = 3 Then sbRoute4.SET_VALUE(route.Route_Country)
If i = 4 Then sbRoute5.SET_VALUE(route.Route_Country)
If i = 5 Then sbRoute6.SET_VALUE(route.Route_Country)
If i = 6 Then sbRoute7.SET_VALUE(route.Route_Country)
If i = 7 Then sbRoute8.SET_VALUE(route.Route_Country)
If i = 8 Then sbRoute9.SET_VALUE(route.Route_Country)
i = i + 1
Next
End Sub
Public Sub saveDurchgangszollstelle(atezData As cATEZ_NCTS_DATA)
If sbDurchgangszollstelle1._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle1._value)
If sbDurchgangszollstelle2._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle2._value)
If sbDurchgangszollstelle3._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle3._value)
If sbDurchgangszollstelle4._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle4._value)
If sbDurchgangszollstelle5._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle5._value)
If sbDurchgangszollstelle6._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle6._value)
If sbDurchgangszollstelle7._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle7._value)
If sbDurchgangszollstelle8._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle8._value)
If sbDurchgangszollstelle9._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle9._value)
End Sub
Public Sub saveRoute(atezData As cATEZ_NCTS_DATA)
If sbRoute1._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute1._value)
If sbRoute2._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute2._value)
If sbRoute3._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute3._value)
If sbRoute4._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute4._value)
If sbRoute5._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute5._value)
If sbRoute6._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute6._value)
If sbRoute7._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute7._value)
If sbRoute8._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute8._value)
If sbRoute9._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute9._value)
End Sub
End Class

View File

@@ -1653,6 +1653,7 @@ Public Class usrcntlAktDetailsATILLANeu
Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(AVISO, SND, Now.ToString("yy"), dgvATEZNCTS)
frmAttilaATEZNCTS.Show(Me)
Me.Refresh()
End If
@@ -1676,7 +1677,7 @@ Public Class usrcntlAktDetailsATILLANeu
Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(dgvATEZNCTS.SelectedRows(0).Cells("Id").Value, AVISO, SND, Now.ToString("yy"))
frmAttilaATEZNCTS.Show(Me)
Me.Refresh()
End If