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

MDM. TrierAuswertung

Browse Source
This commit is contained in:
d.breimaier
2024-11-15 15:50:22 +01:00
parent ee7972741a
commit a13d1b06d6
4 changed files with 166 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
SDL/mdm/frmMDMDatenverarbetiung.vb
View File

@@ -602,8 +602,8 @@ Public Class frmMDMDatenverarbetiung
rpt.lblUeberschrift.Text = "IDS Summenbericht (Offert " & typ & ") " & CDate(Now.ToShortDateString) rpt.lblUeberschrift.Text = "IDS Summenbericht (Offert " & typ & ") " & CDate(Now.ToShortDateString)
rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
rpt.lblBrutto.Text = "Brutto" rpt.lblBrutto.Text = "Brutto"
rpt.lblNetto.Text = "Netto" rpt.lblNetto.Text = "Liter"
rpt.lblMWST.Text = "MwSt." rpt.lblMWST.Text = "Netto"
rpt.Label4.Text = rpt.lblNetto.Text rpt.Label4.Text = rpt.lblNetto.Text
rpt.Label2.Text = rpt.lblMWST.Text rpt.Label2.Text = rpt.lblMWST.Text
rpt.Label14.Text = rpt.lblBrutto.Text rpt.Label14.Text = rpt.lblBrutto.Text
@@ -626,19 +626,19 @@ Public Class frmMDMDatenverarbetiung
rpt.lblKundennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("CustomerCode").Value, "") rpt.lblKundennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("CustomerCode").Value, "")
rpt.lblName1.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Name").Value, "") rpt.lblName1.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Name").Value, "")
rpt.lblKartennr.Text = "Liter: " & SQL.isDbnullEmpty(rpt.Fields.Item("Liter").Value, "") & IIf(SQL.isDbnullEmpty(rpt.Fields.Item("Rabatt").Value, "") <> "", " (abgezogener Rabatt:" & SQL.isDbnullEmpty(rpt.Fields.Item("Rabatt").Value & ")", ""), "") rpt.lblKartennr.Text = "VERAG-KdNr: " & SQL.isDbnullEmpty(rpt.Fields.Item("AdressenNr").Value, "") & IIf(SQL.isDbnullEmpty(rpt.Fields.Item("Rabatt").Value, "") <> "", " abgezogener Rabatt:" & SQL.isDbnullEmpty(rpt.Fields.Item("Rabatt").Value & "", ""), "")
rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Netto").Value, 2, "") rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Liter").Value, 2, "")
rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("Brutto").Value) - CDbl(rpt.Fields.Item("Netto").Value), 2, "") rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Netto").Value, 2, "")
rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 2, "") rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 2, "")
rpt.lblSumNet.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Netto").Value, 2, "") rpt.lblSumNet.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Liter").Value, 2, "")
rpt.lblSumVat.Text = SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("Brutto").Value) - CDbl(rpt.Fields.Item("Netto").Value), 2, "") rpt.lblSumVat.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Netto").Value, 2, "")
rpt.lblSumBrt.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 2, "") rpt.lblSumBrt.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 2, "")
sumNetto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Netto").Value, 4, 0) sumNetto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Liter").Value, 4, 0)
sumMWST += SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("Brutto").Value) - CDbl(rpt.Fields.Item("Netto").Value), 4, 0) sumMWST += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Netto").Value, 4, 0)
sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 4, 0) sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 4, 0)
@@ -901,8 +901,9 @@ Public Class frmMDMDatenverarbetiung
,trans.[OutletCountry] ,trans.[OutletCountry]
,trans.[OutletCode] ,trans.[OutletCode]
,trans.[OutletName] ,trans.[OutletName]
,trans.[ProductTypeCode] ,prod.[ProductDescription] Produkt
,trans.[TransactionVolume] as Transaktionsbetrag ,trans.ProductTypeCode
,trans.[TransactionVolume] as Liter
,trans.[AmminclVAT] as Gesamtbetrag ,trans.[AmminclVAT] as Gesamtbetrag
,trans.[TotalNetAmount] as Net ,trans.[TotalNetAmount] as Net
,trans.[VATAmount] as UST ,trans.[VATAmount] as UST
@@ -927,6 +928,7 @@ Public Class frmMDMDatenverarbetiung
from tblIDSTransactionsNew as trans from tblIDSTransactionsNew as trans
left join tbl_IDS_Kunden as Kunde on Kunde.CustomerCode = trans.CustomerCode And Kunde.KdNrAlt = 0 left join tbl_IDS_Kunden as Kunde on Kunde.CustomerCode = trans.CustomerCode And Kunde.KdNrAlt = 0
left join tbl_IDS_Kunden_ohne_Rabatt as KundeOhneR on KundeOhneR.CustomerCode = trans.CustomerCode left join tbl_IDS_Kunden_ohne_Rabatt as KundeOhneR on KundeOhneR.CustomerCode = trans.CustomerCode
left join tbl_IDS_Produkte as prod on prod.ProductTypeCode = trans.ProductTypeCode
where cast(trans.YearMonthDay as Date) = '" & DateTimePicker2.Text & "' and trans.UStVAn_ID is null", "FMZOLL") where cast(trans.YearMonthDay as Date) = '" & DateTimePicker2.Text & "' and trans.UStVAn_ID is null", "FMZOLL")
.LOAD() .LOAD()
@@ -945,6 +947,20 @@ Public Class frmMDMDatenverarbetiung
.Columns("KundeOhneRabatt").Visible = False .Columns("KundeOhneRabatt").Visible = False
.Columns("UStVAn_ID").Visible = False .Columns("UStVAn_ID").Visible = False
.Columns("OutletCountryCode").Visible = False
.Columns("OutletCode").Visible = False
.Columns("OutletName").Visible = False
.Columns("CalendarDate").Visible = False
.Columns("TransactionHHMM").Visible = False
.Columns("CalendarDate").Visible = False
.Columns("CardNumber").Visible = False
.Columns("CardComments").Visible = False
.Columns("EmissionNumber").Visible = False
.Columns("ProductTypeCode").Visible = False
'For Each r As DataGridViewColumn In .Columns 'For Each r As DataGridViewColumn In .Columns
' If r.Name = "VERAGLeistungsNr" Or r.Name = "VERAGKdNr" Then ' If r.Name = "VERAGLeistungsNr" Or r.Name = "VERAGKdNr" Then
' r.ReadOnly = False ' r.ReadOnly = False
@@ -989,7 +1005,7 @@ Public Class frmMDMDatenverarbetiung
Dim sumTr As Double = 0 Dim sumTr As Double = 0
For Each r As DataGridViewRow In .Rows For Each r As DataGridViewRow In .Rows
sumGes += If(IsNumeric(r.Cells("Gesamtbetrag").Value), CDbl(r.Cells("Gesamtbetrag").Value), 0) sumGes += If(IsNumeric(r.Cells("Gesamtbetrag").Value), CDbl(r.Cells("Gesamtbetrag").Value), 0)
sumTr += If(IsNumeric(r.Cells("Transaktionsbetrag").Value), CDbl(r.Cells("Transaktionsbetrag").Value), 0) sumTr += If(IsNumeric(r.Cells("Liter").Value), CDbl(r.Cells("Liter").Value), 0)
sumFee += If(IsNumeric(r.Cells("Net").Value), CDbl(r.Cells("Net").Value), 0) sumFee += If(IsNumeric(r.Cells("Net").Value), CDbl(r.Cells("Net").Value), 0)
Next Next
@@ -1001,7 +1017,7 @@ Public Class frmMDMDatenverarbetiung
lblTTRSum.Visible = True lblTTRSum.Visible = True
txtTTRSum.Visible = True txtTTRSum.Visible = True
lblTTRSum.Text = "Tr-Kosten" lblTTRSum.Text = "Liter"
.ClearSelection() .ClearSelection()
@@ -3822,7 +3838,7 @@ Public Class frmMDMDatenverarbetiung
Return False Return False
End If End If
Dim sqlStringfehlendeKdNr = "SELECT count(*) from tblIDSTransactionsNew as trans left join tbl_IDS_Kunden as Kunde on Kunde.CustomerCode = trans.CustomerCode where cast(trans.YearMonthDay as Date) = '" & DateTimePicker2.Text & "' and Kunde.CustomerCode is null and trans.[CustomerCode] not in (60004479,60013994)" 'Verag360 und VeragAG Dim sqlStringfehlendeKdNr = "SELECT count(*) from tblIDSTransactionsNew as trans left join tbl_IDS_Kunden as Kunde on Kunde.CustomerCode = trans.CustomerCode where cast(trans.YearMonthDay as Date) = '" & DateTimePicker2.Text & "' and Kunde.CustomerCode is null and trans.[CustomerCode] not in (60004479,60025994)" 'Verag360 und VeragAG
Dim fehlendeKdNr As Integer = CInt((New SQL).getValueTxtBySql(sqlStringfehlendeKdNr, "FMZOLL")) Dim fehlendeKdNr As Integer = CInt((New SQL).getValueTxtBySql(sqlStringfehlendeKdNr, "FMZOLL"))
If fehlendeKdNr > 0 Then If fehlendeKdNr > 0 Then
@@ -3832,19 +3848,15 @@ Public Class frmMDMDatenverarbetiung
End If End If
'Dim nichtAufAbgerechnetGesetzteTransactionen As Integer = 0 Dim OBONumberOderVRNumberfehlern As Integer = 0
'nichtAufAbgerechnetGesetzteTransactionen = CInt((New SQL).getValueTxtBySql("select count (*) FROM [VERAG].[dbo].[tblMSESettlements] as bills inner join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id] where trans.[transaction_status] <> 'Billed' and [invoice_date] = '" & DateTimePicker2.Text & "'", "FMZOLL")) OBONumberOderVRNumberfehlern = CInt((New SQL).getValueTxtBySql("select count(*) from [tblIDSTransactionsNew] WHERE cast(YearMonthDay as Date) = '" & DateTimePicker2.Text & "' AND [UStVAn_ID] is null AND [VRNumber] is null AND [OBONumber] is null", "FMZOLL"))
'If nichtAufAbgerechnetGesetzteTransactionen > 0 Then If OBONumberOderVRNumberfehlern > 0 Then
' Dim hint As String = "" Dim hint As String = ""
' pruefData_IDS = False pruefData_IDS = False
' If nichtAufAbgerechnetGesetzteTransactionen > 500 Then MsgBox("Bei " & OBONumberOderVRNumberfehlern & " Transaktionen fehlt die OBONumber oder VRNumber!" & vbNewLine & "Diese Transaktionen (von Rechnung " & DateTimePicker2.Text & ") müssen aktualisiert werden. (bitte an Administrator wenden).")
' hint = "Batch-Nr: " End If
' hint &= SQL.getValueTxtBySql("select distinct(trans.batch_seq_nr) FROM [VERAG].[dbo].[tblMSESettlements] as bills inner join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id] where trans.[transaction_status] <> 'Billed' and [invoice_date] = '" & DateTimePicker2.Text & "'", "FMZOLL")
' End If
' MsgBox("Es sind " & nichtAufAbgerechnetGesetzteTransactionen & " Transaktionen in der Datenbank, die noch nicht auf VERRECHNET gesetzt sind!" & vbNewLine & "Diese Transaktionen (von Rechnung " & DateTimePicker2.Text & ") müssen aktualisiert werden. (bitte an Administrator wenden)." & IIf(hint <> "", vbNewLine & hint, ""))
'End If
''das muss die letzte Prüfung sein, da uU eine Transaktion fehlen kann! ''das muss die letzte Prüfung sein, da uU eine Transaktion fehlen kann!
@@ -4167,6 +4179,8 @@ Public Class frmMDMDatenverarbetiung
'Return False 'Return False
If Not LIEFERANT = "IDS" Then Return False If Not LIEFERANT = "IDS" Then Return False
If MyDatagridview1.Rows.Count = 0 Then If MyDatagridview1.Rows.Count = 0 Then
@@ -4176,6 +4190,9 @@ Public Class frmMDMDatenverarbetiung
Dim i As Integer = 0 Dim i As Integer = 0
Try
For Each row In MyDatagridview1.Rows For Each row In MyDatagridview1.Rows
Dim kundeOhneRabatt = True Dim kundeOhneRabatt = True
@@ -4326,6 +4343,12 @@ RabattBerechnen:
Next Next
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
Me.Cursor = Cursors.Default
End Try
initDgv_IDS() initDgv_IDS()
MsgBox(i & " Rechenwerte wurden gesetzt!") MsgBox(i & " Rechenwerte wurden gesetzt!")
@@ -4563,7 +4586,6 @@ RabattBerechnen:
Private Sub cbxBelegeerstellt_CheckedChanged(sender As Object, e As EventArgs) Handles cbxBelegeerstellt.CheckedChanged Private Sub cbxBelegeerstellt_CheckedChanged(sender As Object, e As EventArgs) Handles cbxBelegeerstellt.CheckedChanged
If Me.LIEFERANT = "ASFINAG" Then If Me.LIEFERANT = "ASFINAG" Then
If cbxBelegeerstellt.Checked Then If cbxBelegeerstellt.Checked Then
Panel2.Enabled = False Panel2.Enabled = False
bntDatumsetzen.Enabled = False bntDatumsetzen.Enabled = False
@@ -4587,7 +4609,11 @@ RabattBerechnen:
End Sub End Sub
Private Sub btnRechenwertesetzen_Click(sender As Object, e As EventArgs) Handles btnRechenwertesetzen.Click Private Sub btnRechenwertesetzen_Click(sender As Object, e As EventArgs) Handles btnRechenwertesetzen.Click
If vbYes = MsgBox("Haben Sie die Rechenwerte in den IDS-Tabellen aktualisiert?" & vbNewLine & "(Diese werden beim Importieren in die Abrechnungsdaten übernommen)", vbYesNoCancel) Then setRechenwerteIDS() If vbYes = MsgBox("Haben Sie die Rechenwerte in den IDS-Tabellen aktualisiert?" & vbNewLine & "(Diese werden beim Importieren in die Abrechnungsdaten übernommen)", vbYesNoCancel) Then
Me.Cursor = Cursors.WaitCursor
setRechenwerteIDS()
Me.Cursor = Cursors.Default
End If
End Sub End Sub
Private Sub Button10_Click_1(sender As Object, e As EventArgs) Handles Button10.Click Private Sub Button10_Click_1(sender As Object, e As EventArgs) Handles Button10.Click

2
SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.vb
View File

@@ -591,7 +591,7 @@ Public Class usrCntlMDMDatenverarbeitungAuswertungen_divers
FROM Offerten FROM Offerten
WHERE Offerten.KundenNr = ISNULL(tblIDSTransactionsNew.KdNrVERAG, 0) WHERE Offerten.KundenNr = ISNULL(tblIDSTransactionsNew.KdNrVERAG, 0)
AND Offerten.OffertenNr = 21) IS NULL)) AND Offerten.OffertenNr = 21) IS NULL))
AND CustomerCode not in (60013994, 60004479) AND CustomerCode not in (60004479,60025994)
ORDER BY ORDER BY
tblIDSTransactionsNew.[CustomerCode];" tblIDSTransactionsNew.[CustomerCode];"

2
SDL/zoll/usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER.vb
View File

@@ -78,7 +78,7 @@ Public Class usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER
Dim betrag As Double = CDbl(line.Substring(63, 16).Trim) Dim betrag As Double = CDbl(line.Substring(63, 16).Trim)
' Dim fakturiert = CDbl(SQL.DLookup("Betrag", "Zkteing", "[Status]='F' AND [Registriernummer]='" & atc & "' AND [AKTO]=" & AKTONr & "", "FMZOLL", "0")) ' Dim fakturiert = CDbl(SQL.DLookup("Betrag", "Zkteing", "[Status]='F' AND [Registriernummer]='" & atc & "' AND [AKTO]=" & AKTONr & "", "FMZOLL", "0"))
Dim fakturiert = CDbl(SQL.DLookup("sum(Preis)", "Rechnungsausgang inner join [RechnungsausgangPositionen] On Rechnungsausgang.RK_ID=[RechnungsausgangPositionen].RK_ID", " [Status]<>0 and DruckDatumZeit is not null and left([RechnungsausgangPositionen].Belegdaten,21)='" & atc & "' AND [AufschubkontoNr]='" & AKTO & "'", "FMZOLL", "0")) Dim fakturiert = CDbl(SQL.DLookup("sum(Preis)", "Rechnungsausgang inner join [RechnungsausgangPositionen] On Rechnungsausgang.RK_ID=[RechnungsausgangPositionen].RK_ID", " [Status]<>0 and DruckDatumZeit is not null and (left([RechnungsausgangPositionen].Belegdaten,21)='" & atc & "' or [RechnungsausgangPositionen].[Weitere_Reg_Nr] ='" & atc & "' )AND [AufschubkontoNr]='" & AKTO & "'", "FMZOLL", "0"))
Dim differenz = fakturiert - betrag Dim differenz = fakturiert - betrag

2
VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb
View File

@@ -231,7 +231,7 @@ Public Class cIDS
objFileRead.BaseStream.Seek(0, System.IO.SeekOrigin.Begin) objFileRead.BaseStream.Seek(0, System.IO.SeekOrigin.Begin)
Do While (objFileRead.Peek() > -1) 'header ignoríeren Do While (objFileRead.Peek() > -1)
Dim currentRow As String() Dim currentRow As String()
currentRow = objFileRead.ReadLine().Split(",") currentRow = objFileRead.ReadLine().Split(",")