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

merge

Browse Source
This commit is contained in:
Andreas Luxbauer
2025-11-26 09:04:04 +01:00
parent 99bb7d39de 3b1c9c383e
commit ee22f3c778
10 changed files with 1311 additions and 564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
UID/usrctlProcedures.vb
View File

@@ -3596,6 +3596,12 @@ Public Class usrctlProcedures
DYIMPORT.Ursprung = isleernothing((currentRow(89)))
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)))
@@ -3712,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
@@ -4109,7 +4098,7 @@ Public Class usrctlProcedures
Dim kdnr_tmp = ""
Try
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxMDM_Testsystem.Checked
Dim fd As New OpenFileDialog
If fd.ShowDialog = DialogResult.OK Then
@@ -4192,7 +4181,7 @@ Public Class usrctlProcedures
Try
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxMDM_Testsystem.Checked
Dim fd As New OpenFileDialog
If fd.ShowDialog = DialogResult.OK Then
@@ -4301,6 +4290,128 @@ OPTION (MAXRECURSION 1000);", "AVISO") '
cProgramFunctions.genExcelFromDT_NEW(dt)
Dim dt_fehlendeLaender As DataTable = SQL.loadDgvBySql("select distinct (Ursprung) FROM [AVISO].[dbo].[tbl_DY_Zollmeldungen_Import] where Ursprungsland_ISO2 is null and Ursprung is not null", "AVISO")
If dt_fehlendeLaender.Rows.Count > 0 Then
MsgBox("ACHTUNG!, es befinden sich noch " & dt_fehlendeLaender.Rows.Count & " Länder, zu denen kein Ursprungsland zugewiesen wurde!" & vbNewLine & "Bitte zuweisen/bei Administration nachfragen!")
cProgramFunctions.genExcelFromDT_NEW(dt_fehlendeLaender)
End If
End Sub
Private Sub Button53_Click(sender As Object, e As EventArgs) Handles Button53.Click
Dim Laneder = "select distinct (Ursprung) FROM [AVISO].[dbo].[tbl_DY_Zollmeldungen_Import] where Ursprungsland_ISO2 is null and Ursprung is not null"
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim dtiso2Laneder As DataTable = SQL.loadDgvBySql(Laneder, "AVISO")
If dtiso2Laneder.Rows.Count > 0 Then
For Each r As DataRow In dtiso2Laneder.Rows
Dim landISO2 As String = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2LandFromLandbezeichnung(r.Item("Ursprung"))
If landISO2 <> "" Then
SQL.doSQL("Update [AVISO].[dbo].[tbl_DY_Zollmeldungen_Import] set Ursprungsland_ISO2 = '" & landISO2 & "' where Ursprung = '" & r.Item("Ursprung") & "'", "AVISO")
Else
Dim ISO2SetCountry As String = ""
Select Case r.Item("Ursprung")
Case "El Salvador" : ISO2SetCountry = "SV"
Case "Europäische Union" : ISO2SetCountry = "EU"
Case "Guatemala" : ISO2SetCountry = "GT"
Case "Iran (Islamische Republik)" : ISO2SetCountry = "IR"
Case "Kambodscha" : ISO2SetCountry = "KH"
Case "Katar" : ISO2SetCountry = "QA"
Case "Macau" : ISO2SetCountry = "MO"
Case "Mali" : ISO2SetCountry = "ML"
Case "Moldau, Republik" : ISO2SetCountry = "MD"
Case "Myanmar" : ISO2SetCountry = "MM"
Case "Nordmazedonien" : ISO2SetCountry = "MK"
Case "Paraguay" : ISO2SetCountry = "PY"
Case "Russische Föderation" : ISO2SetCountry = "RU"
Case "Saudi-Arabien" : ISO2SetCountry = "SA"
Case "Sierra Leone" : ISO2SetCountry = "SL"
Case "Slowakische Republik" : ISO2SetCountry = "SK"
Case "Spanien (ohne XC, XL)" : ISO2SetCountry = "ES"
Case "Südkorea (Republik Korea)" : ISO2SetCountry = "KR"
Case "Tschechien" : ISO2SetCountry = "CZ"
Case "Vereinigte Arabische Emirate" : ISO2SetCountry = "AE"
Case "Vereinigte Staaten" : ISO2SetCountry = "US"
Case "Vereinigtes Königreich" : ISO2SetCountry = "GB"
Case "Bosnien und Herzegowina" : ISO2SetCountry = "BA"
End Select
If ISO2SetCountry <> "" Then
SQL.doSQL("Update [AVISO].[dbo].[tbl_DY_Zollmeldungen_Import] set Ursprungsland_ISO2 = '" & ISO2SetCountry & "' where Ursprung = '" & r.Item("Ursprung") & "'", "AVISO")
End If
End If
Next
MsgBox("alle Länder gesetzt!")
Else
MsgBox("keine fehlenden Länder vorhanden!")
End If
End Sub
Private Sub Button54_Click(sender As Object, e As EventArgs) Handles Button54.Click
Dim cnt = 0
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
Try
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxMDM_Testsystem.Checked
Dim fd As New OpenFileDialog
If fd.ShowDialog = DialogResult.OK Then
If fd.FileName.ToLower.EndsWith(".csv") Then
' fd.FileName.EndsWith(".csv")
Using MyReader As New Microsoft.VisualBasic.FileIO.TextFieldParser(fd.FileName, Encoding.Default)
MyReader.TextFieldType = FileIO.FieldType.Delimited
MyReader.SetDelimiters(";")
Dim currentRow As String()
While Not MyReader.EndOfData
Try
currentRow = MyReader.ReadFields()
If currentRow.Length > 1 AndAlso isleernothing(currentRow(0)) IsNot Nothing AndAlso IsNumeric(currentRow(0)) Then
Dim KUNDE_ERW As New cKundenErweitert(currentRow(0))
If isleernothing(currentRow(1)) IsNot Nothing AndAlso IsNumeric(currentRow(1)) Then
KUNDE_ERW.kde_zinssatz = CDbl(currentRow(1))
KUNDE_ERW.SAVE()
End If
End If
cnt += 1
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
End Try
End While
End Using
End If
End If
Catch ex As Exception
MessageBox.Show("Datei nicht vorhanden.")
Finally
End Try
End Sub