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

Mahnlauf fix, Mitarbeiter, verwahrung, etc.

Browse Source
This commit is contained in:
d.breimaier
2026-04-17 13:27:13 +02:00
parent 368177a536
commit 30d9062ad5
4 changed files with 57 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
initATLASAufschubkonten/cWorker_Verwahrung.vb
View File

@@ -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></tr>"
If GSPOS IsNot Nothing Then
TextHTMLtable &= "<tr>"
@@ -1184,10 +1186,17 @@ 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
TextHTMLtable &= "</tr>"
End If
TextHTMLtable &= "</table>"
TextHTMLtable &= vbNewLine & vbNewLine & vbNewLine & "*Automatic generated e-mail*"