From 61a7b3d011e2b48e507130f226c931ebd420ffb6 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Mon, 2 Mar 2026 08:25:48 +0100 Subject: [PATCH] stammref, template --- .../DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb | 16 ++++++++-------- .../frmDakosyStammreferenzVerwalten.vb | 6 +++++- SDL/zoll/frmZollBrgBuchungenFremd.vb | 2 +- .../Schnittstellen/ATEZ/RELAYHUB/cRelayHub.vb | 1 + 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb index 60089d8c..b811efd2 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb @@ -770,16 +770,16 @@ Public Class usrCntlATLAS_EZA End Sub Private Sub DateiimportToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateiimportToolStripMenuItem.Click - '----- Kann ansonten keine Version freigeben!!! - 'Dim f As New cATLAS_EZA_IMPORT(AVISO, SENDUNG, EZA) - 'f.ShowDialog(Me.FindForm) - 'EZA = f.EZA - 'Me.FindForm.SuspendLayout() - 'POSITIONEN.setValues(EZA, True) - 'btnPositionen.PerformClick() - 'Me.FindForm.ResumeLayout() + Dim f As New cATLAS_EZA_IMPORT(AVISO, SENDUNG, EZA) + f.ShowDialog(Me.FindForm) + EZA = f.EZA + + Me.FindForm.SuspendLayout() + POSITIONEN.setValues(EZA, True) + btnPositionen.PerformClick() + Me.FindForm.ResumeLayout() End Sub diff --git a/SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenzVerwalten.vb b/SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenzVerwalten.vb index 773ca672..a5d8020a 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenzVerwalten.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenzVerwalten.vb @@ -252,12 +252,16 @@ cboNL.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GLO", "GLO")) cboNL.changeItem("IME") + + Case "ATIL" cboNL.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SUW", "SUW")) cboNL.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBWO", "AMBWO")) cboNL.changeItem("SUW") Case "UNAT" - cboNL.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATSP", "ATSP")) + cboNL.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATSPED", "ATSPED")) + cboNL.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DESPED", "DESPED")) + cboNL.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ZOLL", "ZOLL")) cboNL.changeItem("ATSP") End Select diff --git a/SDL/zoll/frmZollBrgBuchungenFremd.vb b/SDL/zoll/frmZollBrgBuchungenFremd.vb index 1221fa37..0c13ecc5 100644 --- a/SDL/zoll/frmZollBrgBuchungenFremd.vb +++ b/SDL/zoll/frmZollBrgBuchungenFremd.vb @@ -119,7 +119,7 @@ Public Class frmZollBrgBuchungenFremd END AS Firma FROM [VERAG].[dbo].[tblDakosy_NCTSOut004] INNER JOIN tblDakosy_Zollanmeldungen ON ncts_dyaAnmID = dy_Id - LEFT JOIN [SQLGUIDE01].[AVISO].[dbo].[Aviso] ON dy_AvisoId = Avisoid + LEFT JOIN [AVISO].[dbo].[Aviso] ON dy_AvisoId = Avisoid WHERE ncts_MRN IN (" & String.Join(",", nctsParam) & ");" Using cmd As New SqlCommand(nctsSql, conn) diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHub.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHub.vb index 4451a20b..af0f0f83 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHub.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHub.vb @@ -255,6 +255,7 @@ Public Class cRelayHub Case "Ursprungszeugnis", "CoO" : fileType = "origin" Case "Lieferschein" : fileType = "delivery_note" Case "Packliste" : fileType = "packaging_list" + Case "FFFFFFFFFFFFFFFFFF" : fileType = "ftz" Case Else : fileType = "other" End Select