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

MDM, Chat, etc.

Browse Source
This commit is contained in:
d.breimaier
2026-01-28 15:59:47 +01:00
parent 44a58bc077
commit 8b5be9ac14
5 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SDL/kassenbuch/frmNacherfassungLeihgeld.vb
View File

@@ -669,7 +669,6 @@ Public Class frmNacherfassungLeihgeld
Dim BELEG_Prov As New EABeleg(PERSONAL.Mandant, PERSONAL.Niederlassung, PERSONAL.ID) Dim BELEG_Prov As New EABeleg(PERSONAL.Mandant, PERSONAL.Niederlassung, PERSONAL.ID)
'lblRgNr.Text = "12345 / TR"
BELEG_Prov.BelegDat = BELEG.BelegDat BELEG_Prov.BelegDat = BELEG.BelegDat
BELEG_Prov.Beleg_TYP = "K" BELEG_Prov.Beleg_TYP = "K"
BELEG_Prov.KundenNr = BELEG.FrachtführerKundenNr BELEG_Prov.KundenNr = BELEG.FrachtführerKundenNr
@@ -736,7 +735,6 @@ Public Class frmNacherfassungLeihgeld
If f.ShowDialog() Then If f.ShowDialog() Then
barBetrag = f.BELEG.rksv_umsatz barBetrag = f.BELEG.rksv_umsatz
BelegNrProvision = f.BELEG.rksv_BelegId BelegNrProvision = f.BELEG.rksv_BelegId
printProvision = f.printErfolgreich printProvision = f.printErfolgreich
End If End If
' f.Close() ' f.Close()
@@ -781,8 +779,8 @@ Public Class frmNacherfassungLeihgeld
VALUES.Frachtfuehrer_KdNr = BELEG.FrachtführerKundenNr VALUES.Frachtfuehrer_KdNr = BELEG.FrachtführerKundenNr
VALUES.Frachtfuehrer_Firma = BELEG.Frachtführer VALUES.Frachtfuehrer_Firma = BELEG.Frachtführer
VALUES.KdAuftrNr = If(BELEG.Auftraggeber_KdAuftragsnummer, "") VALUES.KdAuftrNr = If(BELEG.Auftraggeber_KdAuftragsnummer, "")
VALUES.Auftraggeber_Leistung1 = "Leihgeld" VALUES.Auftraggeber_Leistung1 = "Leihgeld"
Dim betrag As Double = 0 Dim betrag As Double = 0
For Each p In BELEG.POS For Each p In BELEG.POS
betrag += p.Preis betrag += p.Preis

30
SDL/mdm/usrCntlMDMAuswertungen.Designer.vb generated
View File

@@ -129,6 +129,7 @@ Partial Class usrCntlMDMAuswertungen
Me.TabPage3 = New System.Windows.Forms.TabPage() Me.TabPage3 = New System.Windows.Forms.TabPage()
Me.Label66 = New System.Windows.Forms.Label() Me.Label66 = New System.Windows.Forms.Label()
Me.GroupBox20 = New System.Windows.Forms.GroupBox() Me.GroupBox20 = New System.Windows.Forms.GroupBox()
Me.cbxNurUnter50EUR = New System.Windows.Forms.CheckBox()
Me.cboQuartal = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboQuartal = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.txtLeistungsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtLeistungsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -201,7 +202,6 @@ Partial Class usrCntlMDMAuswertungen
Me.btnContractdaten = New System.Windows.Forms.Button() Me.btnContractdaten = New System.Windows.Forms.Button()
Me.Button15 = New System.Windows.Forms.Button() Me.Button15 = New System.Windows.Forms.Button()
Me.pnl = New System.Windows.Forms.Panel() Me.pnl = New System.Windows.Forms.Panel()
Me.cbxNurUnter50EUR = New System.Windows.Forms.CheckBox()
Me.GroupBox1.SuspendLayout() Me.GroupBox1.SuspendLayout()
Me.GroupBox2.SuspendLayout() Me.GroupBox2.SuspendLayout()
CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -1461,6 +1461,18 @@ Partial Class usrCntlMDMAuswertungen
Me.GroupBox20.TabIndex = 14 Me.GroupBox20.TabIndex = 14
Me.GroupBox20.TabStop = False Me.GroupBox20.TabStop = False
' '
'cbxNurUnter50EUR
'
Me.cbxNurUnter50EUR.AutoSize = True
Me.cbxNurUnter50EUR.Checked = True
Me.cbxNurUnter50EUR.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxNurUnter50EUR.Location = New System.Drawing.Point(391, 46)
Me.cbxNurUnter50EUR.Name = "cbxNurUnter50EUR"
Me.cbxNurUnter50EUR.Size = New System.Drawing.Size(111, 17)
Me.cbxNurUnter50EUR.TabIndex = 17
Me.cbxNurUnter50EUR.Text = "Nur unter 50 EUR"
Me.cbxNurUnter50EUR.UseVisualStyleBackColor = True
'
'cboQuartal 'cboQuartal
' '
Me.cboQuartal._allowedValuesFreiText = Nothing Me.cboQuartal._allowedValuesFreiText = Nothing
@@ -1492,7 +1504,7 @@ Partial Class usrCntlMDMAuswertungen
Me.txtLeistungsNr.MaxLines_Warning = "" Me.txtLeistungsNr.MaxLines_Warning = ""
Me.txtLeistungsNr.MaxLines_Warning_Label = Nothing Me.txtLeistungsNr.MaxLines_Warning_Label = Nothing
Me.txtLeistungsNr.Name = "txtLeistungsNr" Me.txtLeistungsNr.Name = "txtLeistungsNr"
Me.txtLeistungsNr.Size = New System.Drawing.Size(93, 20) Me.txtLeistungsNr.Size = New System.Drawing.Size(141, 20)
Me.txtLeistungsNr.TabIndex = 15 Me.txtLeistungsNr.TabIndex = 15
Me.txtLeistungsNr.Text = "327" Me.txtLeistungsNr.Text = "327"
' '
@@ -1550,7 +1562,7 @@ Partial Class usrCntlMDMAuswertungen
'Label64 'Label64
' '
Me.Label64.AutoSize = True Me.Label64.AutoSize = True
Me.Label64.Location = New System.Drawing.Point(153, 50) Me.Label64.Location = New System.Drawing.Point(145, 50)
Me.Label64.Name = "Label64" Me.Label64.Name = "Label64"
Me.Label64.Size = New System.Drawing.Size(27, 13) Me.Label64.Size = New System.Drawing.Size(27, 13)
Me.Label64.TabIndex = 8 Me.Label64.TabIndex = 8
@@ -2242,18 +2254,6 @@ Partial Class usrCntlMDMAuswertungen
Me.pnl.Size = New System.Drawing.Size(1057, 54) Me.pnl.Size = New System.Drawing.Size(1057, 54)
Me.pnl.TabIndex = 26 Me.pnl.TabIndex = 26
' '
'cbxNurUnter50EUR
'
Me.cbxNurUnter50EUR.AutoSize = True
Me.cbxNurUnter50EUR.Checked = True
Me.cbxNurUnter50EUR.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxNurUnter50EUR.Location = New System.Drawing.Point(414, 73)
Me.cbxNurUnter50EUR.Name = "cbxNurUnter50EUR"
Me.cbxNurUnter50EUR.Size = New System.Drawing.Size(111, 17)
Me.cbxNurUnter50EUR.TabIndex = 17
Me.cbxNurUnter50EUR.Text = "Nur unter 50 EUR"
Me.cbxNurUnter50EUR.UseVisualStyleBackColor = True
'
'usrCntlMDMAuswertungen 'usrCntlMDMAuswertungen
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

2
SDL/mdm/usrCntlMDMAuswertungen.vb
View File

@@ -1532,7 +1532,7 @@ Public Class usrCntlMDMAuswertungen
End If End If
Dim rmc As cRMC Dim rmc As cRMC
Dim dt = rmc.getRMCQuartalsAbrechnungen(New VERAG_PROG_ALLGEMEIN.SQL, cboQuartal._value.Trim(), Jahr, txtLeistungsNr.Text,,, cbxNurUnter50EUR.Checked) Dim dt = rmc.getRMCQuartalsAbrechnungen(New VERAG_PROG_ALLGEMEIN.SQL, IIf(cboQuartal._value.Trim() <> "", cboQuartal._value.Trim(), 0), Jahr, txtLeistungsNr.Text,,, cbxNurUnter50EUR.Checked)
If dt.Rows.Count > 0 Then If dt.Rows.Count > 0 Then
cProgramFunctions.genExcelFromDT_NEW(dt) cProgramFunctions.genExcelFromDT_NEW(dt)

28
VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb
View File

@@ -405,11 +405,13 @@ Public Class cMessenger
Try Try
Me.CHAT_MESSAGES.Clear() Me.CHAT_MESSAGES.Clear()
Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN() Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN()
Using cmd As New SqlCommand("SELECT * FROM(SELECT TOP " & top & " * FROM [tblMessenger_ChatMessages] WHERE chatMg_chatId=@chat_id order by chatMg_datetime desc) as T order by chatMg_datetime asc", conn) Using cmd As New SqlCommand("SELECT chatMg_id,chatMg_chatId,chatMg_maId,chatMg_maName,chatMg_maFirma,chatMg_datetime,chatMg_type,chatMg_text,chatMg_anhang_docId,chatMg_referenz_AvisoId,chatMg_referenz_SendungsId,chatMg_referenz_KundenNr FROM(SELECT TOP " & top & " chatMg_id,chatMg_chatId,chatMg_maId,chatMg_maName,chatMg_maFirma,chatMg_datetime,chatMg_type,chatMg_text,chatMg_anhang_docId,chatMg_referenz_AvisoId,chatMg_referenz_SendungsId,chatMg_referenz_KundenNr FROM [tblMessenger_ChatMessages] WHERE chatMg_chatId=@chat_id order by chatMg_datetime desc) as T order by chatMg_datetime asc", conn)
cmd.Parameters.AddWithValue("@chat_id", chat_id) cmd.Parameters.AddWithValue("@chat_id", chat_id)
Dim dr = cmd.ExecuteReader() Dim dr = cmd.ExecuteReader()
While dr.Read While dr.Read
Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id")) 'Me.chat_id, dr.Item("chatMb_maId")) 'yxc 'Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id")) 'Me.chat_id, dr.Item("chatMb_maId")) 'yxc
'Me.CHAT_MESSAGES.Add(MSG)
Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id"), dr.Item("chatMg_maId"), dr.Item("chatMg_datetime"), dr.Item("chatMg_maName"), dr.Item("chatMg_maFirma"), dr.Item("chatMg_type"), dr.Item("chatMg_text"), IIf(IsDBNull(dr.Item("chatMg_anhang_docId")), Nothing, dr.Item("chatMg_anhang_docId")), IIf(IsDBNull(dr.Item("chatMg_referenz_AvisoId")), Nothing, dr.Item("chatMg_referenz_AvisoId")), IIf(IsDBNull(dr.Item("chatMg_referenz_SendungsId")), Nothing, dr.Item("chatMg_referenz_SendungsId")), dr.Item("chatMg_referenz_KundenNr")) 'Me.chat_id, dr.Item("chatMb_maId")) 'yxc
Me.CHAT_MESSAGES.Add(MSG) Me.CHAT_MESSAGES.Add(MSG)
End While End While
dr.Close() dr.Close()
@@ -424,12 +426,17 @@ Public Class cMessenger
Try Try
Me.CHAT_MESSAGES.Clear() Me.CHAT_MESSAGES.Clear()
Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN() Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN()
Using cmd As New SqlCommand("SELECT * FROM [tblMessenger_ChatMessages] WHERE chatMg_chatId=@chat_id AND CAST(chatMg_datetime as date)>=@dateTmp order by chatMg_datetime asc", conn) Using cmd As New SqlCommand("SELECT chatMg_id,chatMg_chatId,chatMg_maId,chatMg_maName,chatMg_maFirma,chatMg_datetime,chatMg_type,chatMg_text,chatMg_anhang_docId,chatMg_referenz_AvisoId,chatMg_referenz_SendungsId,chatMg_referenz_KundenNr FROM [tblMessenger_ChatMessages] WHERE chatMg_chatId=@chat_id AND CAST(chatMg_datetime as date)>=@dateTmp order by chatMg_datetime asc", conn)
cmd.Parameters.AddWithValue("@chat_id", chat_id) cmd.Parameters.AddWithValue("@chat_id", chat_id)
cmd.Parameters.AddWithValue("@dateTmp", dateTmp) cmd.Parameters.AddWithValue("@dateTmp", dateTmp)
Dim dr = cmd.ExecuteReader() Dim dr = cmd.ExecuteReader()
While dr.Read While dr.Read
Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id")) 'Me.chat_id, dr.Item("chatMb_maId")) 'yxc 'Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id")) 'Me.chat_id, dr.Item("chatMb_maId")) 'yxc
'Me.CHAT_MESSAGES.Add(MSG)
'Hier werden die einzelnen MSg-Obj nicht mehr per SQL geladen, sondern direkt als Objekt übergeben -> schneller!
Dim MSG As New cMessenger_ChatMessages(dr.Item("chatMg_id"), dr.Item("chatMg_maId"), dr.Item("chatMg_datetime"), dr.Item("chatMg_maName"), dr.Item("chatMg_maFirma"), dr.Item("chatMg_type"), dr.Item("chatMg_text"), IIf(IsDBNull(dr.Item("chatMg_anhang_docId")), Nothing, dr.Item("chatMg_anhang_docId")), IIf(IsDBNull(dr.Item("chatMg_referenz_AvisoId")), Nothing, dr.Item("chatMg_referenz_AvisoId")), IIf(IsDBNull(dr.Item("chatMg_referenz_SendungsId")), Nothing, dr.Item("chatMg_referenz_SendungsId")), dr.Item("chatMg_referenz_KundenNr")) 'Me.chat_id, dr.Item("chatMb_maId")) 'yxc
Me.CHAT_MESSAGES.Add(MSG) Me.CHAT_MESSAGES.Add(MSG)
End While End While
dr.Close() dr.Close()
@@ -763,6 +770,19 @@ Public Class cMessenger
Me.chatMg_maId = chatMg_maId Me.chatMg_maId = chatMg_maId
End Sub End Sub
Sub New(chatMg_chatId, chatMg_maId, chatMg_datetime, chatMg_maName, chatMg_maFirma, chatMg_type, chatMg_text, chatMg_anhang_docId, chatMg_referenz_AvisoId, chatMg_referenz_SendungsId, chatMg_referenz_KundenNr)
Me.chatMg_chatId = chatMg_chatId
Me.chatMg_maId = chatMg_maId
Me.chatMg_datetime = chatMg_datetime
Me.chatMg_maName = chatMg_maName
Me.chatMg_maFirma = chatMg_maFirma
Me.chatMg_text = chatMg_text
Me.chatMg_anhang_docId = chatMg_anhang_docId
Me.chatMg_referenz_AvisoId = chatMg_referenz_AvisoId
Me.chatMg_referenz_SendungsId = chatMg_referenz_SendungsId
Me.chatMg_referenz_KundenNr = chatMg_referenz_KundenNr
End Sub
Public Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) Public Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMg_id", chatMg_id,, True)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMg_id", chatMg_id,, True))

2
VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb
View File

@@ -300,7 +300,7 @@ Public Class cRMC
End If End If
Dim SQLstr = "select Temp.KundenNr, Temp.Kundenname,Temp.LandKZ, Temp.Jahr, Temp.Quartal, sum(Temp.Betrag) as 'verrechneter Betrag', 50 - sum(Temp.Betrag) as Differenzbetrag from (SELECT Dim SQLstr = "select Temp.KundenNr, Temp.Kundenname,Temp.LandKZ, Temp.Jahr, Temp.Quartal, sum(Temp.Betrag) as 'verrechneter Bearbeitungsbetrag', " & IIf(nurUnter50anzeigen, "50 - sum(Temp.Betrag) as Differenzbetrag", "") & " from (SELECT
USTVA.UStVAn_KuNr as KundenNr, USTVA.UStVAn_KuNr as KundenNr,
USTVA.UStVAn_Name as Kundenname, USTVA.UStVAn_Name as Kundenname,
[Länderverzeichnis für die Außenhandelsstatistik].LandKz as LandKZ, [Länderverzeichnis für die Außenhandelsstatistik].LandKz as LandKZ,