gesamtischerheiten, etc.
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
Imports GrapeCity.Enterprise.Data.Expressions.Tools
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
|
||||
Public Class frmGesamtsicherheitenNEU
|
||||
|
||||
@@ -226,34 +227,34 @@ Public Class frmGesamtsicherheitenNEU
|
||||
|
||||
End Sub
|
||||
|
||||
Public Sub LoadDataTableSicherheitenForZollamt(list As List(Of Integer), datumVon As Date, datumBis As Date, standort As String, Optional detailinfo As Boolean = False, Optional nurErstellungisNichtAenderungsdatum As Boolean = False)
|
||||
Public Sub LoadDataTableSicherheitenForZollamt(list As List(Of Integer), datumVon As Date, datumBis As Date, standort As String, Optional detailinfo As Boolean = False, Optional ausfVonBisEingeschraenkt As Boolean = False)
|
||||
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
|
||||
Dim currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(standort)
|
||||
|
||||
|
||||
Dim gsnr As String
|
||||
Dim counter = 0
|
||||
For Each n In list
|
||||
gsnr &= n.ToString()
|
||||
counter = counter + 1
|
||||
If (list.Count <> 0 And counter <> list.Count) Then
|
||||
gsnr &= ","
|
||||
End If
|
||||
'Dim gsnr As String
|
||||
'Dim counter = 0
|
||||
'For Each n In list
|
||||
' gsnr &= n.ToString()
|
||||
' counter = counter + 1
|
||||
' If (list.Count <> 0 And counter <> list.Count) Then
|
||||
' gsnr &= ","
|
||||
' End If
|
||||
|
||||
Next
|
||||
'Next
|
||||
|
||||
|
||||
Dim SQLStringSicherheit = " select * from (select gs_gsnr as 'Nr',[gs_ATBNr] as 'Reg-Nr. Verwahrlager " & standort & "', gs_MRNNr as MRN,'Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt' " & IIf(detailinfo, ", [gs_erstellungsdatum] as Erstellungsdatum, [gs_zuletztgeandert] as GeänderAm, [gs_systemuser] as Benutzer ", "") & "
|
||||
From [tblGesamtsicherheit]
|
||||
Where [gs_gsnr] In (" & gsnr & ") and isnull(gs_warenwert,0) <> 0
|
||||
UNION
|
||||
Select gsp_gsnr, [gsp_ATCNr],gsp_MRNNr,'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],'',[gsp_ust] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") &
|
||||
" From [tblGesamtsicherheitsPositionen]
|
||||
where [gsp_gsnr] In (" & gsnr & ")
|
||||
and isnull(gsp_warenwert,0) <> 0 ) as Temp WHERE Temp.Datum > '" & datumVon.ToShortDateString & "' and Temp.Datum <= '" & datumBis.ToShortDateString & "' " & IIf(nurErstellungisNichtAenderungsdatum, " AND (Temp.Erstellungsdatum is not null AND cast(Temp.Erstellungsdatum as Date) <> cast(Temp.Datum as Date)) OR (Temp.GeänderAm is not null AND cast(Temp.GeänderAm as Date) <> cast(Temp.Datum as Date))", "") &
|
||||
"order by Temp.Datum, Temp.Uhrzeit "
|
||||
'Dim SQLStringSicherheit = " select * from (select gs_gsnr as 'Nr',[gs_ATBNr] as 'Reg-Nr. Verwahrlager " & standort & "', gs_MRNNr as MRN,'Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt' " & IIf(detailinfo, ", [gs_erstellungsdatum] as Erstellungsdatum, [gs_zuletztgeandert] as GeänderAm, [gs_systemuser] as Benutzer ", "") & "
|
||||
' From [tblGesamtsicherheit]
|
||||
' Where [gs_gsnr] In (" & gsnr & ") and isnull(gs_warenwert,0) <> 0
|
||||
' UNION
|
||||
' Select gsp_gsnr, [gsp_ATCNr],gsp_MRNNr,'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],'',[gsp_ust] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") &
|
||||
' " From [tblGesamtsicherheitsPositionen]
|
||||
' where [gsp_gsnr] In (" & gsnr & ")
|
||||
' and isnull(gsp_warenwert,0) <> 0 ) as Temp WHERE Temp.Datum > '" & datumVon.ToShortDateString & "' and Temp.Datum <= '" & datumBis.ToShortDateString & "' " & IIf(nurErstellungisNichtAenderungsdatum, " AND (Temp.Erstellungsdatum is not null AND cast(Temp.Erstellungsdatum as Date) <> cast(Temp.Datum as Date)) OR (Temp.GeänderAm is not null AND cast(Temp.GeänderAm as Date) <> cast(Temp.Datum as Date))", "") &
|
||||
' "order by Temp.Datum, Temp.Uhrzeit "
|
||||
|
||||
|
||||
|
||||
@@ -263,17 +264,17 @@ Public Class frmGesamtsicherheitenNEU
|
||||
[gs_gsnr] In (
|
||||
SELECT [gs_gsnr]
|
||||
FROM tblGesamtsicherheit
|
||||
WHERE gs_standort = '" & standort & "'AND cast(gs_datum as Date) between '" & datumVon.ToShortDateString & "' and '" & datumBis.ToShortDateString & "' )
|
||||
WHERE gs_standort = '" & standort & "' AND cast(gs_datum as Date) > '" & datumVon.ToShortDateString & "' AND cast(gs_datum as Date) <= '" & datumBis.ToShortDateString & "' )
|
||||
and isnull(gs_sicherheitsbetrag,0) <> 0
|
||||
and gs_datum is not null
|
||||
UNION
|
||||
Select gsp_gsnr, [gsp_ATCNr],gsp_MRNNr,'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],'',[gsp_ust] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") & " From [tblGesamtsicherheitsPositionen]
|
||||
Where gsp_gsnr In (
|
||||
|
||||
SELECT [gs_gsnr] FROM tblGesamtsicherheit WHERE gs_standort = '" & standort & "' AND cast(gs_datum as Date) between '" & datumVon.ToShortDateString & "' and '" & datumBis.ToShortDateString & "'
|
||||
SELECT [gs_gsnr] FROM tblGesamtsicherheit WHERE gs_standort = '" & standort & "' AND cast(gs_datum as Date) > '" & datumVon.ToShortDateString & "' AND cast(gs_datum as Date) <= '" & datumBis.ToShortDateString & "'
|
||||
|
||||
) and isnull(gsp_sicherheitsbetrag,0) <> 0
|
||||
and gsp_datum is not null
|
||||
and gsp_datum is not null AND cast(gsp_datum as Date) > '" & datumVon.ToShortDateString & "' AND cast(gsp_datum as Date) <= '" & datumBis.ToShortDateString & "'
|
||||
) as Temp order by Temp.Datum, Temp.Uhrzeit "
|
||||
|
||||
dtSicherheiten = SQL.loadDgvBySql(SQLStringSicherheit_new, "AVISO", 100, True)
|
||||
@@ -317,8 +318,79 @@ Public Class frmGesamtsicherheitenNEU
|
||||
|
||||
dtSicherheiten.Rows.InsertAt(drLast, dtSicherheiten.Rows.Count)
|
||||
|
||||
If ausfVonBisEingeschraenkt Then
|
||||
|
||||
Dim indexOffirstEntry As Integer = -1
|
||||
Dim indexOflastEntry As Integer = -1
|
||||
Dim startSaldo As Double = -1
|
||||
Dim endSaldo As Double = -1
|
||||
If ausfVonBisEingeschraenkt Then
|
||||
For Each r As DataRow In dtSicherheiten.Rows
|
||||
If CInt(r.Item("Nr")) <> 0 AndAlso Not IsDBNull(r.Item("Datum")) AndAlso IsDate(r.Item("Datum")) AndAlso CDate(r.Item("Datum")) >= datumVon Then
|
||||
If indexOffirstEntry < 0 Then
|
||||
indexOffirstEntry = dtSicherheiten.Rows.IndexOf(r)
|
||||
startSaldo = r.Item("Saldo") - r.Item("Sicherheitbetrag_Calc")
|
||||
End If
|
||||
End If
|
||||
|
||||
If CInt(r.Item("Nr")) <> 0 AndAlso Not IsDBNull(r.Item("Datum")) AndAlso IsDate(r.Item("Datum")) AndAlso CDate(r.Item("Datum")) >= datumVon Then
|
||||
|
||||
If CDate(r.Item("Datum")) > datumBis Then
|
||||
|
||||
If indexOflastEntry < 0 Then
|
||||
indexOflastEntry = dtSicherheiten.Rows.IndexOf(r) - 1
|
||||
endSaldo = r.Item("Saldo") + (r.Item("Sicherheitbetrag_Calc") * -1)
|
||||
End If
|
||||
Else
|
||||
|
||||
|
||||
indexOflastEntry = dtSicherheiten.Rows.IndexOf(r)
|
||||
endSaldo = r.Item("Saldo")
|
||||
|
||||
End If
|
||||
|
||||
|
||||
End If
|
||||
Next
|
||||
End If
|
||||
|
||||
Dim sicherheiten_cleared As DataTable = dtSicherheiten.Clone()
|
||||
Dim counter As Integer = 1
|
||||
|
||||
For Each row_insert As DataRow In dtSicherheiten.Rows
|
||||
Dim idx As Integer = dtSicherheiten.Rows.IndexOf(row_insert)
|
||||
|
||||
If idx >= indexOffirstEntry AndAlso idx <= indexOflastEntry Then
|
||||
Dim newRow As DataRow = sicherheiten_cleared.NewRow()
|
||||
newRow.ItemArray = row_insert.ItemArray.Clone()
|
||||
sicherheiten_cleared.Rows.Add(newRow)
|
||||
|
||||
counter += 1
|
||||
End If
|
||||
Next
|
||||
|
||||
Dim drFirst_new = sicherheiten_cleared.NewRow
|
||||
drFirst_new.Item("Nr") = 0
|
||||
drFirst_new.Item("Typ") = "Uebertrag vom"
|
||||
drFirst_new.Item("Datum") = CDate(datumVon).ToShortDateString
|
||||
drFirst_new.Item("Saldo") = CDbl(startSaldo)
|
||||
|
||||
sicherheiten_cleared.Rows.InsertAt(drFirst_new, 0)
|
||||
|
||||
Dim drLast_new = sicherheiten_cleared.NewRow
|
||||
|
||||
drLast_new.Item("Nr") = 0
|
||||
drLast_new.Item("Typ") = "Saldo zum"
|
||||
drLast_new.Item("Datum") = CDate(datumBis).ToShortDateString
|
||||
drLast_new.Item("Saldo") = CDbl(endSaldo)
|
||||
|
||||
sicherheiten_cleared.Rows.InsertAt(drLast_new, sicherheiten_cleared.Rows.Count)
|
||||
|
||||
If sicherheiten_cleared.Rows.Count > 2 Then SDL.cProgramFunctions.genExcelFromDT_NEW(sicherheiten_cleared)
|
||||
|
||||
|
||||
End If
|
||||
|
||||
'dtSicherheiten.Columns.Remove("Sicherheitbetrag_Calc")
|
||||
|
||||
Me.Cursor = Cursors.Default
|
||||
|
||||
|
||||
Reference in New Issue
Block a user