From e161fcdd15e5e4bddd3827595e611c67e595011a Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 7 Nov 2025 09:58:38 +0100 Subject: [PATCH] UID-Pruefung, BH, etc. --- UID/usrctlProcedures.vb | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/UID/usrctlProcedures.vb b/UID/usrctlProcedures.vb index c9e5a3a..b9ceba3 100644 --- a/UID/usrctlProcedures.vb +++ b/UID/usrctlProcedures.vb @@ -3597,7 +3597,10 @@ Public Class usrctlProcedures DYIMPORT.Ursprung = isleernothing((currentRow(89))) - If DYIMPORT.Ursprung IsNot Nothing AndAlso DYIMPORT.Ursprung <> "" Then DYIMPORT.Ursprungsland_ISO2 = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2LandFromLandbezeichnung(DYIMPORT.Ursprung) + If DYIMPORT.Ursprung IsNot Nothing AndAlso DYIMPORT.Ursprung <> "" Then + Dim ISO2 As String = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2LandFromLandbezeichnung(DYIMPORT.Ursprung) + If ISO2 <> "" Then DYIMPORT.Ursprungsland_ISO2 = ISO2 + End If DYIMPORT.Präferenzursprungsland = isleernothing((currentRow(90))) DYIMPORT.Beguenstigung = isleernothing((currentRow(91))) @@ -3715,25 +3718,8 @@ Public Class usrctlProcedures If savedDY Then 'zuerst alle doppelten löschen und die fehlerhaften zuerst - Dim sql_deleleMultEntries As String = " - WITH Doppelte AS ( - SELECT - *, - ROW_NUMBER() OVER ( - PARTITION BY Registriernummer_MRN, PositionNo, Positionsunterlagenzeile - ORDER BY (SELECT NULL) - ) AS rn - FROM [tbl_DY_Zollmeldungen_Import] - - ) - - DELETE FROM Doppelte - WHERE rn > 1 and importfile is null;" - - sql.doSQL(sql_deleleMultEntries, "AVISO") - + sql.doSQL("EXECUTE dbo.sp_DeleteDuplicateZollmeldungen_ohne_Importfile", "AVISO") 'dann generell alle doppelten löschen - sql.doSQL("EXECUTE dbo.sp_DeleteDuplicateZollmeldungen", "AVISO") End If