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
2024-12-03 13:06:49 +01:00
parent 51a98197ae ec7bd277e4
commit ef72c9b82d
3 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
initATLASAufschubkonten/cWorker_Verwahrung.vb
View File

@@ -101,10 +101,10 @@ Public Class cWorker_Verwahrung
Select Case BezugsNr.Substring(0, 4) Select Case BezugsNr.Substring(0, 4)
Case 4803, 4809 Case 4803, 4809
Standort = "VERAG AG" Standort = "VERAG AG"
Case 5601 'Case 5601
Standort = "UNISPED GmbH" ' Standort = "UNISPED GmbH"
Case 5701 'Case 5701
Standort = "AMBAR GmbH" ' Standort = "AMBAR GmbH"
Case 4810, 5103, 5901 Case 4810, 5103, 5901
Standort = "VERAG GmbH" Standort = "VERAG GmbH"
Case 5501 Case 5501

1
initATLASAufschubkonten/frmStartOptions.Designer.vb generated
View File

@@ -2247,6 +2247,7 @@ Partial Class frmStartOptions
' '
'TabPage4 'TabPage4
' '
Me.TabPage4.Controls.Add(Me.LinkLabel67)
Me.TabPage4.Controls.Add(Me.cbxUTATestkunden) Me.TabPage4.Controls.Add(Me.cbxUTATestkunden)
Me.TabPage4.Controls.Add(Me.cbxITalt) Me.TabPage4.Controls.Add(Me.cbxITalt)
Me.TabPage4.Controls.Add(Me.cbxPlose) Me.TabPage4.Controls.Add(Me.cbxPlose)

50
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -3884,18 +3884,18 @@ Public Class frmStartOptions
End If End If
SDL.Sachbearbeiter = "ASFINAG" SDL.Sachbearbeiter = "ASFINAG"
Dim Validto = SQL.checkNullStr(oRDR.GetValue("DatumVertragsabschluss")) Dim Validto = SQl.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
SDL.KartenNr = SQL.checkNullStr(oRDR.GetValue("CardNumber")) SDL.KartenNr = SQl.checkNullStr(oRDR.GetValue("CardNumber"))
If Validto <> "" Then If Validto <> "" Then
SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(oRDR.GetValue("CardNumber"), 1, 2), Mid(Validto, 3, 2), 1))) SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(oRDR.GetValue("CardNumber"), 1, 2), Mid(Validto, 3, 2), 1)))
End If End If
SDL.OBUID = SQL.checkNullStr(oRDR.GetValue("OBUID")) SDL.OBUID = SQl.checkNullStr(oRDR.GetValue("OBUID"))
SDL.Vertragsabschlussdatum = SQL.checkNullStr(oRDR.GetValue("DatumVertragsabschluss")) SDL.Vertragsabschlussdatum = SQl.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
SDL.Kategorie = SQL.checkNullStr(oRDR.GetValue("Kategorie")) SDL.Kategorie = SQl.checkNullStr(oRDR.GetValue("Kategorie"))
SDL.Schadstoffklasse = SQL.checkNullStr(oRDR.GetValue("Schadstoffklasse")) SDL.Schadstoffklasse = SQl.checkNullStr(oRDR.GetValue("Schadstoffklasse"))
SDL.Status = SQL.checkNullStr(oRDR.GetValue("Status")) SDL.Status = SQl.checkNullStr(oRDR.GetValue("Status"))
SDL.SAVE() SDL.SAVE()
End If End If
@@ -3941,21 +3941,21 @@ Public Class frmStartOptions
End If End If
SDL.Sachbearbeiter = "ASFINAG" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "_TEST", "") SDL.Sachbearbeiter = "ASFINAG" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "_TEST", "")
Dim Validto = SQL.checkNullStr(row.Item("contractDate")) Dim Validto = SQl.checkNullStr(row.Item("contractDate"))
SDL.KartenNr = SQL.checkNullStr(row.Item("cardNumber")) SDL.KartenNr = SQl.checkNullStr(row.Item("cardNumber"))
If Validto <> "" Then If Validto <> "" Then
'MsgBox(Mid(row.Item("ValidTo"), 1, 2) & " " & Mid(row.Item("ValidTo"), 3, 2)) 'MsgBox(Mid(row.Item("ValidTo"), 1, 2) & " " & Mid(row.Item("ValidTo"), 3, 2))
SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(row.Item("ValidTo"), 1, 2), Mid(row.Item("ValidTo"), 3, 2), 1))) 'noch im DETAIL checken! SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(row.Item("ValidTo"), 1, 2), Mid(row.Item("ValidTo"), 3, 2), 1))) 'noch im DETAIL checken!
End If End If
SDL.OBUID = SQL.checkNullStr(row.Item("OBUID")) SDL.OBUID = SQl.checkNullStr(row.Item("OBUID"))
SDL.Vertragsabschlussdatum = SQL.checkNullStr(row.Item("contractDate")) SDL.Vertragsabschlussdatum = SQl.checkNullStr(row.Item("contractDate"))
SDL.Kategorie = SQL.checkNullStr(row.Item("vehicleCategory")) SDL.Kategorie = SQl.checkNullStr(row.Item("vehicleCategory"))
SDL.Schadstoffklasse = SQL.checkNullStr(row.Item("emissionCategory")) SDL.Schadstoffklasse = SQl.checkNullStr(row.Item("emissionCategory"))
SDL.Status = SQL.checkNullStr(row.Item("status")) SDL.Status = SQl.checkNullStr(row.Item("status"))
SDL.Nationalitaet = SQL.checkNullStr(row.Item("nationality")) SDL.Nationalitaet = SQl.checkNullStr(row.Item("nationality"))
SDL.CO2Kategorie = SQL.checkNullStr(row.Item("CO2EmissionsClass")) SDL.CO2Kategorie = SQl.checkNullStr(row.Item("CO2EmissionsClass"))
SDL.SAVE() SDL.SAVE()
End If End If
@@ -5339,15 +5339,27 @@ Public Class frmStartOptions
showPic(ok, PictureBox25) showPic(ok, PictureBox25)
End Sub End Sub
Private Sub LinkLabel64_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel64.LinkClicked Private Sub LinkLabel64_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel64.LinkClicked, LinkLabel67.LinkClicked
Dim iso2Laneder = ""
Select Case sender.Name
Case "LinkLabel64" : iso2Laneder = "select distinct (Lieferland) FROM [VERAG].[dbo].[tblUTAImportNew] where Lieferland_ISO2 is null"
Case "LinkLabel67" : iso2Laneder = "select distinct (LandNr) FROM [VERAG].[dbo].[tbl_IDS_Länder] where Lieferland_ISO2 is null"
End Select
Dim iso2Laneder = "select distinct (Lieferland) FROM [VERAG].[dbo].[tblUTAImportNew] where Lieferland_ISO2 is null"
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim dtiso2Laneder As DataTable = SQL.loadDgvBySql(iso2Laneder, "FMZOLL") Dim dtiso2Laneder As DataTable = SQL.loadDgvBySql(iso2Laneder, "FMZOLL")
If dtiso2Laneder.Rows.Count > 0 Then If dtiso2Laneder.Rows.Count > 0 Then
For Each r As DataRow In dtiso2Laneder.Rows For Each r As DataRow In dtiso2Laneder.Rows
SQL.doSQL("Update [VERAG].[dbo].[tblUTAImportNew] set Lieferland_ISO2 = '" & VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2LandFromISO3Land(r.Item("Lieferland")) & "' where Lieferland = '" & r.Item("Lieferland") & "'", "FMZOLL") Select Case sender.Name
Case "LinkLabel64" : SQL.doSQL("Update [VERAG].[dbo].[tblUTAImportNew] set Lieferland_ISO2 = '" & VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2LandFromISO3Land(r.Item("Lieferland")) & "' where Lieferland = '" & r.Item("Lieferland") & "'", "FMZOLL")
Case "LinkLabel67" : SQL.doSQL("Update [VERAG].[dbo].[tbl_IDS_Länder] set Lieferland_ISO2 = '" & VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2LandFromLandNr(r.Item("LandNr")) & "' where LandNr = '" & r.Item("LandNr") & "'", "FMZOLL")
End Select
Next Next
MsgBox("alle Länder gesetzt!") MsgBox("alle Länder gesetzt!")
Else Else