diff --git a/SDL/Resources/KVI_report_general.xlsx b/SDL/Resources/KVI_report_general.xlsx index 8498e850..160e9f01 100644 Binary files a/SDL/Resources/KVI_report_general.xlsx and b/SDL/Resources/KVI_report_general.xlsx differ diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index d46eae12..80d9cb21 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -3304,7 +3304,7 @@ Public Class usrCntlSpeditionsBuchSuche Detailbericht = True End If - If kdnrsrch <0 Then + If kdnrsrch < 0 Then Dim inputKdNr = InputBox("Bitte KdNr eingeben", "Kundenauswertung generieren") If inputKdNr <> "" Then inputKdNr = inputKdNr.Trim() @@ -3650,7 +3650,7 @@ Public Class usrCntlSpeditionsBuchSuche RPT.RunReport_VERAG_ZA_DETAIL(770931, CDate(txtAbfertDat.Text), CDate(txtAbfertDatBis.Text)) 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 @@ -3974,8 +3974,7 @@ Class cSpeditionsbuchReport AbfVon As Date, AbfBis As Date, Optional whereStr As String = "", - Optional Open As Boolean = True, - Optional DL_Kosten As Boolean = False) As String + Optional Open As Boolean = True) As String Try Dim dt As DataTable = LoadSpeditionsbuchData(KDNR, AbfVon, AbfBis, whereStr) If dt Is Nothing OrElse dt.Rows.Count = 0 Then @@ -3998,7 +3997,7 @@ Class cSpeditionsbuchReport blatt = datei.Worksheets(1) - CreateDetailReport(blatt, dt, KDNR, DL_Kosten) + CreateDetailReport(blatt, dt, KDNR) ' CreateGeneralReport(blatt, dt, KDNR, AbfVon, AbfBis) @@ -4038,7 +4037,8 @@ Class cSpeditionsbuchReport AbfVon As Date, AbfBis As Date, 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 Dim dt As DataTable = LoadSpeditionsbuchData(KDNR, AbfVon, AbfBis, whereStr) If dt Is Nothing OrElse dt.Rows.Count = 0 Then @@ -4061,7 +4061,7 @@ Class cSpeditionsbuchReport blatt = datei.Worksheets(1) - CreateGeneralReport(blatt, dt, KDNR, AbfVon, AbfBis) + CreateGeneralReport(blatt, dt, KDNR, AbfVon, AbfBis, DL_Kosten) datei.Save() @@ -4161,7 +4161,7 @@ Class cSpeditionsbuchReport Return cd 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 For Each r As DataRow In dt.Rows @@ -4175,7 +4175,7 @@ Class cSpeditionsbuchReport If(r("AbfertigungsNr"), "").ToString()) End If 's - WriteDetailReportRow(blatt, r, cd, cnt, kdnr, DL_Kosten) + WriteDetailReportRow(blatt, r, cd, cnt, kdnr) Catch ex As Exception MsgBox(ex.Message & vbCrLf & ex.StackTrace) @@ -4187,7 +4187,7 @@ Class cSpeditionsbuchReport dt As DataTable, kdnr As Integer, AbfVon As Date, - AbfBis As Date) + AbfBis As Date, Optional DL_Kosten As Boolean = False) blatt.Range("I1").Value = AbfVon.ToShortDateString & "-" & AbfBis.ToShortDateString Dim cnt As Integer = 3 @@ -4203,7 +4203,7 @@ Class cSpeditionsbuchReport If(r("AbfertigungsNr"), "").ToString()) End If - WriteGeneralReportRow(blatt, r, cd, cnt, kdnr) + WriteGeneralReportRow(blatt, r, cd, cnt, kdnr, DL_Kosten) Catch ex As Exception MsgBox(ex.Message & vbCrLf & ex.StackTrace) @@ -4215,17 +4215,12 @@ Class cSpeditionsbuchReport r As DataRow, cd As cVERAG_CustomsDeclarations, ByRef cnt As Integer, - kdnrsrch As Integer, - Optional DL_Kosten As Boolean = False) + kdnrsrch As Integer) 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 @@ -4296,9 +4291,6 @@ Class cSpeditionsbuchReport blatt.Range("AD" & cnt).Value = If(IsItemCBAM(item), "Y", "N") blatt.Range("AE" & cnt).Value = item.GetInvoiceListString() - If DL_Kosten Then - blatt.Range("AF" & cnt).Value = dienstleistungsKosten - End If cnt += 1 @@ -4360,10 +4352,6 @@ Class cSpeditionsbuchReport blatt.Range("AD" & cnt).Value = "" blatt.Range("AE" & cnt).Value = "" - If DL_Kosten Then - blatt.Range("AF" & cnt).Value = dienstleistungsKosten - End If - cnt += 1 End If @@ -4378,9 +4366,7 @@ Class cSpeditionsbuchReport blatt.Range("F" & cnt).Value = kdAtrNr blatt.Range("G" & cnt).Value = r("BelegNr") - If DL_Kosten Then - blatt.Range("AF" & cnt).Value = dienstleistungsKosten - End If + cnt += 1 @@ -4521,10 +4507,19 @@ Class cSpeditionsbuchReport r As DataRow, cd As cVERAG_CustomsDeclarations, 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) + blatt.Range("A" & cnt).Value = cnt - 2 blatt.Range("B" & cnt).Value = r("Abfertigungsnummer") 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("N" & cnt).Value = GetItemsDescription(cd) blatt.Range("O" & cnt).Value = cd.za_CountryDispatch & " --> " & cd.za_CountryDestination + + + If DL_Kosten Then + blatt.Range("P" & cnt).Value = dienstleistungsKosten + End If + + Else + If DL_Kosten Then + blatt.Range("I" & cnt).Value = dienstleistungsKosten + End If End If + cnt += 1 End Sub