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

38
UID/Mitarbeiter/frmMitarbDetails.vb
View File

@@ -1,5 +1,6 @@

Imports System.Text.RegularExpressions
Imports Confluent.Kafka
Imports VERAG_PROG_ALLGEMEIN
Public Class frmMitarbDetails
@@ -1873,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)
@@ -1897,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

4
UID/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.2.5.3")>
<Assembly: AssemblyFileVersion("1.2.5.3")>
<Assembly: AssemblyVersion("1.2.5.4")>
<Assembly: AssemblyFileVersion("1.2.5.4")>

26
UID/frmMain.Designer.vb generated
View File

@@ -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!)

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*"