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

Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

Browse Source
This commit is contained in:
d.breimaier
2026-06-12 14:26:54 +02:00
parent ba0fc69d9c 5076f0a081
commit 35ebba5103
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.

64
SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
View File

@@ -3320,7 +3320,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()
@@ -3666,7 +3666,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
@@ -3990,8 +3990,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
@@ -4014,7 +4013,7 @@ Class cSpeditionsbuchReport
blatt = datei.Worksheets(1)
CreateDetailReport(blatt, dt, KDNR, DL_Kosten)
CreateDetailReport(blatt, dt, KDNR)
' CreateGeneralReport(blatt, dt, KDNR, AbfVon, AbfBis)
@@ -4054,7 +4053,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
@@ -4077,7 +4077,7 @@ Class cSpeditionsbuchReport
blatt = datei.Worksheets(1)
CreateGeneralReport(blatt, dt, KDNR, AbfVon, AbfBis)
CreateGeneralReport(blatt, dt, KDNR, AbfVon, AbfBis, DL_Kosten)
datei.Save()
@@ -4177,7 +4177,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
@@ -4191,7 +4191,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)
@@ -4203,7 +4203,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
@@ -4219,7 +4219,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)
@@ -4231,17 +4231,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
@@ -4312,9 +4307,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
@@ -4376,10 +4368,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
@@ -4394,9 +4382,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
@@ -4537,10 +4523,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")
@@ -4561,8 +4556,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