edv/AVISO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: edv:4edac8857eeab57c2d75d5caeddd81a28806b23e
Branches Tags
edv:master edv:essensbestellungen edv:change_VM_logic edv:SDL
...
compare: edv:d2062e9e22426b37a77fc1625bf9bb993da0a2a0
Branches Tags
edv:master edv:essensbestellungen edv:change_VM_logic edv:SDL

2 Commits
4edac8857e ... d2062e9e22

Author SHA1 Message Date
Andreas Luxbauer
d2062e9e22 Merge branch 'master' of https://git.it.verag.ag/edv/AVISO 2025-11-05 08:41:32 +01:00
Andreas Luxbauer
cc4c8ab4cb ATEZ EZA 2025-11-05 08:41:28 +01:00
3 changed files with 91 additions and 27 deletions
Expand all files Collapse all files

13
Aviso/ATEZ/frmATEZ_EZA.Designer.vb generated
View File

@@ -42,6 +42,7 @@ Partial Class frmATEZ_EZA
Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.lblAnh = New System.Windows.Forms.Label()
Me.Button1 = New System.Windows.Forms.Button()
Me.pnlHead.SuspendLayout()
CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
@@ -278,12 +279,23 @@ Partial Class frmATEZ_EZA
Me.lblAnh.TabIndex = 151
Me.lblAnh.Visible = False
'
'Button1
'
Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button1.Location = New System.Drawing.Point(3, 383)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(178, 23)
Me.Button1.TabIndex = 153
Me.Button1.Text = "Clear Token Cache"
Me.Button1.UseVisualStyleBackColor = True
'
'frmATEZ_EZA
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
Me.ClientSize = New System.Drawing.Size(589, 409)
Me.Controls.Add(Me.Button1)
Me.Controls.Add(Me.Button3)
Me.Controls.Add(Me.lblAnh)
Me.Controls.Add(Me.pnlHead)
@@ -318,4 +330,5 @@ Partial Class frmATEZ_EZA
Friend WithEvents lblBezugsnummer As Label
Friend WithEvents lblAnh As Label
Friend WithEvents Button3 As Button
Friend WithEvents Button1 As Button
End Class

48
Aviso/ATEZ/frmATEZ_EZA.vb
View File

@@ -141,8 +141,8 @@ Public Class frmATEZ_EZA
.referenceNo = ioReference,
.outputApplication = "dakosy/sftp/verg",'.outputApplication = "dakosy/sftp/vera",
.regimeType = "IMPORT",' .customer = "AVISO",
.dispatchCountry = "DE",
.destinationCountry = "TR", 'Default, wird später überschrieben!! (Pflichtfeld)
.dispatchCountry = "TR",
.destinationCountry = "DE", '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,
@@ -152,7 +152,7 @@ Public Class frmATEZ_EZA
.declaration = New List(Of VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubDeclaration) From {
New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubDeclaration With {
.objectIdentification = New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubObjectIdentification With {
.objectName = lblBezugsnummer.Text & "_TEST",
.objectName = lblBezugsnummer.Text,'& "_TEST"
.objectAlias = ioReference,
.declarationType = "EZA-D"
},
@@ -163,7 +163,7 @@ Public Class frmATEZ_EZA
.contactPersonPosition = "Zolldeklarant/in"
},
.declarantIsConsignee = True,
.representationRelationshipCode = -1, '??????????????????????????????????????????????????????????????
.representationRelationshipCode = "",'-1, '??????????????????????????????????????????????????????????????
.inputTaxDeduction = True,'"",'"true",
.procedureCodeRequested = procedureCodeRequested.ToString,' .goodsStatus = "",'"EU",
.transportMeansArrivalIdentity = txtLKWId.Text,
@@ -219,9 +219,18 @@ Public Class frmATEZ_EZA
Case "Rechnung", "Konsi-Rechnung", "eFatura", "INVOICE" : DOC.fileType = "invoice"
Case "CMR" : DOC.fileType = "cmr"
Case "Ausfuhr", "EXPORT" : DOC.fileType = "tr_export_declaration"
Case "ATR" : DOC.fileType = "atr"
Case "ATR", "A.TR", "ATR-EUR1" : DOC.fileType = "atr"
Case "Vorpapier", "T1" : DOC.fileType = "transit_declaration"
Case Else : DOC.fileType = "invoice"
Case Else : DOC.fileType = "other"
''invoice',
'atr',
'cmr',
'transit_declaration',
'tr_export_declaration',
' Case Else : DOC.fileType = "additional_data" --> DARF NCIHT -_> additional_data ist das verwednete Datenformat
End Select
End If
@@ -257,7 +266,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, "0")
CN.participantSubsidiaryNumber = If(KD.EORITIN_NL, "")
CN.companyName = AD.Name_1
CN.streetAndNumber = AD.Straße
CN.postalCode = AD.PLZ
@@ -282,7 +291,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, "0")
CZ.participantSubsidiaryNumber = If(KD.EORITIN_NL, "")
CZ.companyName = AD.Name_1
CZ.streetAndNumber = AD.Straße
CZ.postalCode = AD.PLZ
@@ -546,24 +555,6 @@ Public Class frmATEZ_EZA
Dim hSQL As String = " SELECT [anh_id],anh_Datum,[anh_Name],[anh_docId],
case WHEN [anh_size] > 0 Then ROUND([anh_size] / 1000000,2) End as anh_size,
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'
when [anh_Art] = 'Ausfuhr' then 'OTHER'
when [anh_Art] = 'Vorpapier' then 'OTHER'
when [anh_Art] = 'Packliste' then 'PACK'
when [anh_Art] = 'Auftrag' then 'OTHER'
when [anh_Art] = 'Auftrag' then 'OTHER'
when [anh_Art] = 'Dispoliste' then 'OTHER'
when [anh_Art] = 'Vorkasse' then 'OTHER'
when [anh_Art] = 'Überweisungsbeleg' then 'OTHER'
when [anh_Art] = 'Vollmacht' then 'OTHER'
when [anh_Art] = 'ATB' then 'OTHER'
when [anh_Art] = 'ATA' then 'CarnetATA'
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_SendungsId is null OR anh_SendungsId <=0 OR anh_SendungsId='" & SENDUNG.tblSnd_SendungID & "') And anh_Typ = 'PDF'
ORDER BY anh_SendungsId desc,
@@ -606,6 +597,7 @@ Public Class frmATEZ_EZA
.AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.AllCells
.Columns("anh_id").Visible = False 'VermerkID nicht anzeigenconMenuVermerke
.Columns("anh_docId").Visible = False 'AvisoID nicht anzeigen
' .Columns("anh_Art").Visible = False 'AvisoID nicht anzeigen
.Columns("anh_selekt").Width = 25
.Columns("anh_selekt").HeaderText = ""
@@ -775,4 +767,8 @@ Public Class frmATEZ_EZA
lblAnh.Text = "Anhang in MB: " & countAnh.ToString
End If
End Sub
Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click
cRelayHubToken.DeleteStore()
End Sub
End Class

55
Aviso/AvisoStatusFunctions.vb
View File

@@ -2017,6 +2017,59 @@ ELSE_ATILLA:
hText = hText.Replace("%LKW%", hLKW)
'-------------- SIGNATUR --------------
Dim signatur = ""
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "IMEX"
' signatur = "
' Freundliche Grüße / Saygılarımızla / Best Regards<br>
' <b style=""color:#003680;"">IMEX Customs Service GmbH</b><br>
'Abteilung: EU Zollabfertigung<br>
'Tel.: +43 7711 2777 DW 200<br>
'Mail: <a href=""mailto:eu@verag.ag"" style=""color:#003680; text-decoration:none;"">eu@verag.ag</a><br>
' "
Case "UNISPED"
' signatur = "
' Freundliche Grüße / Saygılarımızla / Best Regards<br>
' <b style=""color:#003680;"">UNISPED Speditions GmbH</b><br>
'Abteilung: EU Zollabfertigung<br>
'Tel.: +43 7711 2777 DW 200<br>
'Mail: <a href=""mailto:eu@verag.ag"" style=""color:#003680; text-decoration:none;"">eu@verag.ag</a><br>
' "
Case "ATILLA"
' signatur = "
' Freundliche Grüße / Saygılarımızla / Best Regards<br>
' <b style=""color:#003680;"">ATILLA Spedition GmbH</b><br>
'Abteilung: EU Zollabfertigung<br>
'Tel.: +43 7711 2777 DW 200<br>
'Mail: <a href=""mailto:eu@verag.ag"" style=""color:#003680; text-decoration:none;"">eu@verag.ag</a><br>
' "
Case "AMBAR"
' signatur = "
' Freundliche Grüße / Saygılarımızla / Best Regards<br>
' <b style=""color:#003680;"">AMBAR</b><br>
'Abteilung: EU Zollabfertigung<br>
'Tel.: +43 7711 2777 DW 200<br>
'Mail: <a href=""mailto:eu@verag.ag"" style=""color:#003680; text-decoration:none;"">eu@verag.ag</a><br>
' "
Case Else
signatur = "
Freundliche Grüße / Saygılarımızla / Best Regards<br>
<b style=""color:#003680;"">VERAG Spedition AG</b><br>
Abteilung: EU Zollabfertigung<br>
Tel.: +43 7711 2777 DW 200<br>
Mail: <a href=""mailto:eu@verag.ag"" style=""color:#003680; text-decoration:none;"">eu@verag.ag</a><br>
"
End Select
hText = hText.Replace("%Signatur%", signatur)
'--------------------------------------------------------
Select Case art
Case "5"
Dim linkAviso = "https://status.app.verag.ag/aviso-status/" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID)
@@ -2028,6 +2081,7 @@ ELSE_ATILLA:
'hier werden alle möglichen Platzhalter ersetzt
hText = hText.Replace("%Standort%", getGrenzstelleZollstelle(hGrenzstelle, AVISO))
hText = hText.Replace("%Uhrzeit%", Format(Now, "dd.MM.yyyy HH:mm"))
hText = hText.Replace("&", "und")
@@ -2066,6 +2120,7 @@ ELSE_ATILLA:
hText = hText.Replace("%Firma_simple%", "VERAG")
hText = hText.Replace("%Firma%", "VERAG Spedition AG")
signatur = ""
End Select
hText = hText.Replace("%AbfertigungsNr%", abfertigungsNr)