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

Merge branch 'ADMIN' of https://verag.visualstudio.com/ADMIN/_git/ADMIN into ADMIN

Browse Source
This commit is contained in:
d.breimaier
2023-11-02 09:32:01 +01:00
parent 4e7805425d 9aa35f0b42
commit e54c9114fb
8 changed files with 1149 additions and 1036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -332,7 +332,32 @@ Public Class frmStartOptions
Case "ezoll_anhaenge"
Dim f As New frmInfo(PARAM)
f.Show()
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
importFileFromEZOLL(Now) 'VERAG
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED"
importFileFromEZOLL(Now)
closeMe()
Case "ezoll_anhaenge_verag"
Dim f As New frmInfo(PARAM)
f.Show()
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
importFileFromEZOLL(Now)
closeMe()
Case "ezoll_anhaenge_unisped"
Dim f As New frmInfo(PARAM)
f.Show()
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED"
importFileFromEZOLL(Now)
@@ -480,10 +505,13 @@ Public Class frmStartOptions
End Function
Function importFileFromEZOLL(datum As Date) As Boolean
Try
Dim db = "EZOLL"
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "UNISPED" : db = "EZOLL_UNISPED"
End Select
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
Dim dt As DataTable = sql.loadDgvBySql("SELECT [zzAktivitaet].LizenzNr,[zzAktivitaet].Operatorid,[zzAktivitaet].AnmID,MsgTyp,[zzAktivitaet].ErstelltAm,pfad,LRN,CRN ,[zzAktivitaet].VorgangID FROM [zzAktivitaet] INNER JOIN zsAnmRefs On zsAnmrefs.AnmID=zzAktivitaet.AnmID
where MsgTyp IN ('EZ922','EZ923','TR109', 'EX431') and ErstelltAm>='" & datum.ToShortDateString & " 00:00:00' and pfad is not null", "EZOLL", 200)
where MsgTyp IN ('EZ922','EZ923','TR109', 'EX431') and ErstelltAm>='" & datum.ToShortDateString & " 00:00:00' and pfad is not null", db, 200)
If dt IsNot Nothing Then
For Each row In dt.Rows
Dim cDHF_Anhaenge As New VERAG_PROG_ALLGEMEIN.cDHF_Anhaenge(row("AnmID"), row("MsgTyp"), row("LizenzNr"))
@@ -526,7 +554,12 @@ Public Class frmStartOptions
If Not IO.Directory.Exists(ZIEL_PFAD) Then IO.Directory.CreateDirectory(ZIEL_PFAD)
destFull = ""
copyFile(cDHF_Anhaenge.pfad.Replace("C:\", "\\Ezoll\c$\"), ZIEL_PFAD, destFull)
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "UNISPED" : copyFile(cDHF_Anhaenge.pfad.Replace("C:\", "\\SRV04.unisu.at\c$\"), ZIEL_PFAD, destFull)
Case Else : copyFile(cDHF_Anhaenge.pfad.Replace("C:\", "\\Ezoll\c$\"), ZIEL_PFAD, destFull)
End Select
If destFull <> "" Then
If DS.insertDataToDATENSERVER(destFull) Then
@@ -3887,4 +3920,11 @@ Public Class frmStartOptions
Catch ex As Exception : VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name) : End Try
Me.Cursor = Cursors.Default
End Sub
Private Sub LinkLabel48_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel48.LinkClicked
Dim f = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED"
importFileFromEZOLL(If(CheckBox2.Checked, Now.AddDays(-7), If(CheckBox3.Checked, Now.AddMonths(-1), Now)))
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = f
End Sub
End Class