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

4
SDL/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.2.3.9")>
<Assembly: AssemblyFileVersion("1.2.3.9")>
<Assembly: AssemblyVersion("1.2.4.1")>
<Assembly: AssemblyFileVersion("1.2.4.1")>

171
SDL/USTV/usrCntlUSTV.Designer.vb generated
View File

@@ -23,23 +23,23 @@ Partial Class usrCntlUSTV
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.pnlFilter = New System.Windows.Forms.Panel()
Me.dgvUSTV = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Label1 = New System.Windows.Forms.Label()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.cboJahrBis = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label2 = New System.Windows.Forms.Label()
Me.lblKunde = New System.Windows.Forms.Label()
Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
Me.cboJahr = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.lblFirma = New System.Windows.Forms.Label()
Me.Button1 = New System.Windows.Forms.Button()
Me.Button14 = New System.Windows.Forms.Button()
Me.FlatButton2 = New System.Windows.Forms.Button()
Me.Button8 = New System.Windows.Forms.Button()
Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton()
Me.btnUpdate = New VERAG_PROG_ALLGEMEIN.FlatButton()
Me.Panel2 = New System.Windows.Forms.Panel()
Me.Panel3 = New System.Windows.Forms.Panel()
Me.Button8 = New System.Windows.Forms.Button()
Me.Button5 = New System.Windows.Forms.Button()
CType(Me.dgvUSTV, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
Me.Panel2.SuspendLayout()
@@ -51,9 +51,9 @@ Partial Class usrCntlUSTV
Me.pnlFilter.BackColor = System.Drawing.Color.White
Me.pnlFilter.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.pnlFilter.Dock = System.Windows.Forms.DockStyle.Bottom
Me.pnlFilter.Location = New System.Drawing.Point(0, 43)
Me.pnlFilter.Location = New System.Drawing.Point(0, 53)
Me.pnlFilter.Name = "pnlFilter"
Me.pnlFilter.Size = New System.Drawing.Size(1072, 34)
Me.pnlFilter.Size = New System.Drawing.Size(1072, 31)
Me.pnlFilter.TabIndex = 6
'
'dgvUSTV
@@ -61,16 +61,16 @@ Partial Class usrCntlUSTV
Me.dgvUSTV.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvUSTV.AllowUserToAddRows = False
Me.dgvUSTV.AllowUserToDeleteRows = False
DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6
Me.dgvUSTV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvUSTV.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvUSTV.Location = New System.Drawing.Point(0, 77)
Me.dgvUSTV.Location = New System.Drawing.Point(0, 84)
Me.dgvUSTV.MultiSelect = False
Me.dgvUSTV.Name = "dgvUSTV"
Me.dgvUSTV.ReadOnly = True
Me.dgvUSTV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
Me.dgvUSTV.Size = New System.Drawing.Size(1072, 103)
Me.dgvUSTV.Size = New System.Drawing.Size(1072, 457)
Me.dgvUSTV.TabIndex = 1
'
'Label1
@@ -87,19 +87,30 @@ Partial Class usrCntlUSTV
'Panel1
'
Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.Panel1.Controls.Add(Me.cboJahrBis)
Me.Panel1.Controls.Add(Me.Label2)
Me.Panel1.Controls.Add(Me.lblKunde)
Me.Panel1.Controls.Add(Me.KdSearchBox1)
Me.Panel1.Controls.Add(Me.cboJahr)
Me.Panel1.Controls.Add(Me.lblFirma)
Me.Panel1.Controls.Add(Me.Label1)
Me.Panel1.Controls.Add(Me.pnlFilter)
Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
Me.Panel1.Location = New System.Drawing.Point(0, 0)
Me.Panel1.Name = "Panel1"
Me.Panel1.Size = New System.Drawing.Size(1072, 77)
Me.Panel1.Size = New System.Drawing.Size(1072, 84)
Me.Panel1.TabIndex = 0
'
'cboJahrBis
'
Me.cboJahrBis._allowedValuesFreiText = Nothing
Me.cboJahrBis._allowFreiText = False
Me.cboJahrBis._value = ""
Me.cboJahrBis.FormattingEnabled = True
Me.cboJahrBis.Location = New System.Drawing.Point(527, 8)
Me.cboJahrBis.Name = "cboJahrBis"
Me.cboJahrBis.Size = New System.Drawing.Size(121, 21)
Me.cboJahrBis.TabIndex = 7
'
'Label2
'
Me.Label2.AutoSize = True
@@ -132,7 +143,7 @@ Partial Class usrCntlUSTV
Me.KdSearchBox1._UseFIRMA = ""
Me.KdSearchBox1._ValueKdAndName = True
Me.KdSearchBox1.dgvpos = "LEFT"
Me.KdSearchBox1.KdName = Nothing
Me.KdSearchBox1.KdName = ""
Me.KdSearchBox1.KdNr = "-1"
Me.KdSearchBox1.kdNrField = Nothing
Me.KdSearchBox1.KdNrNullInt = Nothing
@@ -156,31 +167,35 @@ Partial Class usrCntlUSTV
Me.cboJahr.Size = New System.Drawing.Size(121, 21)
Me.cboJahr.TabIndex = 4
'
'lblFirma
'Button1
'
Me.lblFirma.AutoSize = True
Me.lblFirma.Cursor = System.Windows.Forms.Cursors.Hand
Me.lblFirma.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.lblFirma.Location = New System.Drawing.Point(872, 23)
Me.lblFirma.Name = "lblFirma"
Me.lblFirma.Size = New System.Drawing.Size(161, 17)
Me.lblFirma.TabIndex = 5
Me.lblFirma.Text = "VERAG Spedition AG"
Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button1.ForeColor = System.Drawing.Color.Black
Me.Button1.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button1.Location = New System.Drawing.Point(955, 6)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(114, 39)
Me.Button1.TabIndex = 5
Me.Button1.Text = "In Excel " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "konvertieren"
Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button1.UseVisualStyleBackColor = True
'
'Button14
'
Me.Button14.Enabled = False
Me.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button14.ForeColor = System.Drawing.Color.Black
Me.Button14.Image = Global.SDL.My.Resources.Resources.plus
Me.Button14.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button14.Location = New System.Drawing.Point(668, 106)
Me.Button14.Location = New System.Drawing.Point(7, 6)
Me.Button14.Name = "Button14"
Me.Button14.Size = New System.Drawing.Size(75, 39)
Me.Button14.TabIndex = 3
Me.Button14.Text = "Neu"
Me.Button14.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button14.UseVisualStyleBackColor = True
Me.Button14.Visible = False
'
'FlatButton2
'
@@ -189,90 +204,66 @@ Partial Class usrCntlUSTV
Me.FlatButton2.ForeColor = System.Drawing.Color.Black
Me.FlatButton2.Image = Global.SDL.My.Resources.Resources.del
Me.FlatButton2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.FlatButton2.Location = New System.Drawing.Point(753, 106)
Me.FlatButton2.Location = New System.Drawing.Point(88, 7)
Me.FlatButton2.Name = "FlatButton2"
Me.FlatButton2.Size = New System.Drawing.Size(86, 39)
Me.FlatButton2.TabIndex = 4
Me.FlatButton2.Text = "Löschen"
Me.FlatButton2.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.FlatButton2.UseVisualStyleBackColor = True
Me.FlatButton2.Visible = False
'
'Button8
'
Me.Button8.FlatAppearance.BorderSize = 0
Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button8.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button8.Location = New System.Drawing.Point(544, 102)
Me.Button8.Name = "Button8"
Me.Button8.Size = New System.Drawing.Size(118, 44)
Me.Button8.TabIndex = 2
Me.Button8.Text = "In Excel " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "konvertieren"
Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button8.UseVisualStyleBackColor = True
Me.Button8.Visible = False
'
'FlatButton1
'
Me.FlatButton1.allowBorder = False
Me.FlatButton1.FlatAppearance.BorderSize = 0
Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.FlatButton1.ForeColor = System.Drawing.Color.Black
Me.FlatButton1.Image = Global.SDL.My.Resources.Resources.plus
Me.FlatButton1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.FlatButton1.Location = New System.Drawing.Point(367, 106)
Me.FlatButton1.Name = "FlatButton1"
Me.FlatButton1.Size = New System.Drawing.Size(152, 37)
Me.FlatButton1.TabIndex = 1
Me.FlatButton1.Text = "Neuer Eintrag (unten)"
Me.FlatButton1.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.FlatButton1.UseVisualStyleBackColor = True
Me.FlatButton1.Visible = False
'
'btnUpdate
'
Me.btnUpdate.allowBorder = False
Me.btnUpdate.Enabled = False
Me.btnUpdate.FlatAppearance.BorderSize = 0
Me.btnUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnUpdate.ForeColor = System.Drawing.Color.Black
Me.btnUpdate.Image = Global.SDL.My.Resources.Resources.save
Me.btnUpdate.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnUpdate.Location = New System.Drawing.Point(209, 106)
Me.btnUpdate.Name = "btnUpdate"
Me.btnUpdate.Size = New System.Drawing.Size(152, 37)
Me.btnUpdate.TabIndex = 0
Me.btnUpdate.Text = "Änderungen speichern"
Me.btnUpdate.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnUpdate.UseVisualStyleBackColor = True
Me.btnUpdate.Visible = False
'
'Panel2
'
Me.Panel2.BackColor = System.Drawing.Color.White
Me.Panel2.Controls.Add(Me.Panel3)
Me.Panel2.Dock = System.Windows.Forms.DockStyle.Bottom
Me.Panel2.Location = New System.Drawing.Point(0, 180)
Me.Panel2.MinimumSize = New System.Drawing.Size(0, 427)
Me.Panel2.Location = New System.Drawing.Point(0, 541)
Me.Panel2.MinimumSize = New System.Drawing.Size(0, 50)
Me.Panel2.Name = "Panel2"
Me.Panel2.Size = New System.Drawing.Size(1072, 427)
Me.Panel2.Size = New System.Drawing.Size(1072, 66)
Me.Panel2.TabIndex = 2
'
'Panel3
'
Me.Panel3.AutoSize = True
Me.Panel3.Controls.Add(Me.btnUpdate)
Me.Panel3.Controls.Add(Me.Button14)
Me.Panel3.Controls.Add(Me.FlatButton1)
Me.Panel3.Controls.Add(Me.FlatButton2)
Me.Panel3.Controls.Add(Me.Button5)
Me.Panel3.Controls.Add(Me.Button8)
Me.Panel3.Controls.Add(Me.Button1)
Me.Panel3.Controls.Add(Me.Button14)
Me.Panel3.Controls.Add(Me.FlatButton2)
Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill
Me.Panel3.Location = New System.Drawing.Point(0, 0)
Me.Panel3.Name = "Panel3"
Me.Panel3.Size = New System.Drawing.Size(1072, 427)
Me.Panel3.Size = New System.Drawing.Size(1072, 66)
Me.Panel3.TabIndex = 0
Me.Panel3.Visible = False
'
'Button8
'
Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button8.Image = Global.SDL.My.Resources.Resources.statistik_small
Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button8.Location = New System.Drawing.Point(213, 7)
Me.Button8.Margin = New System.Windows.Forms.Padding(0)
Me.Button8.Name = "Button8"
Me.Button8.Size = New System.Drawing.Size(145, 41)
Me.Button8.TabIndex = 6
Me.Button8.Text = "Eingereichte Anträge" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "mit Differenzbetrag"
Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button8.UseVisualStyleBackColor = True
'
'Button5
'
Me.Button5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button5.Image = Global.SDL.My.Resources.Resources.kunden
Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button5.Location = New System.Drawing.Point(831, 5)
Me.Button5.Name = "Button5"
Me.Button5.Size = New System.Drawing.Size(118, 40)
Me.Button5.TabIndex = 23
Me.Button5.Text = "Gehe zum" & Global.Microsoft.VisualBasic.ChrW(10) & "Kundenblatt"
Me.Button5.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button5.UseVisualStyleBackColor = True
'
'usrCntlUSTV
'
@@ -297,15 +288,15 @@ Partial Class usrCntlUSTV
Friend WithEvents Label1 As System.Windows.Forms.Label
Friend WithEvents Panel1 As System.Windows.Forms.Panel
Friend WithEvents Panel2 As System.Windows.Forms.Panel
Friend WithEvents lblFirma As System.Windows.Forms.Label
Friend WithEvents Panel3 As System.Windows.Forms.Panel
Friend WithEvents btnUpdate As VERAG_PROG_ALLGEMEIN.FlatButton
Friend WithEvents FlatButton1 As VERAG_PROG_ALLGEMEIN.FlatButton
Friend WithEvents Button8 As System.Windows.Forms.Button
Friend WithEvents Button14 As System.Windows.Forms.Button
Friend WithEvents FlatButton2 As System.Windows.Forms.Button
Friend WithEvents Label2 As Label
Friend WithEvents lblKunde As Label
Friend WithEvents KdSearchBox1 As VERAG_PROG_ALLGEMEIN.KdSearchBox
Friend WithEvents cboJahr As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents Button1 As Button
Friend WithEvents Button8 As Button
Friend WithEvents cboJahrBis As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents Button5 As Button
End Class

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

16
SDL/kunden/Vorauskasse/frmVorauskasse.vb
View File

@@ -672,15 +672,9 @@ Public Class cVorauskasseOptions
End If
End If
'Wenn Benutzer der Sendung nicht online, dann Benutzer der Sendung ..
If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then
sendToID = SQL.DLookup("LetzterMitarbeiterId", "Aviso", "AvisoId='" & AvisoId & "'", "AVISO")
art = "B"
End If
'Wenn Benutzer des LKWs nicht online, Team...
'Wenn Benutzer der Sendung nicht online, Team...
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA ' --> Bezieht sich auf BU MA
Case "IMEX" ' Bie IMEX kommen die MA durhc verschobene Dienstzeiten oft später
' Case "IMEX" ' Bie IMEX kommen die MA durhc verschobene Dienstzeiten oft später
Case Else
If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then
sendToID = SQL.DLookup("tblSnd_TeamId", "tblSendungen", "tblSnd_SendungID='" & SendungID & "'", "AVISO")
@@ -688,6 +682,12 @@ Public Class cVorauskasseOptions
End If
End Select
'Wenn nicht Team, dann Benutzer des LKW ..
If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then
sendToID = SQL.DLookup("LetzterMitarbeiterId", "Aviso", "AvisoId='" & AvisoId & "'", "AVISO")
art = "B"
End If
'Wenn gefunden
If sendToID >= 0 Then

752
SDL/kunden/frmKundenblatt.Designer.vb generated
View File

File diff suppressed because it is too large Load Diff

19
SDL/mdm/frmMDMDatenverarbetiung.vb
View File

@@ -7,7 +7,8 @@ Public Class frmMDMDatenverarbetiung
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
' Dim ProduktCode_NOT_IN = "SELECT plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] WHERE [plp_einarbeiten]=0 "
Dim ProduktCode_NOT_IN = "'9020'"
Private Sub frmPloseDatenverarbetiung_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Me.Top = 0
Me.Height = My.Computer.Screen.WorkingArea.Height
@@ -76,6 +77,8 @@ Public Class frmMDMDatenverarbetiung
End Select
End Sub
Sub genSummenbericht_PLOSE()
Dim displayFilter = False
Dim sqlstr As String = ""
@@ -92,7 +95,7 @@ Public Class frmMDMDatenverarbetiung
sqlstr &= " AND plose_DatumTransaktion between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' "
sqlstr &= " AND plose_Fakturiert =0 "
sqlstr &= " AND plose_ProduktCode NOT IN (SELECT plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] WHERE [plp_einarbeiten]=0 ) "
sqlstr &= " AND plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & ") "
sqlstr &= " group by plose_ProduktCode"
sqlstr &= " order by plose_ProduktCode"
@@ -181,7 +184,7 @@ Public Class frmMDMDatenverarbetiung
WHERE 1 = 1
And plose_DatumTransaktion between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "'
AND plose_Fakturiert=0
AND plose_ProduktCode NOT IN (SELECT plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] WHERE [plp_einarbeiten]=0 )
AND plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & ")
group by plose_POLSEKundennummer,plose_ProduktCode
order by plose_POLSEKundennummer,plose_ProduktCode", "FMZOLL")
.LOAD()
@@ -287,7 +290,7 @@ Public Class frmMDMDatenverarbetiung
Function genRGAtt_PLOSE() As Boolean
Dim dt_Main As DataTable = SQL.loadDgvBySql_Param("SELECT [AdressenNr],PLOSEKundenNr FROM tblPLOSE_Details INNER JOIN Adressen ON plose_POLSEKundennummer=PLOSEKundenNr where plose_Fakturiert = 0 AND plose_ProduktCode NOT IN (SELECT plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] WHERE [plp_einarbeiten]=0 ) AND plose_DatumTransaktion between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "' group by [AdressenNr],PLOSEKundenNr ", "FMZOLL")
Dim dt_Main As DataTable = SQL.loadDgvBySql_Param("SELECT [AdressenNr],PLOSEKundenNr FROM tblPLOSE_Details INNER JOIN Adressen ON plose_POLSEKundennummer=PLOSEKundenNr where plose_Fakturiert = 0 AND plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & " ) AND plose_DatumTransaktion between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "' group by [AdressenNr],PLOSEKundenNr ", "FMZOLL")
'MsgBox("Keine Daten!""SELECT [AdressenNr],PLOSEKundenNr FROM tblPLOSE_Details INNER JOIN Adressen ON plose_POLSEKundennummer=PLOSEKundenNr where AND plose_Fakturiert = 0 AND plose_DatumTransaktion between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "' group by [AdressenNr],PLOSEKundenNr ")
If dt_Main Is Nothing OrElse dt_Main.Rows.Count = 0 Then
MsgBox("Keine Daten!")
@@ -360,7 +363,7 @@ Public Class frmMDMDatenverarbetiung
sqlstr &= " SELECT 'PLOSE',AdressenNr,plose_Kennzeichen,plose_DatumTransaktion,plp_Land,isnull([tblPLOSE_Produktbeschreibung].plp_Description_EN,plose_Produktbeschreibung) as plose_Produktbeschreibung ,isnull(plose_NummerKarteGeraet,plose_Kontonummer) as plose_NummerKarteGeraet ,plose_BeschreibungEinfahrt,plose_BeschreibungAusfahrt,plose_NettobetragWaehrungAbbuchung,(plose_BruttobetragWaehrungAbbuchung-plose_NettobetragWaehrungAbbuchung) as Steuer,plose_BruttobetragWaehrungAbbuchung "
sqlstr &= " FROM tblPLOSE_Details INNER JOIN [tblPLOSE_Produktbeschreibung] on plose_ProduktCode=plp_ProductCode INNER JOIN Adressen on plose_POLSEKundennummer=PLOSEKundenNr and plp_LeistungsNr is not null "
sqlstr &= " WHERE 1=1 "
sqlstr &= " AND plose_Fakturiert=0 AND plose_ProduktCode NOT IN (SELECT plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] WHERE [plp_einarbeiten]=0 ) AND plp_Land NOT IN ('AT','DE') "
sqlstr &= " AND plose_Fakturiert=0 AND plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & " ) AND plp_Land NOT IN ('AT','DE') "
sqlstr &= " AND plose_DatumTransaktion between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' "
sqlstr &= " order by plp_Land, plose_DatumTransaktion"
@@ -373,7 +376,7 @@ Public Class frmMDMDatenverarbetiung
sqlstrAT &= " SELECT 'PLOSE',AdressenNr,plose_Kennzeichen,plose_DatumTransaktion,plp_Land,'' as plose_Produktbeschreibung ,plose_NummerKarteGeraet as plose_NummerKarteGeraet ,'' as plose_BeschreibungEinfahrt,'' as plose_BeschreibungAusfahrt,sum(plose_NettobetragWaehrungAbbuchung) as plose_NettobetragWaehrungAbbuchung,sum(plose_BruttobetragWaehrungAbbuchung-plose_NettobetragWaehrungAbbuchung) as Steuer,sum(plose_BruttobetragWaehrungAbbuchung ) as plose_BruttobetragWaehrungAbbuchung "
sqlstrAT &= " FROM tblPLOSE_Details INNER JOIN [tblPLOSE_Produktbeschreibung] on plose_ProduktCode=plp_ProductCode INNER JOIN Adressen on plose_POLSEKundennummer=PLOSEKundenNr and plp_LeistungsNr is not null "
sqlstrAT &= " WHERE 1=1 "
sqlstrAT &= " AND plose_Fakturiert=0 AND plose_ProduktCode NOT IN (SELECT plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] WHERE [plp_einarbeiten]=0 ) AND plp_Land IN ('AT','DE') "
sqlstrAT &= " AND plose_Fakturiert=0 AND plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & " ) AND plp_Land IN ('AT','DE') "
sqlstrAT &= " AND plose_DatumTransaktion between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' "
sqlstrAT &= " group by plp_Land, AdressenNr, plose_Kennzeichen,plose_DatumTransaktion,plose_NummerKarteGeraet"
sqlstrAT &= " order by plp_Land"
@@ -548,7 +551,7 @@ Public Class frmMDMDatenverarbetiung
sqlstr &= " FROM tblPLOSE_Details INNER JOIN [tblPLOSE_Produktbeschreibung] on plose_ProduktCode=plp_ProductCode INNER JOIN Adressen on plose_POLSEKundennummer=PLOSEKundenNr "
sqlstr &= " WHERE 1=1 "
sqlstr &= " AND plose_Fakturiert=0 "
sqlstr &= " AND plose_ProduktCode NOT IN (SELECT plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] WHERE [plp_einarbeiten]=0 ) "
sqlstr &= " AND plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & " ) "
sqlstr &= " AND AdressenNr = '" & KdNr & "' "
sqlstr &= " AND plose_DatumTransaktion between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' "
@@ -829,7 +832,7 @@ Public Class frmMDMDatenverarbetiung
sqlstr &= " FROM tblPLOSE_Details INNER JOIN [tblPLOSE_Produktbeschreibung] on plose_ProduktCode=plp_ProductCode "
sqlstr &= " WHERE 1=1 "
sqlstr &= " AND plose_Fakturiert=0 "
sqlstr &= " AND plose_ProduktCode NOT IN (SELECT plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] WHERE [plp_einarbeiten]=0 ) "
sqlstr &= " AND plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & " ) "
sqlstr &= " AND plose_POLSEKundennummer = '" & PLOSEKundenNr & "' "
sqlstr &= " AND plp_LeistungsNr is not null "
sqlstr &= " AND plose_DatumTransaktion between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' "