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

kvi rpt

Browse Source
This commit is contained in:
Andreas Luxbauer
2026-06-12 14:22:04 +02:00
parent b64b15fea0
commit 696df5c367
2 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
SDL/Resources/KVI_report_general.xlsx
View File

Binary file not shown.

62
SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
View File

@@ -3650,7 +3650,7 @@ Public Class usrCntlSpeditionsBuchSuche
RPT.RunReport_VERAG_ZA_DETAIL(770931, CDate(txtAbfertDat.Text), CDate(txtAbfertDatBis.Text)) RPT.RunReport_VERAG_ZA_DETAIL(770931, CDate(txtAbfertDat.Text), CDate(txtAbfertDatBis.Text))
Else Else
RPT.RunReport_VERAG_ZA_GENERAL(770931, CDate(txtAbfertDat.Text), CDate(txtAbfertDatBis.Text)) RPT.RunReport_VERAG_ZA_GENERAL(770931, CDate(txtAbfertDat.Text), CDate(txtAbfertDatBis.Text),,, CheckBox5.Checked)
End If End If
@@ -3974,8 +3974,7 @@ Class cSpeditionsbuchReport
AbfVon As Date, AbfVon As Date,
AbfBis As Date, AbfBis As Date,
Optional whereStr As String = "", Optional whereStr As String = "",
Optional Open As Boolean = True, Optional Open As Boolean = True) As String
Optional DL_Kosten As Boolean = False) As String
Try Try
Dim dt As DataTable = LoadSpeditionsbuchData(KDNR, AbfVon, AbfBis, whereStr) Dim dt As DataTable = LoadSpeditionsbuchData(KDNR, AbfVon, AbfBis, whereStr)
If dt Is Nothing OrElse dt.Rows.Count = 0 Then If dt Is Nothing OrElse dt.Rows.Count = 0 Then
@@ -3998,7 +3997,7 @@ Class cSpeditionsbuchReport
blatt = datei.Worksheets(1) blatt = datei.Worksheets(1)
CreateDetailReport(blatt, dt, KDNR, DL_Kosten) CreateDetailReport(blatt, dt, KDNR)
' CreateGeneralReport(blatt, dt, KDNR, AbfVon, AbfBis) ' CreateGeneralReport(blatt, dt, KDNR, AbfVon, AbfBis)
@@ -4038,7 +4037,8 @@ Class cSpeditionsbuchReport
AbfVon As Date, AbfVon As Date,
AbfBis As Date, AbfBis As Date,
Optional whereStr As String = "", Optional whereStr As String = "",
Optional Open As Boolean = True) As String Optional Open As Boolean = True,
Optional DL_Kosten As Boolean = False) As String
Try Try
Dim dt As DataTable = LoadSpeditionsbuchData(KDNR, AbfVon, AbfBis, whereStr) Dim dt As DataTable = LoadSpeditionsbuchData(KDNR, AbfVon, AbfBis, whereStr)
If dt Is Nothing OrElse dt.Rows.Count = 0 Then If dt Is Nothing OrElse dt.Rows.Count = 0 Then
@@ -4061,7 +4061,7 @@ Class cSpeditionsbuchReport
blatt = datei.Worksheets(1) blatt = datei.Worksheets(1)
CreateGeneralReport(blatt, dt, KDNR, AbfVon, AbfBis) CreateGeneralReport(blatt, dt, KDNR, AbfVon, AbfBis, DL_Kosten)
datei.Save() datei.Save()
@@ -4161,7 +4161,7 @@ Class cSpeditionsbuchReport
Return cd Return cd
End Function End Function
Private Sub CreateDetailReport(blatt As Object, dt As DataTable, kdnr As Integer, Optional DL_Kosten As Boolean = False) Private Sub CreateDetailReport(blatt As Object, dt As DataTable, kdnr As Integer)
Dim cnt As Integer = 2 Dim cnt As Integer = 2
For Each r As DataRow In dt.Rows For Each r As DataRow In dt.Rows
@@ -4175,7 +4175,7 @@ Class cSpeditionsbuchReport
If(r("AbfertigungsNr"), "").ToString()) If(r("AbfertigungsNr"), "").ToString())
End If End If
's 's
WriteDetailReportRow(blatt, r, cd, cnt, kdnr, DL_Kosten) WriteDetailReportRow(blatt, r, cd, cnt, kdnr)
Catch ex As Exception Catch ex As Exception
MsgBox(ex.Message & vbCrLf & ex.StackTrace) MsgBox(ex.Message & vbCrLf & ex.StackTrace)
@@ -4187,7 +4187,7 @@ Class cSpeditionsbuchReport
dt As DataTable, dt As DataTable,
kdnr As Integer, kdnr As Integer,
AbfVon As Date, AbfVon As Date,
AbfBis As Date) AbfBis As Date, Optional DL_Kosten As Boolean = False)
blatt.Range("I1").Value = AbfVon.ToShortDateString & "-" & AbfBis.ToShortDateString blatt.Range("I1").Value = AbfVon.ToShortDateString & "-" & AbfBis.ToShortDateString
Dim cnt As Integer = 3 Dim cnt As Integer = 3
@@ -4203,7 +4203,7 @@ Class cSpeditionsbuchReport
If(r("AbfertigungsNr"), "").ToString()) If(r("AbfertigungsNr"), "").ToString())
End If End If
WriteGeneralReportRow(blatt, r, cd, cnt, kdnr) WriteGeneralReportRow(blatt, r, cd, cnt, kdnr, DL_Kosten)
Catch ex As Exception Catch ex As Exception
MsgBox(ex.Message & vbCrLf & ex.StackTrace) MsgBox(ex.Message & vbCrLf & ex.StackTrace)
@@ -4215,17 +4215,12 @@ Class cSpeditionsbuchReport
r As DataRow, r As DataRow,
cd As cVERAG_CustomsDeclarations, cd As cVERAG_CustomsDeclarations,
ByRef cnt As Integer, ByRef cnt As Integer,
kdnrsrch As Integer, kdnrsrch As Integer)
Optional DL_Kosten As Boolean = False)
Dim kdAtrNr As String = NormalizeKdAuftragsNr(r("KdAuftragsNr"), kdnrsrch) Dim kdAtrNr As String = NormalizeKdAuftragsNr(r("KdAuftragsNr"), kdnrsrch)
Dim dienstleistungsKosten As Decimal = 0D
If DL_Kosten Then
blatt.Range("AF1").Value = "Service Costs"
dienstleistungsKosten = GetDienstleistungskosten(r, kdnrsrch)
End If
If cd IsNot Nothing AndAlso cd.hasEntry Then If cd IsNot Nothing AndAlso cd.hasEntry Then
@@ -4296,9 +4291,6 @@ Class cSpeditionsbuchReport
blatt.Range("AD" & cnt).Value = If(IsItemCBAM(item), "Y", "N") blatt.Range("AD" & cnt).Value = If(IsItemCBAM(item), "Y", "N")
blatt.Range("AE" & cnt).Value = item.GetInvoiceListString() blatt.Range("AE" & cnt).Value = item.GetInvoiceListString()
If DL_Kosten Then
blatt.Range("AF" & cnt).Value = dienstleistungsKosten
End If
cnt += 1 cnt += 1
@@ -4360,10 +4352,6 @@ Class cSpeditionsbuchReport
blatt.Range("AD" & cnt).Value = "" blatt.Range("AD" & cnt).Value = ""
blatt.Range("AE" & cnt).Value = "" blatt.Range("AE" & cnt).Value = ""
If DL_Kosten Then
blatt.Range("AF" & cnt).Value = dienstleistungsKosten
End If
cnt += 1 cnt += 1
End If End If
@@ -4378,9 +4366,7 @@ Class cSpeditionsbuchReport
blatt.Range("F" & cnt).Value = kdAtrNr blatt.Range("F" & cnt).Value = kdAtrNr
blatt.Range("G" & cnt).Value = r("BelegNr") blatt.Range("G" & cnt).Value = r("BelegNr")
If DL_Kosten Then
blatt.Range("AF" & cnt).Value = dienstleistungsKosten
End If
cnt += 1 cnt += 1
@@ -4521,10 +4507,19 @@ Class cSpeditionsbuchReport
r As DataRow, r As DataRow,
cd As cVERAG_CustomsDeclarations, cd As cVERAG_CustomsDeclarations,
ByRef cnt As Integer, ByRef cnt As Integer,
kdnrsrch As Integer) kdnrsrch As Integer,
Optional DL_Kosten As Boolean = False)
Dim dienstleistungsKosten As Decimal = 0D
If DL_Kosten Then
blatt.Range("P2").Value = "Service Costs"
dienstleistungsKosten = GetDienstleistungskosten(r, kdnrsrch)
End If
Dim kdAtrNr As String = NormalizeKdAuftragsNr(r("KdAuftragsNr"), kdnrsrch) Dim kdAtrNr As String = NormalizeKdAuftragsNr(r("KdAuftragsNr"), kdnrsrch)
blatt.Range("A" & cnt).Value = cnt - 2 blatt.Range("A" & cnt).Value = cnt - 2
blatt.Range("B" & cnt).Value = r("Abfertigungsnummer") blatt.Range("B" & cnt).Value = r("Abfertigungsnummer")
blatt.Range("C" & cnt).Value = r("Abfertigungsdatum") blatt.Range("C" & cnt).Value = r("Abfertigungsdatum")
@@ -4545,8 +4540,19 @@ Class cSpeditionsbuchReport
blatt.Range("M" & cnt).Value = GetPartyName(cd, cVERAG_CustomsDeclarations.DECLARANT_ROLES, "") blatt.Range("M" & cnt).Value = GetPartyName(cd, cVERAG_CustomsDeclarations.DECLARANT_ROLES, "")
blatt.Range("N" & cnt).Value = GetItemsDescription(cd) blatt.Range("N" & cnt).Value = GetItemsDescription(cd)
blatt.Range("O" & cnt).Value = cd.za_CountryDispatch & " --> " & cd.za_CountryDestination blatt.Range("O" & cnt).Value = cd.za_CountryDispatch & " --> " & cd.za_CountryDestination
If DL_Kosten Then
blatt.Range("P" & cnt).Value = dienstleistungsKosten
End If End If
Else
If DL_Kosten Then
blatt.Range("I" & cnt).Value = dienstleistungsKosten
End If
End If
cnt += 1 cnt += 1
End Sub End Sub