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

merge

Browse Source
This commit is contained in:
d.breimaier
2025-10-02 09:24:05 +02:00
parent 9a80117562 610008089b
commit eb603ccabb
8 changed files with 114 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MailSender/MAILSender.vb
View File

@@ -51,7 +51,8 @@ Module Mail
'PARAM = "UID_OPS_SYSKA_ABGLEICH"
'PARAM = "BERICHT"
'PARAM = "JAHRESABRECHNUNG AG-ZS"
' PARAM = "UID_OPS_SYSKA_ABGLEICH"
'------------------------------------------------------------------------------------

6
MailSender/MailSender.vbproj
View File

@@ -119,6 +119,12 @@
<None Include="App.config" />
<None Include="Resources\Auswertung_divers.xlsx" />
<None Include="Resources\Detailauswertung_divers.xlsx" />
<None Include="Resources\MDM_AI_Verguetung.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\MDM_IT_Verguetung.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\MDM_ZOLL_Verguetung.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>

BIN
MailSender/Resources/MDM_AI_Verguetung.xlsx Normal file
View File

Binary file not shown.

BIN
MailSender/Resources/MDM_IT_Verguetung.xlsx Normal file
View File

Binary file not shown.

4
UID/Mitarbeiter/frmMitarbDetails.vb
View File

@@ -471,7 +471,9 @@ Public Class frmMitarbDetails
Dim newMid As Integer = 0
If txtVname.Text = "" And txtNname.Text = "" Then MsgBox("Bitte geben Sie einen Namen ein!") : Exit Sub
USRPARAM_Bind.updateBinding()
If USRPARAM_Bind IsNot Nothing Then
USRPARAM_Bind.updateBinding()
End If
getMitarbeiter()

52
UID/frmMain.Designer.vb generated
View File

@@ -33,7 +33,8 @@ Partial Class frmMain
Me.TableAdapterManager1 = New ADMIN.DataSetBerechtigungenTableAdapters.TableAdapterManager()
Me.pnlMain = New System.Windows.Forms.Panel()
Me.Panel3 = New System.Windows.Forms.Panel()
Me.Button2 = New System.Windows.Forms.Button()
Me.lblVersion = New System.Windows.Forms.Label()
Me.btnAuditFlow = New System.Windows.Forms.Button()
Me.btnMailroutine = New System.Windows.Forms.Button()
Me.btnAPIZugang = New System.Windows.Forms.Button()
Me.btnDatenarchiv = New System.Windows.Forms.Button()
@@ -50,7 +51,6 @@ Partial Class frmMain
Me.btnMitarbeiter = New System.Windows.Forms.Button()
Me.Panel2 = New System.Windows.Forms.Panel()
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
Me.lblVersion = New System.Windows.Forms.Label()
Me.Panel3.SuspendLayout()
Me.Panel2.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -112,7 +112,7 @@ Partial Class frmMain
'
Me.Panel3.BackColor = System.Drawing.Color.White
Me.Panel3.Controls.Add(Me.lblVersion)
Me.Panel3.Controls.Add(Me.Button2)
Me.Panel3.Controls.Add(Me.btnAuditFlow)
Me.Panel3.Controls.Add(Me.btnMailroutine)
Me.Panel3.Controls.Add(Me.btnAPIZugang)
Me.Panel3.Controls.Add(Me.btnDatenarchiv)
@@ -133,17 +133,29 @@ Partial Class frmMain
Me.Panel3.Size = New System.Drawing.Size(137, 801)
Me.Panel3.TabIndex = 32
'
'Button2
'lblVersion
'
Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button2.Location = New System.Drawing.Point(12, 243)
Me.Button2.Name = "Button2"
Me.Button2.Size = New System.Drawing.Size(94, 33)
Me.Button2.TabIndex = 44
Me.Button2.Text = "AuditFlow"
Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button2.UseVisualStyleBackColor = True
Me.lblVersion.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.lblVersion.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.lblVersion.ForeColor = System.Drawing.Color.Black
Me.lblVersion.Location = New System.Drawing.Point(38, 751)
Me.lblVersion.Name = "lblVersion"
Me.lblVersion.Size = New System.Drawing.Size(68, 13)
Me.lblVersion.TabIndex = 45
Me.lblVersion.Text = "V1.0.0.0"
Me.lblVersion.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'btnAuditFlow
'
Me.btnAuditFlow.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnAuditFlow.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnAuditFlow.Location = New System.Drawing.Point(12, 243)
Me.btnAuditFlow.Name = "btnAuditFlow"
Me.btnAuditFlow.Size = New System.Drawing.Size(94, 33)
Me.btnAuditFlow.TabIndex = 44
Me.btnAuditFlow.Text = "AuditFlow"
Me.btnAuditFlow.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnAuditFlow.UseVisualStyleBackColor = True
'
'btnMailroutine
'
@@ -330,18 +342,6 @@ Partial Class frmMain
Me.PictureBox1.TabIndex = 31
Me.PictureBox1.TabStop = False
'
'lblVersion
'
Me.lblVersion.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.lblVersion.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.lblVersion.ForeColor = System.Drawing.Color.Black
Me.lblVersion.Location = New System.Drawing.Point(38, 751)
Me.lblVersion.Name = "lblVersion"
Me.lblVersion.Size = New System.Drawing.Size(68, 13)
Me.lblVersion.TabIndex = 45
Me.lblVersion.Text = "V1.0.0.0"
Me.lblVersion.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'frmMain
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -387,6 +387,6 @@ Partial Class frmMain
Friend WithEvents btnDatenarchiv As Button
Friend WithEvents btnAPIZugang As Button
Friend WithEvents btnMailroutine As Button
Friend WithEvents Button2 As Button
Friend WithEvents btnAuditFlow As Button
Friend WithEvents lblVersion As Label
End Class

28
UID/frmMain.vb
View File

@@ -28,16 +28,27 @@ Public Class frmMain
btnSchulungen.Enabled = False
btnDienstplan.Enabled = False
Button1.Enabled = False
btnAuditFlow.Enabled = False
btnHomepage.Enabled = False
Button6.Enabled = False
btnAPIZugang.Enabled = False
btnAPI.Enabled = False
btnFehler.Enabled = False
btnDatenarchiv.Enabled = False
btnMailroutine.Enabled = False
lblVersion.Text = "V " & Application.ProductVersion 'My.Resources.Version2
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("frmDienstplan", Me) Then
btnDienstplan.Enabled = True
btnDienstplan.PerformClick()
Dim uniqueberechtigungDP = True
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AUDITFLOW", "ADMIN") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AUDITFLOW", "SDL") Then
btnAuditFlow.Enabled = True
uniqueberechtigungDP = False
End If
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("SCHULUNG", "ADMIN") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("SCHULUNG", "SDL") Then
btnSchulungen.Enabled = True
uniqueberechtigungDP = False
End If
' Me.berechtigung = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("ADMINFUNCTIONS", 1)
' If Me.berechtigung = 99 Then Me.Close() : Exit Sub
@@ -46,14 +57,23 @@ Public Class frmMain
btnMitarbeiter.Enabled = True
btnProgramme.Enabled = True
btnSchulungen.Enabled = True
btnMailroutine.Enabled = True
btnDienstplan.Enabled = True
Button1.Enabled = True
btnAuditFlow.Enabled = True
btnAPIZugang.Enabled = True
btnAPI.Enabled = True
btnFehler.Enabled = True
btnHomepage.Enabled = True
Button6.Enabled = True
btnDatenarchiv.Enabled = True
uniqueberechtigungDP = False
End If
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("frmDienstplan", Me) Then
btnDienstplan.Enabled = True
If uniqueberechtigungDP Then btnDienstplan.PerformClick()
End If
' If frmLogin.USRBER >= 5 Then
'btnDienstplan.Enabled = True
' End If
@@ -238,7 +258,7 @@ Public Class frmMain
button_Click(sender)
End Sub
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnAuditFlow.Click
Dim f As New frmAuditFlow
f.Show(Me)
End Sub

72
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -1041,6 +1041,40 @@ Public Class frmStartOptions
End Sub
Sub doMailZollbelegTC(pfad As String, art As String, tc_id As Integer)
Try
Dim DY As New TELOTEC_Worker.cTelotec_Anmeldung(tc_id)
If DY.telanm_SendungsId IsNot Nothing AndAlso CInt(DY.telanm_SendungsId) > 0 Then
doMailZollbeleg(pfad, art, DY.telanm_SendungsId, DY.telanm_BezugsNr)
End If
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
End Try
End Sub
Sub doMailZollbelegTC(pfad As String, art As String, TC As TELOTEC_Worker.cTelotec_Anmeldung)
Try
If TC IsNot Nothing Then
If TC.telanm_SendungsId IsNot Nothing AndAlso CInt(TC.telanm_SendungsId) > 0 Then
doMailZollbeleg(pfad, art, TC.telanm_SendungsId, TC.telanm_BezugsNr)
End If
End If
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
End Try
End Sub
Sub doMailZollbeleg(pfad, art, dy_SendungsId, BezugsNr)
@@ -4041,17 +4075,17 @@ Public Class frmStartOptions
End If
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
SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(oRDR.GetValue("CardNumber"), 1, 2), Mid(Validto, 3, 2), 1)))
End If
SDL.OBUID = SQL.checkNullStr(oRDR.GetValue("OBUID"))
SDL.Vertragsabschlussdatum = SQL.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
SDL.Kategorie = SQL.checkNullStr(oRDR.GetValue("Kategorie"))
SDL.Schadstoffklasse = SQL.checkNullStr(oRDR.GetValue("Schadstoffklasse"))
SDL.Status = SQL.checkNullStr(oRDR.GetValue("Status"))
SDL.OBUID = SQl.checkNullStr(oRDR.GetValue("OBUID"))
SDL.Vertragsabschlussdatum = SQl.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
SDL.Kategorie = SQl.checkNullStr(oRDR.GetValue("Kategorie"))
SDL.Schadstoffklasse = SQl.checkNullStr(oRDR.GetValue("Schadstoffklasse"))
SDL.Status = SQl.checkNullStr(oRDR.GetValue("Status"))
SDL.SAVE()
End If
@@ -4097,21 +4131,21 @@ Public Class frmStartOptions
End If
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
'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!
End If
SDL.OBUID = SQL.checkNullStr(row.Item("OBUID"))
SDL.Vertragsabschlussdatum = SQL.checkNullStr(row.Item("contractDate"))
SDL.Kategorie = SQL.checkNullStr(row.Item("vehicleCategory"))
SDL.Schadstoffklasse = SQL.checkNullStr(row.Item("emissionCategory"))
SDL.Status = SQL.checkNullStr(row.Item("status"))
SDL.Nationalitaet = SQL.checkNullStr(row.Item("nationality"))
SDL.CO2Kategorie = SQL.checkNullStr(row.Item("CO2EmissionsClass"))
SDL.OBUID = SQl.checkNullStr(row.Item("OBUID"))
SDL.Vertragsabschlussdatum = SQl.checkNullStr(row.Item("contractDate"))
SDL.Kategorie = SQl.checkNullStr(row.Item("vehicleCategory"))
SDL.Schadstoffklasse = SQl.checkNullStr(row.Item("emissionCategory"))
SDL.Status = SQl.checkNullStr(row.Item("status"))
SDL.Nationalitaet = SQl.checkNullStr(row.Item("nationality"))
SDL.CO2Kategorie = SQl.checkNullStr(row.Item("CO2EmissionsClass"))
SDL.SAVE()
End If
@@ -6227,7 +6261,7 @@ weiter:
SQL.doSQL("UPDATE [tblTelotec_Anmeldung] SET [telanm_VBD_dsId]='" & DS.da_id & "' where telanm_CRN='" & TELO_ANM.Refs_CRN & "'", "FMZOLL")
SQL.doSQL("UPDATE Speditionsbuch SET DokumentId_VBD='" & DS.da_id & "' where AtlasBezNrNCTS='" & TELO_ANM.Refs_LRN.ToString.Trim & "' AND DokumentId_VBD is null", "FMZOLL") 'Falls Spedbuch schon zuvor generiert wurde!
If ZB_Versand Then
If DateDiff(DateInterval.Hour, TELO_ANM.dec_CreateDate, Now) < 24 Then frmStartOptions.doMailZollbeleg(DS.GET_TOP1_PATH, "VBD", TELO_ANM.telanm_id)
If DateDiff(DateInterval.Hour, TELO_ANM.dec_CreateDate, Now) < 24 Then frmStartOptions.doMailZollbelegTC(DS.GET_TOP1_PATH, "VBD", TELO_ANM)
End If
End If
End If
@@ -6453,7 +6487,7 @@ repeatRequestDaily:
End If
If totalPages > 1 Then
For i = 2 To totalPages
For i = 2 To totalPages
repeatRequestDailyPages:
APIText = cs.getCompanyEvents(companyDummy, dtMonitoredRequest, False, totalPages, checkDate, upateKunden, False,, setzeKundenbesonderheiten, True,, i)
If APIText.Contains("Invalid token") Then
@@ -6467,7 +6501,7 @@ repeatRequestDailyPages:
End If
Next
End If
End If
API_Start_Daily.UPDTAE_OK(,, "dailyImportCreditsafeEvents" & " Seiten:" & totalPages & "/" & page)