diff --git a/Aviso/ATEZ/frmATEZ_EZA.vb b/Aviso/ATEZ/frmATEZ_EZA.vb
index d40bbb7..52696ad 100644
--- a/Aviso/ATEZ/frmATEZ_EZA.vb
+++ b/Aviso/ATEZ/frmATEZ_EZA.vb
@@ -110,8 +110,8 @@ Public Class frmATEZ_EZA
lblInfo.Text = ""
- txtDyMandant.Text = "VERA" 'TEST!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- ' txtDyMandant.Text = "VERG" 'TEST!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ 'txtDyMandant.Text = "VERA" 'TEST!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ txtDyMandant.Text = "VERG"
' atez.setJsonPDF(atez_data, dgvAnhaenge)
@@ -139,8 +139,11 @@ Public Class frmATEZ_EZA
Dim ATEZ_RH_EZA As New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubJobOrderRequest With {
.referenceNo = ioReference,
- .regimeType = "IM",' .customer = "AVISO",
- .additionalData = New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubAdditionalData With {
+ .outputApplication = "dakosy/sftp/verg",'.outputApplication = "dakosy/sftp/vera",
+ .regimeType = "IMPORT",' .customer = "AVISO",
+ .dispatchCountry = "DE",
+ .destinationCountry = "TR", 'Default, wird später überschrieben!! (Pflichtfeld)
+ .additionalData = New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubAdditionalData With {
.transaction = New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubTransaction With {
.ioPartner = txtDyMandant.Text,
.ioDivision3 = txtDyNiederlassung.Text,
@@ -160,8 +163,8 @@ Public Class frmATEZ_EZA
.contactPersonPosition = "Zolldeklarant/in"
},
.declarantIsConsignee = True,
- .representationRelationshipCode = "",
- .inputTaxDeduction = "",'"true",
+ .representationRelationshipCode = -1, '??????????????????????????????????????????????????????????????
+ .inputTaxDeduction = True,'"",'"true",
.procedureCodeRequested = procedureCodeRequested.ToString,' .goodsStatus = "",'"EU",
.transportMeansArrivalIdentity = txtLKWId.Text,
.transportMeansNationalityCode = If(AVISO.LKW_Nationalitaet, "")
@@ -254,7 +257,7 @@ Public Class frmATEZ_EZA
Dim CN As New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubAddress
CN.addressType = "CN"
CN.participantEORI = If(KD.EORITIN, "")
- CN.participantSubsidiaryNumber = If(KD.EORITIN_NL, "")
+ CN.participantSubsidiaryNumber = If(KD.EORITIN_NL, "0")
CN.companyName = AD.Name_1
CN.streetAndNumber = AD.Straße
CN.postalCode = AD.PLZ
@@ -279,7 +282,7 @@ Public Class frmATEZ_EZA
Dim CZ As New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubAddress
CZ.addressType = "CZ"
CZ.participantEORI = If(KD.EORITIN, "")
- CZ.participantSubsidiaryNumber = If(KD.EORITIN_NL, "")
+ CZ.participantSubsidiaryNumber = If(KD.EORITIN_NL, "0")
CZ.companyName = AD.Name_1
CZ.streetAndNumber = AD.Straße
CZ.postalCode = AD.PLZ
@@ -465,7 +468,7 @@ Public Class frmATEZ_EZA
If openExisting Then
If id > 0 Then
- atez_data = New cATEZ_NCTS_DATA(id)
+ ' atez_data = New cATEZ_NCTS_DATA(id)
initAttachment()
If atez_data.atezId <> "" Then
lblInfo.Text = "Atez-ID " & atez_data.atezId
@@ -509,7 +512,7 @@ Public Class frmATEZ_EZA
End If
Else
- atez_data = New cATEZ_NCTS_DATA()
+ ' atez_data = New cATEZ_NCTS_DATA()
initAttachment()
'Button1.Text = "An ATEZ senden -->"
pnlHead.Enabled = True
diff --git a/Aviso/App.config b/Aviso/App.config
index 5a90c87..68d6328 100644
--- a/Aviso/App.config
+++ b/Aviso/App.config
@@ -69,19 +69,19 @@
-
+
-
+
-
+
-
+
diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj
index 20b78b8..70276e7 100644
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -1,5 +1,6 @@
+
@@ -171,6 +172,9 @@
..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll
+
+ ..\packages\Confluent.Kafka.2.11.1\lib\net462\Confluent.Kafka.dll
+
..\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll
@@ -440,8 +444,8 @@
F:\PROGRAMMIERUNG\dll\Spire.PDF\Spire.PdfViewer.Forms.dll
-
- ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll
+
+ ..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll
@@ -465,8 +469,8 @@
..\packages\System.IO.Packaging.4.0.0\lib\net46\System.IO.Packaging.dll
-
- ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll
+
+ ..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll
..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll
@@ -474,16 +478,16 @@
True
-
- ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
+
+ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll
..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll
True
True
-
- ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
+
+ ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll
@@ -2062,6 +2066,7 @@
+
diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb
index c4eeb98..4c9e9f3 100644
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -1536,7 +1536,7 @@ Public Class frmSendungsdetailsNEU
Case 5, 6, 18, 32, 24, 33, 34, 37, 40, 42
If (SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId IsNot Nothing) Then
usrcntl_NCTS.NCTS_GA = New cNCTSGestellungsadressen(SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId)
- usrcntl_NCTS.setValues()
+ usrcntl_NCTS.setValues(False)
End If
'trotzdem überschreiben:
usrcntl_NCTS.txtT1Verzollungsadresse.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_NCTSVerzollungsadresse, "")
diff --git a/Aviso/packages.config b/Aviso/packages.config
index e5338f9..2d8da5f 100644
--- a/Aviso/packages.config
+++ b/Aviso/packages.config
@@ -6,6 +6,7 @@
+
@@ -14,20 +15,21 @@
+
-
+
-
+
-
+
-
+
diff --git a/Aviso/usrCntlSND_NCTSGestellungsadresse.vb b/Aviso/usrCntlSND_NCTSGestellungsadresse.vb
index 15ca38e..d91e9ea 100644
--- a/Aviso/usrCntlSND_NCTSGestellungsadresse.vb
+++ b/Aviso/usrCntlSND_NCTSGestellungsadresse.vb
@@ -23,7 +23,7 @@
End Sub
- Public Sub setValues()
+ Public Sub setValues(customsOfficeSet)
txtT1Verzollungsadresse.Text = If(NCTS_GA.nga_name, "")
txtT1VerzollungsadresseStrasse.Text = If(NCTS_GA.nga_strasse, "")
txtT1VerzollungsadressePlz.Text = If(NCTS_GA.nga_plz, "")
@@ -34,8 +34,9 @@
txtT1VerzollungsadresseEORI.Text = If(NCTS_GA.nga_EORI, "")
txtT1VerzollungsadresseEORI_NL.Text = If(NCTS_GA.nga_EORI_NL, "")
txtT1VerzollungsadresseBestimmungszollstelle.SET_VALUE(If(NCTS_GA.nga_bestZollst, ""))
- txtT1VerzollungsadresseATANr.Text = If(NCTS_GA.nga_ATANr, "")
-
+ 'If Not customsOfficeSet Then
+ ' txtT1VerzollungsadresseATANr.Text = If(NCTS_GA.nga_ATANr, "")
+ ' End If
lblNGAId.Text = If(NCTS_GA.nga_id > 0, NCTS_GA.nga_id, "-")
picDel.Visible = (NCTS_GA.nga_id > 0)
@@ -53,7 +54,7 @@
NCTS_GA.nga_EORI = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseEORI.Text)
NCTS_GA.nga_EORI_NL = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseEORI_NL.Text)
NCTS_GA.nga_bestZollst = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseBestimmungszollstelle._value)
- NCTS_GA.nga_ATANr = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseATANr.Text)
+ ' NCTS_GA.nga_ATANr = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseATANr.Text)
End Sub
Private Sub LinkLabel4_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel4.LinkClicked
@@ -84,7 +85,7 @@
Private Sub usrCntlSND_NCTSGestellungsadresse_Load(sender As Object, e As EventArgs) Handles Me.Load
If NCTS_GA Is Nothing Then : NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen
- Else : setValues() : End If
+ Else : setValues(False) : End If
' txtT1VerzollungsadresseBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
@@ -97,7 +98,7 @@
Sub reset()
NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen
- setValues()
+ setValues(False)
End Sub
Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
@@ -116,7 +117,7 @@
Private Sub txtT1Verzollungsadresse_VALUE_CHANGED() Handles txtT1Verzollungsadresse.VALUE_CHANGED
If txtT1Verzollungsadresse._value <> "" Then
NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen(txtT1Verzollungsadresse._value)
- setValues()
+ setValues(True)
End If
End Sub
@@ -129,7 +130,7 @@
If vbYes = MsgBox("Möchten Sie die NCTS-Gestellungsadresse wirklich löschen?", vbYesNoCancel + MsgBoxStyle.DefaultButton2) Then
NCTS_GA.DELETE()
NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen
- setValues()
+ setValues(False)
End If
End Sub