Kundenblatt, etc.
This commit is contained in:
@@ -124,12 +124,8 @@ Public Class usrCntlMDMAuswertungen
|
||||
" ,[FilialenNr],[AbfertigungsNr],[UnterNr] " &
|
||||
" ,CONVERT(VARCHAR(10), [Abfertigungsdatum], 104) as [Abfertigungsdatum] " &
|
||||
" ,isnull(Adressen.WölflKundenNr,'') as WölflKundenNr " &
|
||||
" ,CASE WHEN [EmpfängerStraße] IS NULL THEN [EmpfängerName 1] " &
|
||||
" ELSE [EmpfängerName 1] + ' ' +[EmpfängerName 2] " &
|
||||
" END AS [Empfänger] " &
|
||||
" ,CASE WHEN [EmpfängerStraße] IS NULL THEN [EmpfängerName 2] " &
|
||||
" ELSE [EmpfängerStraße] " &
|
||||
" END AS [EmpfängerAdresse 1] " &
|
||||
" ,CASE WHEN [EmpfängerName 2] IS NULL THEN isnull([EmpfängerName 1],'') ELSE isnull([EmpfängerName 1],'') + ' ' + ISNULL([EmpfängerName 2],'') END AS [Empfänger] " &
|
||||
" ,CASE WHEN [EmpfängerStraße] IS NULL THEN isnull([EmpfängerName 2],'') ELSE [EmpfängerStraße] END AS [EmpfängerAdresse 1] " &
|
||||
" ,[EmpfängerOrt] as [EmpfängerAdresse 2] " &
|
||||
" ,[Packstücke und Warenbezeichnung] as Beschreibung,[LeistungsNr],[LeistungsBez],[Steuersatz %] ,[SteuerpflichtigerGesamtbetrag] as [SteuerpflichtigerGesamtbetrag Netto] " &
|
||||
" ,[SteuerfreierGesamtbetrag],[SteuerpflichtigerBetrag] as [SteuerpflichtigerBetrag Netto] ,[SteuerfreierBetrag] " &
|
||||
@@ -154,9 +150,50 @@ Public Class usrCntlMDMAuswertungen
|
||||
End Try
|
||||
Dim clmns As String = ""
|
||||
|
||||
For Each r As DataRow In dt.Rows
|
||||
|
||||
If r.Item("LeistungsBez").ToString.Contains("00/23") Or r.Item("LeistungsBez").ToString.Contains("DL/23") Then
|
||||
|
||||
Dim antragsID As Integer = CInt(SQL.getValueTxtBySql("SELECT UStVAn_ID FROM tblUStVAntrag WHERE FilialenNr = " & r.Item("FilialenNr").ToString & " AND AbfertigungsNr = " & r.Item("AbfertigungsNr").ToString, "FMZOLL"))
|
||||
|
||||
If antragsID > 0 Then
|
||||
Dim MWSTAntrag As New cUSTVAntrag(antragsID)
|
||||
|
||||
Dim MonthStart As String = IIf(CDate(MWSTAntrag.UStVAn_ReDatVon).Month < 10, "0", "") & CDate(MWSTAntrag.UStVAn_ReDatVon).Month
|
||||
Dim MonthEnd As String = IIf(CDate(MWSTAntrag.UStVAn_ReDatBis).Month < 10, "0", "") & CDate(MWSTAntrag.UStVAn_ReDatBis).Month
|
||||
|
||||
Dim LeistungsBez As String = ""
|
||||
LeistungsBez = r.Item("LeistungsBez").ToString()
|
||||
|
||||
If LeistungsBez.Contains("00-00/23") Then
|
||||
LeistungsBez = LeistungsBez.Replace("00/23", "/" & CDate(MWSTAntrag.UStVAn_ReDatBis).Year.ToString.Substring(2))
|
||||
ElseIf LeistungsBez.Contains("DL/23") Then
|
||||
LeistungsBez = LeistungsBez.Replace("DL/23", "/" & CDate(MWSTAntrag.UStVAn_ReDatBis).Year.ToString.Substring(2))
|
||||
Else
|
||||
LeistungsBez = LeistungsBez.Replace("/23", "/" & CDate(MWSTAntrag.UStVAn_ReDatBis).Year.ToString.Substring(2))
|
||||
End If
|
||||
|
||||
If LeistungsBez.Contains("-00") Then
|
||||
LeistungsBez = LeistungsBez.Replace("-00", MonthStart & "-" & MonthEnd)
|
||||
ElseIf LeistungsBez.Contains("00-") Then
|
||||
LeistungsBez = LeistungsBez.Replace("00-", MonthStart & "-" & MonthEnd)
|
||||
ElseIf LeistungsBez.Contains("00") Then
|
||||
LeistungsBez = LeistungsBez.Replace("00", MonthStart & "-" & MonthEnd)
|
||||
End If
|
||||
|
||||
r.Item("LeistungsBez") = LeistungsBez
|
||||
|
||||
End If
|
||||
|
||||
|
||||
End If
|
||||
|
||||
Next
|
||||
|
||||
|
||||
For i = 0 To dt.Columns.Count - 1
|
||||
clmns &= dt.Columns(i).ColumnName.ToString().Replace(";", ",") & ";"
|
||||
|
||||
Next
|
||||
|
||||
outFile.WriteLine(clmns)
|
||||
@@ -164,7 +201,10 @@ Public Class usrCntlMDMAuswertungen
|
||||
clmns = ""
|
||||
For j = 0 To dt.Columns.Count - 1
|
||||
Dim o As Object = dt.Rows(i).Item(j).ToString
|
||||
|
||||
|
||||
clmns &= dt.Rows(i).Item(j).ToString().Replace(vbNewLine, "").Replace(vbCr, "").Replace(vbLf, "").Replace("\n", "").Replace("\r", "").Replace(vbCrLf, "") & ";"
|
||||
|
||||
' If Not o Is Nothing AndAlso Not o.value Is Nothing Then
|
||||
'clmns &= o.Value.ToString().Replace(";", ",") & ";"
|
||||
' Else
|
||||
|
||||
Reference in New Issue
Block a user