Merge branch 'ADMIN' of https://git.it.verag.ag/edv/ADMIN into ADMIN
This commit is contained in:
@@ -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