Merge branch 'ADMIN' of https://git.it.verag.ag/edv/ADMIN into ADMIN
This commit is contained in:
@@ -1,8 +1,7 @@
|
||||
|
||||
Imports System.Text.RegularExpressions
|
||||
Imports DocumentFormat.OpenXml.Drawing.Diagrams
|
||||
Imports Confluent.Kafka
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
Imports VERAG_PROG_ALLGEMEIN.TESTJSON
|
||||
|
||||
Public Class frmMitarbDetails
|
||||
|
||||
@@ -1875,22 +1874,22 @@ Public Class frmMitarbDetails
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub cbxeigeneFirma_CheckedChanged(sender As Object, e As EventArgs) Handles cbxeigeneFirma.CheckedChanged
|
||||
If Not cbxeigeneFirma.Checked Then
|
||||
'Private Sub cbxeigeneFirma_CheckedChanged(sender As Object, e As EventArgs) Handles cbxeigeneFirma.CheckedChanged
|
||||
' If Not cbxeigeneFirma.Checked Then
|
||||
|
||||
If cboFirmaFMZOLL._value <> "" AndAlso IsNumeric(cboFirmaFMZOLL._value) Then
|
||||
loadBenachrichtiungenListe(CInt(cboFirmaFMZOLL._value))
|
||||
' If cboFirmaFMZOLL._value <> "" AndAlso IsNumeric(cboFirmaFMZOLL._value) Then
|
||||
' loadBenachrichtiungenListe(CInt(cboFirmaFMZOLL._value))
|
||||
|
||||
Else
|
||||
' Else
|
||||
|
||||
loadBenachrichtiungenListe()
|
||||
' loadBenachrichtiungenListe()
|
||||
|
||||
End If
|
||||
Else
|
||||
loadBenachrichtiungenListe()
|
||||
End If
|
||||
' End If
|
||||
' Else
|
||||
' loadBenachrichtiungenListe()
|
||||
' End If
|
||||
|
||||
End Sub
|
||||
'End Sub
|
||||
|
||||
Private Sub loadBenachrichtiungenListe(Optional FIRMAID As Integer = -1)
|
||||
|
||||
@@ -1899,12 +1898,23 @@ Public Class frmMitarbDetails
|
||||
CASE
|
||||
WHEN mb_firmaID IS NULL THEN ' (ALLE)'
|
||||
ELSE ' (' + [tblFirma].Firma_Bez + ')'
|
||||
END as mb_object, mb_id
|
||||
END as mb_object, mb_id, mb_firmaID
|
||||
|
||||
FROM [ADMIN].[dbo].[tblEMailbenachrichtigungen]
|
||||
inner join [VERAG].[dbo].[tblFirma] on [mb_firmaID] = [tblFirma].Firma_ID" & IIf(FIRMAID > 0, " AND [tblFirma].Firma_ID = " & FIRMAID, "") & " order by mb_object,mb_firmaID", "ADMIN")
|
||||
left join [VERAG].[dbo].[tblFirma] on [mb_firmaID] = [tblFirma].Firma_ID order by mb_object,mb_firmaID", "ADMIN")
|
||||
For Each r As DataRow In dt_Bebachrichtigungen.Rows
|
||||
Dim edit As Boolean = True
|
||||
If FIRMAID > 0 Then
|
||||
If Not IsDBNull(r.Item("mb_firmaID")) AndAlso IsNumeric(r.Item("mb_firmaID")) AndAlso FIRMAID <> CInt((r.Item("mb_firmaID"))) Then
|
||||
edit = False
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
clInterneMailBenachrichtigungen.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(r.Item("mb_object"), r.Item("mb_id")))
|
||||
|
||||
|
||||
|
||||
Next
|
||||
|
||||
End Sub
|
||||
|
||||
26
UID/frmMain.Designer.vb
generated
26
UID/frmMain.Designer.vb
generated
@@ -33,6 +33,7 @@ Partial Class frmMain
|
||||
Me.TableAdapterManager1 = New ADMIN.DataSetBerechtigungenTableAdapters.TableAdapterManager()
|
||||
Me.pnlMain = New System.Windows.Forms.Panel()
|
||||
Me.Panel3 = New System.Windows.Forms.Panel()
|
||||
Me.btnInterneBenachrichtigungen = 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()
|
||||
@@ -51,7 +52,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.btnInterneBenachrichtigungen = New System.Windows.Forms.Button()
|
||||
Me.Panel3.SuspendLayout()
|
||||
Me.Panel2.SuspendLayout()
|
||||
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
@@ -135,6 +135,18 @@ Partial Class frmMain
|
||||
Me.Panel3.Size = New System.Drawing.Size(137, 801)
|
||||
Me.Panel3.TabIndex = 32
|
||||
'
|
||||
'btnInterneBenachrichtigungen
|
||||
'
|
||||
Me.btnInterneBenachrichtigungen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.btnInterneBenachrichtigungen.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
|
||||
Me.btnInterneBenachrichtigungen.Location = New System.Drawing.Point(12, 220)
|
||||
Me.btnInterneBenachrichtigungen.Name = "btnInterneBenachrichtigungen"
|
||||
Me.btnInterneBenachrichtigungen.Size = New System.Drawing.Size(94, 38)
|
||||
Me.btnInterneBenachrichtigungen.TabIndex = 46
|
||||
Me.btnInterneBenachrichtigungen.Text = "interne Infomails"
|
||||
Me.btnInterneBenachrichtigungen.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
Me.btnInterneBenachrichtigungen.UseVisualStyleBackColor = True
|
||||
'
|
||||
'lblVersion
|
||||
'
|
||||
Me.lblVersion.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
|
||||
@@ -344,18 +356,6 @@ Partial Class frmMain
|
||||
Me.PictureBox1.TabIndex = 31
|
||||
Me.PictureBox1.TabStop = False
|
||||
'
|
||||
'btnInterneBenachrichtigungen
|
||||
'
|
||||
Me.btnInterneBenachrichtigungen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.btnInterneBenachrichtigungen.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
|
||||
Me.btnInterneBenachrichtigungen.Location = New System.Drawing.Point(12, 220)
|
||||
Me.btnInterneBenachrichtigungen.Name = "btnInterneBenachrichtigungen"
|
||||
Me.btnInterneBenachrichtigungen.Size = New System.Drawing.Size(94, 52)
|
||||
Me.btnInterneBenachrichtigungen.TabIndex = 46
|
||||
Me.btnInterneBenachrichtigungen.Text = "interne Mail-Benachr."
|
||||
Me.btnInterneBenachrichtigungen.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
Me.btnInterneBenachrichtigungen.UseVisualStyleBackColor = True
|
||||
'
|
||||
'frmMain
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
|
||||
@@ -39,6 +39,7 @@ Public Class usrCntlAPI
|
||||
'cboType.fillWithSQL("SELECT distinct(api_Type) FROM [tblAPI] ", False, "ADMIN", True)
|
||||
cboType.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FTP", "FTP"))
|
||||
cboType.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MAIL", "MAIL"))
|
||||
cboType.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("REST", "REST"))
|
||||
|
||||
cboAPIArt.Items.Clear()
|
||||
cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
|
||||
@@ -46,8 +47,11 @@ Public Class usrCntlAPI
|
||||
cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AVISO_OUT_BELEGMAIL", VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_BELEGMAIL))
|
||||
cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG_OUT_EZA", VERAG_PROG_ALLGEMEIN.cAPI_ART.VERAG_OUT_EZA))
|
||||
cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG_OUT_NCTS", VERAG_PROG_ALLGEMEIN.cAPI_ART.VERAG_OUT_NCTS))
|
||||
cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MSE", VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_IN_MSE))
|
||||
cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MULTISERVICE", VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_IN_MSE))
|
||||
cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MDM SAMMELRECHNUNG", VERAG_PROG_ALLGEMEIN.cAPI_ART.SDL_OUT_SAMMELRECHNUNG))
|
||||
cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CREDITSAFE", VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_IN_CS))
|
||||
cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SAMMELRECHNUNG", VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_SAMMELRECHNUNG))
|
||||
cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EINZELRECHNUNG", VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_EINZELRECHNUNG))
|
||||
cboAPIArt.changeItem("")
|
||||
|
||||
|
||||
|
||||
@@ -920,7 +920,8 @@ Anzeige:
|
||||
If rowsVorp.Length > 0 Then
|
||||
Dim row = rowsVorp(0)
|
||||
Warenwert_temp = CDbl(row("tblSnd_Warenwert"))
|
||||
Dim Waehrung = row("tblSnd_WarenwertWaehrung")
|
||||
'wenn nicht eingetragen, dann Annahme Währung = EUR - >L.Hartwagner am 17.04.2026
|
||||
Dim Waehrung = IIf(IsDBNull(row("tblSnd_WarenwertWaehrung")), "EUR", row("tblSnd_WarenwertWaehrung"))
|
||||
|
||||
If Waehrung <> "EUR" Then
|
||||
Dim kurs As New cFremdwaehrungskurse(Waehrung)
|
||||
@@ -1078,9 +1079,9 @@ Anzeige:
|
||||
|
||||
|
||||
If sendInfoMail Then
|
||||
Dim InfoText2 As String = createInfoMail(gsrightRow.Item("gs_MRNNr"), Nothing, "VW-AUSGANG",, SicherheitsPos, isNCTS, sonstigeMRNNr)
|
||||
Dim InfoText2 As String = createInfoMail(gsrightRow.Item("gs_MRNNr"), Nothing, "VW-AUSGANG",, SicherheitsPos, isNCTS, sonstigeMRNNr, gsrightRow)
|
||||
Dim empfaenger = cMitarbeiter.GetEMailRecipientForEmailNotification("DAKOSY-VWA", GesSichRef.brgakto_firmaID)
|
||||
If empfaenger <> "" Then VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaenger, GesSichRef.brgakto_gs_standort & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, " TEST-", " ") & "Verwahrungsausgang aus DAKOSY " & zusätzlicheInfo & " - " & Now().ToShortDateString, InfoText2)
|
||||
If empfaenger <> "" Then VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaenger, GesSichRef.brgakto_gs_standort & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, " TEST-", " ") & "Verwahrungsausgang aus DAKOSY " & zusätzlicheInfo & " - " & Now().ToShortDateString, InfoText2,,,,, "d.breimaier@verag.ag")
|
||||
End If
|
||||
|
||||
End If
|
||||
@@ -1096,7 +1097,7 @@ Anzeige:
|
||||
'End If
|
||||
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message & " " & MRN_Erledigung, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
Finally
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = testlauf
|
||||
End Try
|
||||
@@ -1118,7 +1119,7 @@ Anzeige:
|
||||
Return 0
|
||||
End Function
|
||||
|
||||
Public Shared Function createInfoMail(regNR As String, dt As DataTable, typ As String, Optional GS As cSicherheiten = Nothing, Optional GSPOS As cGesamtsicherheitsPositionen = Nothing, Optional isNCTS As Boolean = False, Optional sonstigeMRNNR As String = "") As String
|
||||
Public Shared Function createInfoMail(regNR As String, dt As DataTable, typ As String, Optional GS As cSicherheiten = Nothing, Optional GSPOS As cGesamtsicherheitsPositionen = Nothing, Optional isNCTS As Boolean = False, Optional sonstigeMRNNR As String = "", Optional gs_row As DataRow = Nothing) As String
|
||||
|
||||
Dim TextHTMLtable As String
|
||||
|
||||
@@ -1152,7 +1153,7 @@ Anzeige:
|
||||
TextHTMLtable &= typ & " wurde aus DAKOSY generiert!" & vbNewLine & vbNewLine & vbNewLine
|
||||
|
||||
TextHTMLtable &= "<table border=1>"
|
||||
TextHTMLtable &= "<tr><td>PosNr</td><td>Vorpapier</td><td>MRN</td><td>LKWID</td></tr>"
|
||||
TextHTMLtable &= "<tr><td>PosNr</td><td>Vorpapier</td><td>MRN</td><td>AVISOID</td><td>LKW-KZ</td></tr>"
|
||||
|
||||
If GS IsNot Nothing Then
|
||||
TextHTMLtable &= "<tr>"
|
||||
@@ -1160,6 +1161,7 @@ Anzeige:
|
||||
TextHTMLtable &= "<td><b>" & GS.gs_ATBNr & "</b></td>"
|
||||
TextHTMLtable &= "<td><b>" & GS.gs_MRNNr & "</b></td>"
|
||||
TextHTMLtable &= "<td><b>" & GS.gs_avisoId & "</b></td>"
|
||||
TextHTMLtable &= "<td><b>" & GS.gs_LKWKZ & "</b></td>"
|
||||
TextHTMLtable &= "</tr>"
|
||||
|
||||
End If
|
||||
@@ -1175,7 +1177,7 @@ Anzeige:
|
||||
TextHTMLtable &= typ & " wurde aus DAKOSY generiert!" & vbNewLine & vbNewLine & vbNewLine
|
||||
|
||||
TextHTMLtable &= "<table border=1>"
|
||||
TextHTMLtable &= "<tr><td>PosNr</td><td>MRN</td><td>ATC</td>" & IIf(sonstigeMRNNR <> "", "<td>sonstige MRN</td>", "") & "<td>AVISOID</td></tr>"
|
||||
TextHTMLtable &= "<tr><td>PosNr</td><td>MRN</td><td>ATC</td>" & IIf(sonstigeMRNNR <> "", "<td>sonstige MRN</td>", "") & "<td>AVISOID</td><td>LKW-KZ</td><td>Packstücke</td><td>Gewicht in KG</td></tr>"
|
||||
|
||||
If GSPOS IsNot Nothing Then
|
||||
TextHTMLtable &= "<tr>"
|
||||
@@ -1184,9 +1186,31 @@ Anzeige:
|
||||
TextHTMLtable &= "<td><b>" & GSPOS.gsp_ATCNr & "</b></td>"
|
||||
If sonstigeMRNNR <> "" Then TextHTMLtable &= "<td><b>" & sonstigeMRNNR & "</b></td>"
|
||||
TextHTMLtable &= "<td><b>" & GSPOS.gsp_avisoId & "</b></td>"
|
||||
TextHTMLtable &= "</tr>"
|
||||
|
||||
If gs_row IsNot Nothing AndAlso Not IsDBNull(gs_row("gs_LKWKZ")) AndAlso gs_row("gs_LKWKZ") <> "" Then
|
||||
TextHTMLtable &= "<td><b>" & gs_row("gs_LKWKZ").ToString & "</b></td>"
|
||||
Else
|
||||
TextHTMLtable &= "<td><b> - </b></td>"
|
||||
End If
|
||||
|
||||
If GSPOS.gsp_EH_Anzahl IsNot Nothing AndAlso IsNumeric(GSPOS.gsp_EH_Anzahl) Then
|
||||
TextHTMLtable &= "<td><b>" & GSPOS.gsp_EH_Anzahl & "</b></td>"
|
||||
Else
|
||||
TextHTMLtable &= "<td><b> - </b></td>"
|
||||
End If
|
||||
|
||||
|
||||
|
||||
|
||||
If gs_row IsNot Nothing AndAlso Not IsDBNull(gs_row("gs_gewicht")) Then
|
||||
TextHTMLtable &= "<td><b>" & gs_row("gs_gewicht").ToString & "</b></td>"
|
||||
Else
|
||||
TextHTMLtable &= "<td><b> - </b></td>"
|
||||
End If
|
||||
|
||||
|
||||
TextHTMLtable &= "</tr>"
|
||||
End If
|
||||
|
||||
TextHTMLtable &= "</table>"
|
||||
|
||||
|
||||
@@ -149,7 +149,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
|
||||
ElseIf programName.Contains("UTA") Then
|
||||
DownloadSFtpDirectory(uta.API_STRING, New NetworkCredential(uta.API.Rows(0).Item("api_user").ToString, uta.API.Rows(0).Item("api_password").ToString), "", cnt, deleteFilesAfterDownload, "/TRX/" & year, renameFilesAfterDownload)
|
||||
ElseIf programName.Contains("IDS") Then
|
||||
DownloadSFtpDirectory(ids.API_STRING, New NetworkCredential(ids.API.Rows(0).Item("api_user").ToString, ids.API.Rows(0).Item("api_password").ToString), "", cnt, deleteFilesAfterDownload, "/IN/" & year, renameFilesAfterDownload)
|
||||
DownloadSFtpDirectory(ids.API_STRING, New NetworkCredential(ids.API.Rows(0).Item("api_user").ToString, ids.API.Rows(0).Item("api_password").ToString), "", cnt, deleteFilesAfterDownload, "/IN/ALL", renameFilesAfterDownload)
|
||||
End If
|
||||
|
||||
|
||||
|
||||
@@ -917,9 +917,6 @@ Public Class frmStartOptions
|
||||
Dim sendMail As Boolean = True
|
||||
|
||||
importCreditsafeEvents(CDate(Today().AddDays(-1)).ToShortDateString, checkDate, upateKunden, setzeInfoImKunden, sendMail, False)
|
||||
|
||||
|
||||
|
||||
closeMe()
|
||||
|
||||
Case "CREDITSAFE_UPLOADS"
|
||||
@@ -6815,7 +6812,6 @@ weiter:
|
||||
|
||||
'1. Use Portfolio-Specific Events for Targeted Monitoring: Start with the portfolio-specific endpoint to focus on changes relevant to a particular portfolio.
|
||||
'2. Leverage Global Events for a Broader View: Use the all-events endpoint to gain a comprehensive overview of all notifications across your portfolios.
|
||||
|
||||
'3. Drill Down to Company-Level Events WHEN NEEDED: For detailed insights into a specific company, use the company-specific endpoint.
|
||||
|
||||
'-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
@@ -6870,7 +6866,7 @@ weiter:
|
||||
|
||||
If Not companyDetailEventsRequest Then
|
||||
|
||||
Dim API_Start_Daily = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.IN, VERAG_PROG_ALLGEMEIN.cAPI_Type.REST, VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_IN_CS, "DAiLY-CREDITSAFE-EVENTS-IMPORT", "CS")
|
||||
Dim API_Start_Daily = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.IN, VERAG_PROG_ALLGEMEIN.cAPI_Type.REST, VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_IN_CS, "DAILY-CREDITSAFE-EVENTS-IMPORT", "CS")
|
||||
|
||||
Dim dtMonitoredRequest As New DataTable
|
||||
|
||||
@@ -7002,8 +6998,9 @@ repeatRequest:
|
||||
End If
|
||||
|
||||
If APIText.Contains("Invalid token") Then
|
||||
If Not cs.authenticate() = 200 Then
|
||||
API.UPDTAE_ERR("ERROR", APIText, "importCreditsafeEvents")
|
||||
Dim ERR = Not cs.authenticate()
|
||||
If ERR <> "200" Then
|
||||
API.UPDTAE_ERR("ERROR", APIText & vbNewLine & "ERR-Code: " & ERR, "importCreditsafeEvents")
|
||||
Exit For
|
||||
Else
|
||||
Thread.Sleep(4000)
|
||||
@@ -7017,7 +7014,7 @@ repeatRequest:
|
||||
End If
|
||||
|
||||
|
||||
Thread.Sleep(1000)
|
||||
Thread.Sleep(500) 'von 1000 auf 500 reduziert!
|
||||
Next
|
||||
|
||||
If dtCreditsafe.Rows.Count = (counter - dt_fehlendeCreditsafeIDS.Rows.Count) Then
|
||||
|
||||
Reference in New Issue
Block a user