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

MDM Plaose Anpassung, div. USTV Anpassungen

Browse Source
This commit is contained in:
Andreas Luxbauer
2023-02-27 22:18:10 +01:00
parent 2bd9f595fd
commit ff705db787
7 changed files with 559 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
SDL/USTV/usrCntlUSTV.vb
View File

@@ -1,5 +1,6 @@
Imports System.ComponentModel
Imports System.Data.SqlClient
Imports VERAG_PROG_ALLGEMEIN
Public Class usrCntlUSTV
@@ -17,14 +18,14 @@ Public Class usrCntlUSTV
With dgvUSTV
.ClearSelection()
' If KdSearchBox1.KdNr <= 0 Then Exit Sub
If cboJahr._value = "" Then Exit Sub
.SET_SQL("SELECT TOP (1000) [UStVAn_ID],[UStVAn_KuNr],[UStVAn_Name],LandKz,[UStVAn_ReDatVon],[UStVAn_ReDatBis] ,[UStVAn_3470] ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],[UStVAn_Sachbearbeiter]
.SET_SQL("SELECT TOP (200) [UStVAn_ID],[UStVAn_KuNr],[UStVAn_Name],LandKz,[UStVAn_ReDatVon],[UStVAn_ReDatBis] ,UStVAn_AntragEingereichtAm,[UStVAn_3470] ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],[UStVAn_Sachbearbeiter]
FROM [tblUStVAntrag] inner join [Länderverzeichnis für die Außenhandelsstatistik] on UStVAn_LandNr=Landnr
where UStVAn_ReDatVon>='01.01." & cboJahr._value & "' AND UStVAn_ReDatBis<='31.12." & cboJahr._value & "' " & If(KdSearchBox1.KdNr > 0, " and UStVAn_KuNr=" & KdSearchBox1.KdNr & "", "") & "
order by UStVAn_KuNr,UStVAn_Name,LandKz,[UStVAn_ReDatVon]", "FMZOLL")
where 1=1 " & getWhere() & "
order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LandKz,[UStVAn_ReDatVon] desc", "FMZOLL")
.LOAD()
.RowTemplate.Height = 20
.AllowUserToOrderColumns = False
.AllowUserToResizeRows = False
@@ -49,6 +50,10 @@ Public Class usrCntlUSTV
.Columns("UStVAn_ReDatBis").HeaderText = "Bis"
.Columns("UStVAn_ReDatBis").Width = 100
.Columns("UStVAn_AntragEingereichtAm").HeaderText = "EingereichtAm"
.Columns("UStVAn_AntragEingereichtAm").Width = 100
.Columns("UStVAn_3470").HeaderText = "3470"
.Columns("UStVAn_3470").Width = 150
.Columns("UStVAn_3470").DefaultCellStyle.Format = "N2"
@@ -87,19 +92,46 @@ Public Class usrCntlUSTV
End Sub
Function getWhere(Optional useJahr = True) As String
Dim whereStr = ""
'If KdSearchBox1.KdNr <= 0 Then Exit Sub
If useJahr Then
If cboJahr._value <> "" Then
If cboJahrBis._value <> "" Then
whereStr &= " AND UStVAn_ReDatVon>='01.01." & cboJahr._value & "' AND UStVAn_ReDatBis<='31.12." & cboJahrBis._value & "' "
Else
whereStr &= " AND UStVAn_ReDatVon>='01.01." & cboJahr._value & "' AND UStVAn_ReDatBis<='31.12." & cboJahr._value & "' "
End If
End If
End If
If KdSearchBox1.KdNr > 0 Then whereStr &= " AND UStVAn_KuNr=" & KdSearchBox1.KdNr & " "
Return whereStr
End Function
Private Sub usrCntlVERAGCard_Load(sender As Object, e As EventArgs) Handles MyBase.Load
' btnFilter.Left = Panel4.Width - btnFilter.Width
KdSearchBox1.initKdBox(Me.FindForm)
init()
cboJahr.Items.Clear()
cboJahr.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
For i = 0 To 10
cboJahr.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(Now.Year - i, Now.Year - i))
Next
cboJahr.SelectedIndex = 0
cboJahr.changeItem(Now.Year - 2)
cboJahrBis.Items.Clear()
cboJahrBis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
For i = 0 To 10
cboJahrBis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(Now.Year - i, Now.Year - i))
Next
cboJahrBis.changeItem(Now.Year)
If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", Me.FindForm) Then
FlatButton1.Enabled = False
'FlatButton1.Enabled = False
FlatButton2.Enabled = False
Button14.Enabled = False
End If
@@ -115,11 +147,51 @@ Public Class usrCntlUSTV
End If
End Sub
Private Sub cboJahr_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboJahr.SelectedIndexChanged
Private Sub cboJahr_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboJahr.SelectedIndexChanged, cboJahrBis.SelectedIndexChanged
init()
End Sub
Private Sub KdSearchBox1_PropertyChanged(sender As Object, e As PropertyChangedEventArgs) Handles KdSearchBox1.PropertyChanged
init()
End Sub
Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button1.Click
cProgramFunctions.genExcelFromDGV_NEW(dgvUSTV, True)
End Sub
Private Sub Button8_Click_1(sender As Object, e As EventArgs) Handles Button8.Click
'Dim sqlStr = "SELECT [UStVAn_ID],[UStVAn_KuNr],[UStVAn_Name],LandKz,[UStVAn_ReDatVon],[UStVAn_ReDatBis] ,UStVAn_AntragEingereichtAm,[UStVAn_3470] ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],[UStVAn_Sachbearbeiter]
' FROM [tblUStVAntrag] inner join [Länderverzeichnis für die Außenhandelsstatistik] on UStVAn_LandNr=Landnr
' where 1=1 " & getWhere(False) & "
' AND cast( [UStVAn_USteuerbetragEUR] as decimal(17,2))-cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))<>0
' AND UStVAn_AntragEingereichtAm is not null
' order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LandKz,[UStVAn_ReDatVon] desc"
Dim sqlStr = "SELECT [UStVAn_ID],[UStVAn_KuNr],[UStVAn_Name],LandKz,[UStVAn_ReDatVon],[UStVAn_ReDatBis] ,UStVAn_AntragEingereichtAm,[UStVAn_3470] ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))) as Differenzbetrag, [UStVAn_Sachbearbeiter]
FROM [tblUStVAntrag] inner join [Länderverzeichnis für die Außenhandelsstatistik] on UStVAn_LandNr=Landnr
where 1=1
AND cast( [UStVAn_USteuerbetragEUR] as decimal(17,2))-cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))<>0
AND UStVAn_AntragEingereichtAm is not null
order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LandKz,[UStVAn_ReDatVon] desc"
Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
cProgramFunctions.genExcelFromDT_NEW(dt, {"J1:N" & (dt.Rows.Count + 1)})
Else
MsgBox("Keine Daten!")
End If
End Sub
Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
' If Not kdNr_filter Then
If dgvUSTV.SelectedCells.Count > 0 Then
If IsNumeric(dgvUSTV.CurrentRow.Cells("UStVAn_KuNr").Value) Then
cProgramFunctions.openKundenblatt(dgvUSTV.CurrentRow.Cells("UStVAn_KuNr").Value, Me.FindForm, True)
'Dim pf As New cProgramFunctions
'pf.openKundenblatt(dgvSDL.CurrentRow.Cells("KundenNr").Value)
End If
End If
' End If
End Sub
End Class