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

Compare commits

base: edv:71bb4278ebcddcd684a1f0c258c46375d496741d
Branches Tags
edv:newMaster2024 edv:master edv:Logikänderung_VM
..
compare: edv:dcf20568ad1c4872ec2a3223257d696146beba38
Branches Tags
edv:newMaster2024 edv:master edv:Logikänderung_VM

2 Commits
71bb4278eb ... dcf20568ad

Author SHA1 Message Date
d.breimaier
dcf20568ad fakt, etc. 2026-05-13 13:44:31 +02:00
d.breimaier
afdc1c3822 MDM -> IDS, etc. 2026-05-12 17:31:19 +02:00
12 changed files with 660 additions and 533 deletions
Expand all files Collapse all files

5
SDL/Fakturierung/frmAbrechnungsMaske.vb
View File

@@ -1,6 +1,5 @@
Imports System.IO
Imports Microsoft.Office.Interop
Imports VERAG_PROG_ALLGEMEIN
Public Class frmAbrechnungsMaske
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -984,9 +983,9 @@ Public Class frmAbrechnungsMaske
Dim ListOfRK_ID As New List(Of Integer)
Dim noRE_DATE = dgvRechnungen.SelectedRows.Cast(Of DataGridViewRow)().Any(Function(r) r.Cells("RENR").Value Is Nothing OrElse IsDBNull(r.Cells("RENR").Value) OrElse (r.Cells("RENR").Value) <> "-")
Dim noRE_NR = dgvRechnungen.SelectedRows.Cast(Of DataGridViewRow)().Any(Function(r) r.Cells("RENR").Value Is Nothing OrElse IsDBNull(r.Cells("RENR").Value) OrElse Not IsNumeric(r.Cells("RENR").Value))
If noRE_DATE Then MsgBox("ACHTUNG, Rechnungsdatum wurde nicht gesetzt." & vbNewLine & "Vorgang wird abgebrochen!") : Exit Sub
If noRE_NR Then MsgBox("ACHTUNG, RechnungsNr wurde nicht gesetzt." & vbNewLine & "Vorgang wird abgebrochen!") : Exit Sub
For Each row As DataGridViewRow In dgvRechnungen.SelectedRows

2
SDL/Fakturierung/usrCntlFaktAbrechnung.vb
View File

@@ -1062,9 +1062,9 @@ Public Class usrCntlFaktAbrechnung
End Select
initRgArt()
initKdAtrNr()
initPkSt()
End Sub
Sub setBGbColotTxt(p_cntl As Control)

268
SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb generated
View File

@@ -23,12 +23,12 @@ Partial Class usrCntlSpeditionsBuchSuche
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlSpeditionsBuchSuche))
Me.TabPage1 = New System.Windows.Forms.TabPage()
Me.cntxtCntxtSpeditionsbuch = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -85,14 +85,17 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.Button21 = New System.Windows.Forms.Button()
Me.btnSpedBuchEinnahmen = New System.Windows.Forms.Button()
Me.pnlBerichte = New System.Windows.Forms.Panel()
Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
Me.btnHandling = New System.Windows.Forms.Button()
Me.cboHandlingssatz = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.btnHandling_AMBAR = New System.Windows.Forms.Button()
Me.cboHandlingssatz_AMBAR = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.cbxHandlingAbrechnen = New System.Windows.Forms.CheckBox()
Me.CheckBox4 = New System.Windows.Forms.CheckBox()
Me.cbxDetailbericht = New System.Windows.Forms.CheckBox()
Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Button25 = New System.Windows.Forms.Button()
Me.Button24 = New System.Windows.Forms.Button()
Me.Button23 = New System.Windows.Forms.Button()
Me.lblKdAusFortschritt = New System.Windows.Forms.Label()
Me.cboHandlingssatz = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
Me.KundenauswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
@@ -100,7 +103,6 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.ZFSteyrZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.Button20 = New System.Windows.Forms.Button()
Me.Button19 = New System.Windows.Forms.Button()
Me.Button18 = New System.Windows.Forms.Button()
Me.Button16 = New System.Windows.Forms.Button()
@@ -213,7 +215,6 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.Label45 = New System.Windows.Forms.Label()
Me.cboFilialeHandling = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.SplitContainer = New System.Windows.Forms.SplitContainer()
Me.cbxHandlingAbrechnen = New System.Windows.Forms.CheckBox()
Me.cntxtCntxtSpeditionsbuch.SuspendLayout()
Me.pnlRechts.SuspendLayout()
CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -223,6 +224,7 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.Panel3.SuspendLayout()
Me.Panel1.SuspendLayout()
Me.pnlBerichte.SuspendLayout()
Me.FlowLayoutPanel1.SuspendLayout()
Me.MenuStrip1.SuspendLayout()
Me.pnl.SuspendLayout()
Me.MenuStrip2.SuspendLayout()
@@ -681,35 +683,35 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.DataGridView.AllowUserToDeleteRows = False
Me.DataGridView.AllowUserToOrderColumns = True
Me.DataGridView.AllowUserToResizeRows = False
DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.DataGridView.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7
DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.DataGridView.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
Me.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.DataGridView.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch
DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText
DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.DataGridView.DefaultCellStyle = DataGridViewCellStyle8
DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.DataGridView.DefaultCellStyle = DataGridViewCellStyle2
Me.DataGridView.Dock = System.Windows.Forms.DockStyle.Fill
Me.DataGridView.Location = New System.Drawing.Point(450, 0)
Me.DataGridView.Name = "DataGridView"
DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.DataGridView.RowHeadersDefaultCellStyle = DataGridViewCellStyle9
DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.DataGridView.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
Me.DataGridView.Size = New System.Drawing.Size(789, 262)
Me.DataGridView.TabIndex = 0
'
@@ -736,35 +738,35 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.dgvLKW.AllowUserToOrderColumns = True
Me.dgvLKW.AllowUserToResizeRows = False
Me.dgvLKW.BackgroundColor = System.Drawing.Color.WhiteSmoke
DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
Me.dgvLKW.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvLKW.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch
DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle2
DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText
DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle5
Me.dgvLKW.Dock = System.Windows.Forms.DockStyle.Left
Me.dgvLKW.Location = New System.Drawing.Point(0, 0)
Me.dgvLKW.Name = "dgvLKW"
DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
Me.dgvLKW.Size = New System.Drawing.Size(450, 262)
Me.dgvLKW.TabIndex = 35
Me.dgvLKW.Visible = False
@@ -1069,17 +1071,14 @@ Partial Class usrCntlSpeditionsBuchSuche
'
Me.pnlBerichte.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.pnlBerichte.Controls.Add(Me.FlowLayoutPanel1)
Me.pnlBerichte.Controls.Add(Me.cbxHandlingAbrechnen)
Me.pnlBerichte.Controls.Add(Me.CheckBox4)
Me.pnlBerichte.Controls.Add(Me.cbxDetailbericht)
Me.pnlBerichte.Controls.Add(Me.MyComboBox2)
Me.pnlBerichte.Controls.Add(Me.Button25)
Me.pnlBerichte.Controls.Add(Me.Button24)
Me.pnlBerichte.Controls.Add(Me.Button23)
Me.pnlBerichte.Controls.Add(Me.lblKdAusFortschritt)
Me.pnlBerichte.Controls.Add(Me.cboHandlingssatz)
Me.pnlBerichte.Controls.Add(Me.MenuStrip1)
Me.pnlBerichte.Controls.Add(Me.Button20)
Me.pnlBerichte.Controls.Add(Me.Button19)
Me.pnlBerichte.Controls.Add(Me.Button18)
Me.pnlBerichte.Controls.Add(Me.Button16)
@@ -1099,6 +1098,82 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.pnlBerichte.TabIndex = 6
Me.pnlBerichte.Visible = False
'
'FlowLayoutPanel1
'
Me.FlowLayoutPanel1.Controls.Add(Me.btnHandling)
Me.FlowLayoutPanel1.Controls.Add(Me.cboHandlingssatz)
Me.FlowLayoutPanel1.Controls.Add(Me.btnHandling_AMBAR)
Me.FlowLayoutPanel1.Controls.Add(Me.cboHandlingssatz_AMBAR)
Me.FlowLayoutPanel1.Location = New System.Drawing.Point(3, 123)
Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
Me.FlowLayoutPanel1.Size = New System.Drawing.Size(319, 60)
Me.FlowLayoutPanel1.TabIndex = 97
'
'btnHandling
'
Me.btnHandling.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnHandling.Image = Global.SDL.My.Resources.Resources.statistik_small
Me.btnHandling.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnHandling.Location = New System.Drawing.Point(0, 0)
Me.btnHandling.Margin = New System.Windows.Forms.Padding(0)
Me.btnHandling.Name = "btnHandling"
Me.btnHandling.Size = New System.Drawing.Size(159, 28)
Me.btnHandling.TabIndex = 59
Me.btnHandling.Text = "Handling an Außenstellen"
Me.btnHandling.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnHandling.UseVisualStyleBackColor = True
'
'cboHandlingssatz
'
Me.cboHandlingssatz._allowedValuesFreiText = Nothing
Me.cboHandlingssatz._allowFreiText = False
Me.cboHandlingssatz._value = ""
Me.cboHandlingssatz.DropDownWidth = 300
Me.cboHandlingssatz.FormattingEnabled = True
Me.cboHandlingssatz.Location = New System.Drawing.Point(3, 31)
Me.cboHandlingssatz.Name = "cboHandlingssatz"
Me.cboHandlingssatz.Size = New System.Drawing.Size(159, 21)
Me.cboHandlingssatz.TabIndex = 60
'
'btnHandling_AMBAR
'
Me.btnHandling_AMBAR.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnHandling_AMBAR.Image = Global.SDL.My.Resources.Resources.statistik_small
Me.btnHandling_AMBAR.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnHandling_AMBAR.Location = New System.Drawing.Point(165, 28)
Me.btnHandling_AMBAR.Margin = New System.Windows.Forms.Padding(0)
Me.btnHandling_AMBAR.Name = "btnHandling_AMBAR"
Me.btnHandling_AMBAR.Size = New System.Drawing.Size(128, 28)
Me.btnHandling_AMBAR.TabIndex = 94
Me.btnHandling_AMBAR.Text = "Handling (AMBAR)"
Me.btnHandling_AMBAR.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnHandling_AMBAR.UseVisualStyleBackColor = True
'
'cboHandlingssatz_AMBAR
'
Me.cboHandlingssatz_AMBAR._allowedValuesFreiText = Nothing
Me.cboHandlingssatz_AMBAR._allowFreiText = False
Me.cboHandlingssatz_AMBAR._value = ""
Me.cboHandlingssatz_AMBAR.DropDownWidth = 250
Me.cboHandlingssatz_AMBAR.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboHandlingssatz_AMBAR.FormattingEnabled = True
Me.cboHandlingssatz_AMBAR.Location = New System.Drawing.Point(3, 59)
Me.cboHandlingssatz_AMBAR.Name = "cboHandlingssatz_AMBAR"
Me.cboHandlingssatz_AMBAR.Size = New System.Drawing.Size(128, 22)
Me.cboHandlingssatz_AMBAR.TabIndex = 53
'
'cbxHandlingAbrechnen
'
Me.cbxHandlingAbrechnen.AutoSize = True
Me.cbxHandlingAbrechnen.BackColor = System.Drawing.Color.WhiteSmoke
Me.cbxHandlingAbrechnen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxHandlingAbrechnen.Location = New System.Drawing.Point(4, 107)
Me.cbxHandlingAbrechnen.Name = "cbxHandlingAbrechnen"
Me.cbxHandlingAbrechnen.Size = New System.Drawing.Size(140, 17)
Me.cbxHandlingAbrechnen.TabIndex = 96
Me.cbxHandlingAbrechnen.Text = "Handling abrechnen"
Me.cbxHandlingAbrechnen.UseVisualStyleBackColor = False
'
'CheckBox4
'
Me.CheckBox4.AutoSize = True
@@ -1121,33 +1196,6 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.cbxDetailbericht.Text = "Detailbericht"
Me.cbxDetailbericht.UseVisualStyleBackColor = False
'
'MyComboBox2
'
Me.MyComboBox2._allowedValuesFreiText = Nothing
Me.MyComboBox2._allowFreiText = False
Me.MyComboBox2._value = ""
Me.MyComboBox2.DropDownWidth = 250
Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.MyComboBox2.FormattingEnabled = True
Me.MyComboBox2.Location = New System.Drawing.Point(169, 162)
Me.MyComboBox2.Name = "MyComboBox2"
Me.MyComboBox2.Size = New System.Drawing.Size(128, 22)
Me.MyComboBox2.TabIndex = 53
'
'Button25
'
Me.Button25.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button25.Image = Global.SDL.My.Resources.Resources.statistik_small
Me.Button25.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button25.Location = New System.Drawing.Point(169, 134)
Me.Button25.Margin = New System.Windows.Forms.Padding(0)
Me.Button25.Name = "Button25"
Me.Button25.Size = New System.Drawing.Size(128, 28)
Me.Button25.TabIndex = 94
Me.Button25.Text = "Handling (AMBAR)"
Me.Button25.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button25.UseVisualStyleBackColor = True
'
'Button24
'
Me.Button24.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
@@ -1182,18 +1230,6 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.lblKdAusFortschritt.TabIndex = 43
Me.lblKdAusFortschritt.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'cboHandlingssatz
'
Me.cboHandlingssatz._allowedValuesFreiText = Nothing
Me.cboHandlingssatz._allowFreiText = False
Me.cboHandlingssatz._value = ""
Me.cboHandlingssatz.DropDownWidth = 300
Me.cboHandlingssatz.FormattingEnabled = True
Me.cboHandlingssatz.Location = New System.Drawing.Point(7, 162)
Me.cboHandlingssatz.Name = "cboHandlingssatz"
Me.cboHandlingssatz.Size = New System.Drawing.Size(159, 21)
Me.cboHandlingssatz.TabIndex = 60
'
'MenuStrip1
'
Me.MenuStrip1.Dock = System.Windows.Forms.DockStyle.None
@@ -1253,20 +1289,6 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem.Text = "Flender Bocholt (Zeitraum auswählen)"
Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem.Visible = False
'
'Button20
'
Me.Button20.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button20.Image = Global.SDL.My.Resources.Resources.statistik_small
Me.Button20.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button20.Location = New System.Drawing.Point(7, 134)
Me.Button20.Margin = New System.Windows.Forms.Padding(0)
Me.Button20.Name = "Button20"
Me.Button20.Size = New System.Drawing.Size(159, 28)
Me.Button20.TabIndex = 59
Me.Button20.Text = "Handling an Außenstellen"
Me.Button20.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button20.UseVisualStyleBackColor = True
'
'Button19
'
Me.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -2957,18 +2979,6 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.SplitContainer.SplitterWidth = 2
Me.SplitContainer.TabIndex = 3
'
'cbxHandlingAbrechnen
'
Me.cbxHandlingAbrechnen.AutoSize = True
Me.cbxHandlingAbrechnen.BackColor = System.Drawing.Color.WhiteSmoke
Me.cbxHandlingAbrechnen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxHandlingAbrechnen.Location = New System.Drawing.Point(7, 115)
Me.cbxHandlingAbrechnen.Name = "cbxHandlingAbrechnen"
Me.cbxHandlingAbrechnen.Size = New System.Drawing.Size(140, 17)
Me.cbxHandlingAbrechnen.TabIndex = 96
Me.cbxHandlingAbrechnen.Text = "Handling abrechnen"
Me.cbxHandlingAbrechnen.UseVisualStyleBackColor = False
'
'usrCntlSpeditionsBuchSuche
'
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
@@ -2992,6 +3002,7 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.Panel1.PerformLayout()
Me.pnlBerichte.ResumeLayout(False)
Me.pnlBerichte.PerformLayout()
Me.FlowLayoutPanel1.ResumeLayout(False)
Me.MenuStrip1.ResumeLayout(False)
Me.MenuStrip1.PerformLayout()
Me.pnl.ResumeLayout(False)
@@ -3160,7 +3171,7 @@ Partial Class usrCntlSpeditionsBuchSuche
Friend WithEvents Button19 As Button
Friend WithEvents cboFilialeHandling As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents Label45 As Label
Friend WithEvents Button20 As Button
Friend WithEvents btnHandling As Button
Friend WithEvents Panel2 As Panel
Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents lstFilialeHandling As VERAG_PROG_ALLGEMEIN.MyListBox
@@ -3183,8 +3194,8 @@ Partial Class usrCntlSpeditionsBuchSuche
Friend WithEvents txtVermerk As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents lblVermerke As Label
Friend WithEvents Button24 As Button
Friend WithEvents Button25 As Button
Friend WithEvents MyComboBox2 As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents btnHandling_AMBAR As Button
Friend WithEvents cboHandlingssatz_AMBAR As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents SendungsdetailsÖffnenToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ZFSteyrZeitraumAuswählenToolStripMenuItem As ToolStripMenuItem
Friend WithEvents cbxRptDetailsZahlungsdetails As CheckBox
@@ -3201,4 +3212,5 @@ Partial Class usrCntlSpeditionsBuchSuche
Friend WithEvents cbxfehlZahlung_AVISOID As CheckBox
Friend WithEvents cbxfehlZahlung_SENDUNG As CheckBox
Friend WithEvents cbxHandlingAbrechnen As CheckBox
Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
End Class

3
SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx
View File

@@ -126,9 +126,6 @@
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>431, 17</value>
</metadata>
<metadata name="MenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>546, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="ToolStripMenuItem2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>

103
SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
View File

@@ -501,11 +501,11 @@ Public Class usrCntlSpeditionsBuchSuche
MyComboBox2.Items.Clear()
MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
cboHandlingssatz_AMBAR.Items.Clear()
cboHandlingssatz_AMBAR.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
cboHandlingssatz_AMBAR.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
cboHandlingssatz_AMBAR.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
cboHandlingssatz_AMBAR.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
cboFilialeHandling.Items.Clear()
@@ -579,8 +579,12 @@ Public Class usrCntlSpeditionsBuchSuche
For Each p In pnlBerichte.Controls
p.Visible = False
Next
Button25.Visible = True
MyComboBox2.Visible = True
btnHandling_AMBAR.Visible = True
cboHandlingssatz_AMBAR.Visible = True
btnHandling.Visible = False
cboHandlingssatz.Visible = False
End If
@@ -1726,6 +1730,7 @@ Public Class usrCntlSpeditionsBuchSuche
dt_summen.Columns.Add("HANDLING", GetType(Double))
dt_summen.Columns.Add("zu_kassieren_BAR", GetType(Double))
dt_summen.Columns.Add("Grenzstelle", GetType(String))
dt_summen.Columns.Add("FilialNr", GetType(Integer))
@@ -1791,29 +1796,40 @@ Public Class usrCntlSpeditionsBuchSuche
If Not IsDBNull(rpt.Fields.Item("Grenzstelle").Value) Then
Dim grenzstelle As String = rpt.Fields.Item("Grenzstelle").Value.ToString()
Dim existingRow = dt_summen.AsEnumerable().FirstOrDefault(Function(r) r.Field(Of String)("Grenzstelle") = grenzstelle)
Dim filialNr As Integer = -1
If existingRow IsNot Nothing Then
If existingRow Is Nothing Then
existingRow("Anzahl") = CInt(existingRow("Anzahl")) + anz
existingRow("BAR") = CDbl(existingRow("BAR")) + bar
existingRow("HANDLING") = CDbl(existingRow("HANDLING")) + handling
existingRow("zu_kassieren_BAR") = CDbl(existingRow("zu_kassieren_BAR")) + zukassBAR
Else
Dim R As DataRow = dt_summen.NewRow()
R("Anzahl") = anz
R("BAR") = bar
R("HANDLING") = handling
R("zu_kassieren_BAR") = zukassBAR
R("Grenzstelle") = grenzstelle
dt_summen.Rows.Add(R)
Dim filialNrTemp = SQL.getValueTxtBySql("SELECT grz_filialNr from tblGrenzstelle where grz_BezeichnungCBO = '" & grenzstelle & "'", "AVISO")
If filialNrTemp <> "" AndAlso IsNumeric(filialNrTemp) Then
filialNr = CInt(filialNrTemp)
End If
End If
End If
If existingRow IsNot Nothing Then
sumAnz += anz
existingRow("Anzahl") = CInt(existingRow("Anzahl")) + anz
existingRow("BAR") = CDbl(existingRow("BAR")) + bar
existingRow("HANDLING") = CDbl(existingRow("HANDLING")) + handling
existingRow("zu_kassieren_BAR") = CDbl(existingRow("zu_kassieren_BAR")) + zukassBAR
Else
Dim R As DataRow = dt_summen.NewRow()
R("Anzahl") = anz
R("BAR") = bar
R("HANDLING") = handling
R("zu_kassieren_BAR") = zukassBAR
R("Grenzstelle") = grenzstelle
R("FilialNr") = filialNr
dt_summen.Rows.Add(R)
End If
End If
sumAnz += anz
sumBar += bar
sumhandling += handling
sumzukassBAR += zukassBAR
@@ -2141,7 +2157,7 @@ Public Class usrCntlSpeditionsBuchSuche
End Sub
Private Sub Button20_Click(sender As Object, e As EventArgs) Handles Button20.Click
Private Sub Button20_Click(sender As Object, e As EventArgs) Handles btnHandling.Click
If CDate(txtAbfertDat.Text).Year <> CDate(txtAbfertDatBis.Text).Year Then
MsgBox("keine jahresüberschneidende Handlingsauswertung möglich!")
Exit Sub
@@ -2150,14 +2166,15 @@ Public Class usrCntlSpeditionsBuchSuche
Dim HandlingList As VERAG_PROG_ALLGEMEIN.cHandlingssaetzeInternLIST = Nothing
Dim anhang = getrHandlingAussenstellen(CDate(txtAbfertDat.Text), dtAbrechnung, HandlingList, Not cbxHandlingAbrechnen.Checked, cboHandlingssatz.Text.Trim,,)
If anhang = "" Then Exit Sub
If cbxHandlingAbrechnen.Checked Then
If lstFiliale.SelectedItems.Count > 1 Then
MsgBox("Es darf nur eine Filiale ausgewählt werden!")
Exit Sub
End If
Select Case lstFiliale.SelectedItems.Count
Case 0 : MsgBox("Es muss mind. eine Filiale ausgewählt werden!") : Exit Sub
End Select
createHandlingAbrechnung(dtAbrechnung, cboHandlingssatz.Text.Trim, cboHandlingssatz._value, CInt(lstFiliale._value), CDate(txtAbfertDat.Text), CDate(txtAbfertDatBis.Text), anhang, HandlingList)
createHandlingAbrechnung(dtAbrechnung, cboHandlingssatz.Text.Trim, cboHandlingssatz._value, CDate(txtAbfertDat.Text), CDate(txtAbfertDatBis.Text), anhang, HandlingList)
End If
End Sub
@@ -2871,7 +2888,7 @@ Public Class usrCntlSpeditionsBuchSuche
End Function
Private Sub Button25_Click(sender As Object, e As EventArgs) Handles Button25.Click
Private Sub Button25_Click(sender As Object, e As EventArgs) Handles btnHandling_AMBAR.Click
If CDate(txtAbfertDat.Text).Year <> CDate(txtAbfertDatBis.Text).Year Then
MsgBox("keine jahresüberschneidende Handlingsauswertung möglich!")
@@ -2879,7 +2896,7 @@ Public Class usrCntlSpeditionsBuchSuche
End If
Dim where = ""
Select Case MyComboBox2._value
Select Case cboHandlingssatz_AMBAR._value
Case "VERAG" : where = " AND FilialenNr IN (SELECT Filialen.FilialenNr FROM Filialen WHERE Filialen.Firma='VERAG' AND Filialen.FilialenNr NOT IN (4801,4802)) "
Case "IMEX" : where = " AND FilialenNr IN (5501) "
Case "UNISPED" : where = " AND FilialenNr IN (5601) "
@@ -2889,14 +2906,17 @@ Public Class usrCntlSpeditionsBuchSuche
Dim dtAbrechnung As New DataTable
Dim HandlingList As VERAG_PROG_ALLGEMEIN.cHandlingssaetzeInternLIST = Nothing
Dim anhang_path = getrHandlingAussenstellen(CDate(txtAbfertDat.Text), dtAbrechnung, HandlingList, Not cbxHandlingAbrechnen.Checked, "AMBAR an ALL", where, True)
If anhang_path = "" Then Exit Sub
If cbxHandlingAbrechnen.Checked Then
If lstFiliale.SelectedItems.Count > 1 Then
MsgBox("Es darf nur eine Filiale ausgewählt werden!")
Exit Sub
End If
Select Case lstFiliale.SelectedItems.Count
Case 0 : MsgBox("Es muss mind. eine Filiale ausgewählt werden!") : Exit Sub
createHandlingAbrechnung(dtAbrechnung, MyComboBox2._value, MyComboBox2._value, lstFiliale._value, CDate(txtAbfertDat.Text), CDate(txtAbfertDatBis.Text), anhang_path, HandlingList)
End Select
createHandlingAbrechnung(dtAbrechnung, cboHandlingssatz_AMBAR._value, cboHandlingssatz_AMBAR._value, CDate(txtAbfertDat.Text), CDate(txtAbfertDatBis.Text), anhang_path, HandlingList)
End If
End Sub
@@ -2922,7 +2942,7 @@ Public Class usrCntlSpeditionsBuchSuche
End Sub
Private Shared Function createHandlingAbrechnung(dt As DataTable, title As String, anFirma As String, filiale As Integer, von As Date, bis As Date, anhang_path As String, HandlingList As VERAG_PROG_ALLGEMEIN.cHandlingssaetzeInternLIST) As Boolean
Private Shared Function createHandlingAbrechnung(dt As DataTable, title As String, anFirma As String, von As Date, bis As Date, anhang_path As String, HandlingList As VERAG_PROG_ALLGEMEIN.cHandlingssaetzeInternLIST) As Boolean
Try
@@ -2959,7 +2979,8 @@ Public Class usrCntlSpeditionsBuchSuche
For Each row As DataGridViewRow In frm.dgvHandling.SelectedRows
doRechnung(filiale, kdNr, row.Cells("Grenzstelle").Value, row.Cells("Anzahl").Value, von, bis, row.Cells("HANDLING").Value, row.Cells("zu_kassieren_BAR").Value, counter, DS, anFirma.Trim())
doRechnung(CInt(row.Cells("FilialNr").Value), kdNr, row.Cells("Grenzstelle").Value, row.Cells("Anzahl").Value, von, bis, row.Cells("HANDLING").Value, row.Cells("zu_kassieren_BAR").Value, counter, DS, anFirma.Trim())
Next
@@ -3069,7 +3090,7 @@ Public Class usrCntlSpeditionsBuchSuche
SPEDBUCH.Umrechnungskurs = Nothing
SPEDBUCH.veoerz_basbtg = Nothing
SPEDBUCH.Sicherheitsbetrag = Nothing
SPEDBUCH.AnzahlZA = anzahl
SPEDBUCH.Abfertigungsanzahl = anzahl
SPEDBUCH.Bemerkungen = "Sammelrechnung " & von.ToShortDateString & " - " & bis.ToShortDateString & " / Abfertigungen: " & anzahl
@@ -3288,7 +3309,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()

64
SDL/buchhaltung/usrCntlBH.Designer.vb generated
View File

@@ -174,6 +174,9 @@ Partial Class usrCntlBH
Me.txtZRvon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtZRbis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label51 = New System.Windows.Forms.Label()
Me.Button15 = New System.Windows.Forms.Button()
Me.Label61 = New System.Windows.Forms.Label()
Me.txtMonateSyskavergleich = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.pnl.SuspendLayout()
Me.TabPage1.SuspendLayout()
Me.GroupBox13.SuspendLayout()
@@ -871,6 +874,9 @@ Partial Class usrCntlBH
'
'GroupBox2
'
Me.GroupBox2.Controls.Add(Me.txtMonateSyskavergleich)
Me.GroupBox2.Controls.Add(Me.Label61)
Me.GroupBox2.Controls.Add(Me.Button15)
Me.GroupBox2.Controls.Add(Me.Label2)
Me.GroupBox2.Controls.Add(Me.Label5)
Me.GroupBox2.Controls.Add(Me.Button1)
@@ -883,7 +889,7 @@ Partial Class usrCntlBH
'Label2
'
Me.Label2.AutoSize = True
Me.Label2.Location = New System.Drawing.Point(145, 30)
Me.Label2.Location = New System.Drawing.Point(145, 23)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(291, 26)
Me.Label2.TabIndex = 2
@@ -904,9 +910,9 @@ Partial Class usrCntlBH
'
Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.Button1.Location = New System.Drawing.Point(6, 19)
Me.Button1.Location = New System.Drawing.Point(6, 10)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(121, 49)
Me.Button1.Size = New System.Drawing.Size(121, 37)
Me.Button1.TabIndex = 1
Me.Button1.Text = "Abgleich starten"
Me.Button1.UseVisualStyleBackColor = True
@@ -2252,6 +2258,55 @@ Partial Class usrCntlBH
Me.Label51.TabIndex = 36
Me.Label51.Text = "Zinsnachberechnung"
'
'Button15
'
Me.Button15.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
Me.Button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button15.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.Button15.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.Button15.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button15.Location = New System.Drawing.Point(6, 49)
Me.Button15.Name = "Button15"
Me.Button15.Size = New System.Drawing.Size(121, 31)
Me.Button15.TabIndex = 29
Me.Button15.Text = " Excel"
Me.Button15.UseVisualStyleBackColor = True
'
'Label61
'
Me.Label61.AutoSize = True
Me.Label61.Location = New System.Drawing.Point(145, 61)
Me.Label61.Name = "Label61"
Me.Label61.Size = New System.Drawing.Size(226, 13)
Me.Label61.TabIndex = 30
Me.Label61.Text = "Kunden ohne FIBU-Filiale der letzten x Monate"
'
'txtMonateSyskavergleich
'
Me.txtMonateSyskavergleich._DateTimeOnly = False
Me.txtMonateSyskavergleich._numbersOnly = True
Me.txtMonateSyskavergleich._numbersOnlyKommastellen = ""
Me.txtMonateSyskavergleich._numbersOnlyTrennzeichen = False
Me.txtMonateSyskavergleich._Prozent = False
Me.txtMonateSyskavergleich._ShortDateNew = False
Me.txtMonateSyskavergleich._ShortDateOnly = False
Me.txtMonateSyskavergleich._TimeOnly = False
Me.txtMonateSyskavergleich._TimeOnly_Seconds = False
Me.txtMonateSyskavergleich._value = ""
Me.txtMonateSyskavergleich._Waehrung = False
Me.txtMonateSyskavergleich._WaehrungZeichen = False
Me.txtMonateSyskavergleich.ForeColor = System.Drawing.Color.Black
Me.txtMonateSyskavergleich.Location = New System.Drawing.Point(383, 58)
Me.txtMonateSyskavergleich.MaxLength = 2
Me.txtMonateSyskavergleich.MaxLineLength = -1
Me.txtMonateSyskavergleich.MaxLines_Warning = ""
Me.txtMonateSyskavergleich.MaxLines_Warning_Label = Nothing
Me.txtMonateSyskavergleich.Name = "txtMonateSyskavergleich"
Me.txtMonateSyskavergleich.Size = New System.Drawing.Size(24, 20)
Me.txtMonateSyskavergleich.TabIndex = 43
Me.txtMonateSyskavergleich.Text = "3"
Me.txtMonateSyskavergleich.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
'
'usrCntlBH
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2456,4 +2511,7 @@ Partial Class usrCntlBH
Friend WithEvents Label60 As Label
Friend WithEvents Label58 As Label
Friend WithEvents btnfortlRENr As Button
Friend WithEvents txtMonateSyskavergleich As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents Label61 As Label
Friend WithEvents Button15 As Button
End Class

27
SDL/buchhaltung/usrCntlBH.vb
View File

@@ -1593,5 +1593,32 @@ Public Class usrCntlBH
End Sub
Private Sub Button15_Click_1(sender As Object, e As EventArgs) Handles Button15.Click
If txtMonateSyskavergleich.Text <> "" AndAlso IsNumeric(txtMonateSyskavergleich.Text) Then
Dim SQLString = "select RechnungsKundenNr, Adressen.[Name 1], Kunden.FilialenNr, MAX(cast(RechnungsDatum as Date)) as aktuellsteRE from Rechnungsausgang
inner join Kunden on Kunden.KundenNr = Rechnungsausgang.KundenNrZentrale
inner join Adressen on Adressen.AdressenNr = Kunden.KundenNr
where cast(RechnungsDatum as date) >= DATEADD(MONTH,-" & txtMonateSyskavergleich.Text & ", GETDATE()) and Kunden.FiBuSchnittstelle = 0 and Kunden.FiBuSchnittstelleNr is null
group by RechnungsKundenNr, Adressen.[Name 1], Kunden.FilialenNr
order by MAX(cast(RechnungsDatum as Date)) "
Me.Cursor = Cursors.WaitCursor
Dim dt_RE As DataTable = SQL.loadDgvBySql(SQLString, "FMZOLL")
If dt_RE.Rows.Count > 0 Then
cProgramFunctions.genExcelFromDT_NEW(dt_RE,,, "Kunden ohne FIBU-Filiale mit Belegen der letzten " & txtMonateSyskavergleich.Text & " Monate",,, True)
Me.Cursor = Cursors.Default
Else
MsgBox("keine Daten für den ausgewählten Zeitraum!")
Me.Cursor = Cursors.Default
End If
End If
End Sub
End Class

3
SDL/kunden/frmKundenUebersichtZOLL.vb
View File

@@ -212,13 +212,10 @@ Public Class frmKundenUebersichtZOLL
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("KUNDEN_Fiskaldaten", Me) Then
mnueFiskal.Visible = True
mnueFiskaluebersicht.Visible = True
mnueFiskaluebersicht.Visible = True
End If
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("CBAM", Me) Then
mnueCBAM.Visible = True
mnueCBAM.Visible = True
mnueCBAM.Visible = True
End If

561
SDL/mdm/frmMDMDatenverarbetiung.vb
View File

@@ -1,4 +1,6 @@
Imports System.Data.OleDb
Imports System.Configuration
Imports System.Data.OleDb
Imports System.Data.SqlClient
Imports System.IO
Imports System.Runtime.InteropServices
Imports itextsharp.text.pdf
@@ -94,7 +96,7 @@ Public Class frmMDMDatenverarbetiung
btnDatenLaden.Text = "Daten laden"
Case "IDS" : checkImport(LIEFERANT) : initDgv_IDS()
btnDatenLaden.Text = "Daten laden"
Button1.Enabled = False
'Button1.Enabled = False
Case "MSE" : checkImport(LIEFERANT) : initDgv_MSE()
btnDatenLaden.Text = "Daten laden"
End Select
@@ -2013,36 +2015,30 @@ Public Class frmMDMDatenverarbetiung
Dim displayFilter = False
Dim sqlstr As String = ""
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,case when plose_BeschreibungAusfahrt is null and plose_BeschreibungMautTankstelle = 'Bregana' then 'Bregana' else isnull(plose_BeschreibungAusfahrt,'') end as plose_BeschreibungAusfahrt,plose_NettobetragWaehrungAbbuchung,(plose_BruttobetragWaehrungAbbuchung-plose_NettobetragWaehrungAbbuchung) as Steuer,plose_BruttobetragWaehrungAbbuchung "
sqlstr &= " SELECT 'PLOSE' as ,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,case when plose_BeschreibungAusfahrt is null and plose_BeschreibungMautTankstelle = 'Bregana' then 'Bregana' else isnull(plose_BeschreibungAusfahrt,'') end as 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 (" & ProduktCode_NOT_IN & " ) AND plp_Land NOT IN ('AT','DE') "
sqlstr &= " AND cast(plose_FakturiertDatum as date) = '20.04.2026' AND plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & " ) 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 cast(plose_FakturiertDatum as date) = '06.05.2026' 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"
' sqlstr &= " group by plose_ProduktCode"
' MsgBox(sqlstr)
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
Dim sqlstrAT As String = ""
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 (" & ProduktCode_NOT_IN & " ) 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') "
sqlstr &= " AND cast(plose_FakturiertDatum as date) = '20.04.2026' AND plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & " ) AND plp_Land NOT IN ('AT','DE') "
'sqlstr &= " AND cast(plose_FakturiertDatum as date) = '06.05.2026' AND plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & " ) AND plp_Land NOT 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"
' sqlstr &= " group by plose_ProduktCode"
' MsgBox(sqlstr)
Dim dtAT As DataTable = SQL.loadDgvBySql_Param(sqlstrAT, "FMZOLL")
@@ -2057,21 +2053,6 @@ Public Class frmMDMDatenverarbetiung
End If
End If
'Dim connectionString = ""
'If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
' connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD_Test.accd"
'Else
' connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD.accdb"
'End If
'Dim con As New OleDbConnection(connectionString)
Dim cmd As New OleDbCommand
Dim var1 As String
Dim adapter As OleDbDataAdapter = New OleDbDataAdapter()
Dim reader As OleDbDataReader = Nothing
If dt IsNot Nothing Then
@@ -2082,34 +2063,11 @@ Public Class frmMDMDatenverarbetiung
SQL.doSQL("INSERT INTO tblMautbericht (Datenquelle,[Customer No],[Licence Plate Number],[Transaction Date],[Transaction Country],[Product description],[Card Number],[Entry Terminal],[Exit Terminal],[Net Amount],[VAT Amount],[Total Amount], [BillingDate]) VALUES ('" &
r(0) & "'," & r(1) & ",'" & r(2) & "','" & r(3) & "','" & r(4) & "','" & r(5).ToString.Replace("'", " ") & "','" & r(6) & "','" & r(7).ToString.Replace("'", " ") & "','" & r(8).ToString.Replace("'", " ") & "'," & CDbl(r(9)).ToString.Replace(",", ".") & "," & CDbl(r(10)).ToString.Replace(",", ".") & "," & CDbl(r(11)).ToString.Replace(",", ".") & ",'" & datPloseAnhang.Text & "')", "FMZOLL")
'Zeitstempel
'Dim SQLQuery = "INSERT INTO tblMautbericht (Datenquelle,[Customer No],[Licence Plate Number],[Transaction Date],[Transaction Country],[Product description],[Card Number],[Entry Terminal],[Exit Terminal],[Nett Amount],[VAT Amount],[Total Amount]) VALUES (@P1,@P2,@P3,@P4,@P5,@P6,@P7,@P8,@P9,@P10,@P11,@P12) "
'' "SELECT * FROM DBParent WHERE P_ID = " & UniqeID & ";"
'Using Command As New OleDbCommand(SQLQuery, con)
' Command.Parameters.AddWithValue("@P1", r(0))
' Command.Parameters.AddWithValue("@P2", r(1))
' Command.Parameters.AddWithValue("@P3", r(2))
' Command.Parameters.AddWithValue("@P4", r(3))
' Command.Parameters.AddWithValue("@P5", r(4))
' Command.Parameters.AddWithValue("@P6", r(5))
' Command.Parameters.AddWithValue("@P7", r(6))
' Command.Parameters.AddWithValue("@P8", r(7))
' Command.Parameters.AddWithValue("@P9", r(8))
' Command.Parameters.AddWithValue("@P10", CDbl(r(9)))
' Command.Parameters.AddWithValue("@P11", CDbl(r(10)))
' Command.Parameters.AddWithValue("@P12", CDbl(r(11)))
' If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Command.ExecuteNonQuery()
' Command.Dispose()
'End Using
Catch ex2 As System.Exception
MsgBox("err: " & ex2.Message & ex2.StackTrace)
Finally
If reader IsNot Nothing Then reader.Close()
End Try
@@ -2127,6 +2085,109 @@ Public Class frmMDMDatenverarbetiung
End Function
Function genPLOSEInsertMautD_NEW(von As Date, bis As Date) As Boolean
Try
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
pic.Visible = False
Dim SQL_String_OHNE_DE_AT = "SELECT
'PLOSE' AS Datenquelle,
AdressenNr AS [Customer No],
plose_Kennzeichen AS [Licence Plate Number],
plp_Land AS [Transaction Country],
cast(plose_DatumTransaktion as Date) AS [Transaction Date],
ISNULL(tblPLOSE_Produktbeschreibung.plp_Description_EN, plose_Produktbeschreibung) AS [Product description],
ISNULL(plose_NummerKarteGeraet, plose_Kontonummer) AS [Card number],
ISNULL(plose_BeschreibungEinfahrt, '') AS [Entry Terminal],
CASE
WHEN plose_BeschreibungAusfahrt IS NULL
AND plose_BeschreibungMautTankstelle = 'Bregana'
THEN 'Bregana'
ELSE ISNULL(plose_BeschreibungAusfahrt, '')
END AS [Exit Terminal],
plose_NettobetragWaehrungAbbuchung AS [Net Amount],
(plose_BruttobetragWaehrungAbbuchung - plose_NettobetragWaehrungAbbuchung) AS [VAT Amount],
plose_BruttobetragWaehrungAbbuchung AS [Total Amount]
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
WHERE
plose_Fakturiert=0 AND plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & ") AND plp_Land NOT IN ('AT','DE') AND plose_DatumTransaktion between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' "
Dim SQL_String_MIT_DE_AT = " SELECT 'PLOSE' AS Datenquelle,
AdressenNr AS [Customer No],
plose_Kennzeichen AS [Licence Plate Number],
plp_Land AS [Transaction Country],
cast(plose_DatumTransaktion as Date) AS [Transaction Date],
'' AS [Product description],
plose_NummerKarteGeraet AS [Card number],
'' AS [Entry Terminal],
'' AS [Exit Terminal],
SUM(plose_NettobetragWaehrungAbbuchung) AS [Net Amount],
SUM(plose_BruttobetragWaehrungAbbuchung - plose_NettobetragWaehrungAbbuchung) AS [VAT Amount],
SUM(plose_BruttobetragWaehrungAbbuchung) AS [Total Amount]
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
WHERE
plose_Fakturiert=0 AND plose_ProduktCode NOT IN ( " & ProduktCode_NOT_IN & ") AND plp_Land IN ('AT','DE') AND plose_DatumTransaktion between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "'
GROUP BY plp_Land,AdressenNr,plose_Kennzeichen,plose_DatumTransaktion,plose_NummerKarteGeraet"
Dim sqlstr As String = "SELECT *, cast( '" & datPloseAnhang.Text & "' as date) as Billingdate FROM ( " & SQL_String_OHNE_DE_AT & " UNION ALL " & SQL_String_MIT_DE_AT & " ) AS TEMP ORDER BY TEMP.[Licence Plate Number];"
Dim updated As Boolean = False
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
If dt.Rows.Count > 0 Then
Dim InsertSatement As String = " INSERT INTO tblMautbericht
(
Datenquelle,
[Customer No],
[Licence Plate Number],
[Transaction Country],
[Transaction Date],
[Product description],
[Card Number],
[Entry Terminal],
[Exit Terminal],
[Net Amount],
[VAT Amount],
[Total Amount],
[Billingdate]
)"
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
updated = SQL.doSQL(InsertSatement & sqlstr, "FMZOLL",,,, 500)
End If
End If
pic.Visible = updated
Return updated
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return False
End Function
Function genASFINAGInsertMautAT(kdNr) As Boolean
Try
pic.Visible = False
@@ -2140,16 +2201,16 @@ Public Class frmMDMDatenverarbetiung
sqlstr = " select
'AT'
,Adressen.AdressenNr
,licenceplate
,turnoverdate
,'AT'
,contractPartner as ProductCode
,[cardnumber] as CardNumber
,[netAmount] as Netamount
,[VATamount] as VATAmount
,[totalAmount] as totalAmount
'AT' as Datenquelle
,Adressen.AdressenNr as [Customer No]
,licenceplate as [Licence Plate Number]
,'AT' as [Transaction Country]
,turnoverdate as [Transaction Date]
,contractPartner as [Product description]
,[cardnumber] as [Card Number]
,[netAmount] as [Net Amount]
,[VATamount] as [VAT Amount]
,[totalAmount] as [Total Amount]
FROM [VERAG].[dbo].[tblAsfinagMaut]
INNER JOIN [VERAG].[dbo].Kreditkarten ON cardnumber = Kreditkarten.KartenNr
INNER JOIN [VERAG].[dbo].Adressen ON Adressen.AdressenNr = Kreditkarten.AdressenNr
@@ -2159,93 +2220,40 @@ Public Class frmMDMDatenverarbetiung
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
Dim sqlstrAT As String = ""
sqlstrAT &= "select 'AT'
,Adressen.AdressenNr
,licenceplate
,turnoverdate
,'AT' as land
,'' as ProductCode
,[cardnumber] as CardNumber
,sum([netAmount]) as Netamount
,sum([VATamount]) as VATAmount
,sum([totalAmount]) as totalAmount
FROM [VERAG].[dbo].[tblAsfinagMaut]
INNER JOIN [VERAG].[dbo].Kreditkarten ON cardnumber = Kreditkarten.KartenNr
INNER JOIN [VERAG].[dbo].Adressen ON Adressen.AdressenNr = Kreditkarten.AdressenNr
WHERE 1 = 1 " & sqlWhere & "
group by Adressen.AdressenNr, licenceplate,turnoverdate,CardNumber
order by Adressen.AdressenNr"
Dim dtAT As DataTable = SQL.loadDgvBySql_Param(sqlstrAT, "FMZOLL")
'AT ---> Gruppiert
'If dtAT IsNot Nothing AndAlso dtAT.Rows.Count > 0 Then
' If dt Is Nothing OrElse dt.Rows.Count = 0 Then
' dt = dtAT
' Else
' For Each r In dtAT.Rows
' dt.Rows.Add({r(0), r(1), r(2), r(3), r(4), r(5), r(6), r(7), r(8), r(9)})
' Next
' End If
'End If
'Dim connectionString = ""
'If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
' connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD_Test.accdb"
'Else
' connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD.accdb"
'End If
'Dim con As New OleDbConnection(connectionString)
'Dim cmd As New OleDbCommand
'Dim var1 As String
'Dim adapter As OleDbDataAdapter = New OleDbDataAdapter()
'Dim reader As OleDbDataReader = Nothing
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
If dt IsNot Nothing Then
For Each r In dt.Rows
Try
'Zeitstempel
SQL.doSQL("INSERT INTO tblMautbericht (Datenquelle,[Customer No],[Licence Plate Number],[Transaction Date],[Transaction Country],[Product description],[Card Number],[Net Amount],[VAT Amount],[Total Amount], [BillingDate]) VALUES ('" &
r(0) & "'," & r(1) & ",'" & r(2) & "','" & r(3) & "','" & r(4) & "','" & r(5).ToString.Replace("'", " ") & "','" & r(6) & "'," & CDbl(r(7)).ToString.Replace(",", ".") & "," & CDbl(r(8)).ToString.Replace(",", ".") & "," & CDbl(r(9)).ToString.Replace(",", ".") & ",'" & datPloseAnhang.Text & "')", "FMZOLL")
Dim sqlstrBULKIMPORT As String = "SELECT *, cast( '" & datPloseAnhang.Text & "' as date) as Billingdate FROM ( " & sqlstr & " ) AS TEMP ORDER BY TEMP.[Customer No];"
Dim updated As Boolean = False
'Dim SQLQuery = "INSERT INTO tblMautbericht (Datenquelle,[Customer No],[Licence Plate Number],[Transaction Date],[Transaction Country],[Product description],[Card Number],[Nett Amount],[VAT Amount],[Total Amount]) VALUES (@P1,@P2,@P3,@P4,@P5,@P6,@P7,@P8,@P9,@P10) "
'' "SELECT * FROM DBParent WHERE P_ID = " & UniqeID & ";"
'Using Command As New OleDbCommand(SQLQuery, con)
Dim InsertSatement As String = " INSERT INTO tblMautbericht
(
Datenquelle,
[Customer No],
[Licence Plate Number],
[Transaction Country],
[Transaction Date],
[Product description],
[Card Number],
[Entry Terminal],
[Exit Terminal],
[Net Amount],
[VAT Amount],
[Total Amount],
[Billingdate]
)"
' Command.Parameters.AddWithValue("@P1", r(0))
' Command.Parameters.AddWithValue("@P2", r(1))
' Command.Parameters.AddWithValue("@P3", r(2))
' Command.Parameters.AddWithValue("@P4", r(3))
' Command.Parameters.AddWithValue("@P5", r(4))
' Command.Parameters.AddWithValue("@P6", r(5))
' Command.Parameters.AddWithValue("@P7", r(6))
' Command.Parameters.AddWithValue("@P8", CDbl(r(7)))
' Command.Parameters.AddWithValue("@P9", CDbl(r(8)))
' Command.Parameters.AddWithValue("@P10", CDbl(r(9)))
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
' If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Command.ExecuteNonQuery()
' Command.Dispose()
'End Using
updated = SQL.doSQL(InsertSatement & sqlstrBULKIMPORT, "FMZOLL",,,, 500)
Catch ex2 As System.Exception
' MsgBox("err: " & ex2.Message & ex2.StackTrace)
'Finally
' If reader IsNot Nothing Then reader.Close()
End Try
End If
Next
End If
pic.Visible = True
@@ -2271,15 +2279,16 @@ Public Class frmMDMDatenverarbetiung
End If
sqlstr = "SELECT 'UTA',qryUTA_Fakturierungspositionen.KundenNr AS [Customer No],
isnull([KFZ_Kennzeichen_komprimiert],isnull([KFZ_Kennzeichen],isnull([Prägetext_i_d_R_KFZ_Kennzeichen],''))) AS LicencePlateNumber,
sqlstr = "SELECT 'UTA' as Datenquelle,
qryUTA_Fakturierungspositionen.KundenNr AS [Customer No],
isnull([KFZ_Kennzeichen_komprimiert],isnull([KFZ_Kennzeichen],isnull([Prägetext_i_d_R_KFZ_Kennzeichen],''))) AS [Licence Plate Number],
cast([Belegdatum] as datetime) AS [Transaction Date],
qryUTA_Fakturierungspositionen.Lieferland AS [Transaction Country],
qryUTA_Fakturierungspositionen.Warenart AS [Product description],
qryUTA_Fakturierungspositionen.Kartennummer AS [Card number],
qryUTA_Fakturierungspositionen.Kartennummer AS [Card Number],
qryUTA_Fakturierungspositionen.Autobahnauffahrt AS [Entry Terminal],
qryUTA_Fakturierungspositionen.Autobahnausfahrt AS [Exit Terminal],
qryUTA_Fakturierungspositionen.Gesamtbetrag_Netto_in_Darstellwährung AS [Nett Amount],
qryUTA_Fakturierungspositionen.Gesamtbetrag_Netto_in_Darstellwährung AS [Net Amount],
qryUTA_Fakturierungspositionen.Gesamtbetrag_Umsatzsteuer_in_Darstellwährung AS [VAT Amount],
qryUTA_Fakturierungspositionen.Gesamtbetrag_Brutto_in_Darstellwährung AS [Total Amount]
@@ -2295,67 +2304,35 @@ Public Class frmMDMDatenverarbetiung
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL", 60)
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
Dim sqlstrBULKIMPORT As String = "SELECT *, cast( '" & datPloseAnhang.Text & "' as date) as Billingdate FROM ( " & sqlstr & " ) AS TEMP ORDER BY TEMP.[Customer No];"
Dim updated As Boolean = False
Dim InsertSatement As String = " INSERT INTO tblMautbericht
(
Datenquelle,
[Customer No],
[Licence Plate Number],
[Transaction Country],
[Transaction Date],
[Product description],
[Card Number],
[Entry Terminal],
[Exit Terminal],
[Net Amount],
[VAT Amount],
[Total Amount],
[Billingdate]
)"
'Dim connectionString = ""
'If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
' connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD_Test.accdb"
'Else
' connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD.accdb"
'End If
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
'Dim con As New OleDbConnection(connectionString)
'Dim cmd As New OleDbCommand
'Dim var1 As String
updated = SQL.doSQL(InsertSatement & sqlstrBULKIMPORT, "FMZOLL",,,, 500)
'Dim adapter As OleDbDataAdapter = New OleDbDataAdapter()
'Dim reader As OleDbDataReader = Nothing
End If
If dt IsNot Nothing Then
'con.Open()
For Each r In dt.Rows
Try
'Zeitstempel
SQL.doSQL("INSERT INTO tblMautbericht (Datenquelle,[Customer No],[Licence Plate Number],[Transaction Date],[Transaction Country],[Product description],[Card Number],[Entry Terminal],[Exit Terminal],[Net Amount],[VAT Amount],[Total Amount], [BillingDate]) VALUES ('" &
r(0) & "'," & r(1) & ",'" & r(2) & "','" & r(3) & "','" & r(4) & "','" & r(5).ToString.Replace("'", " ") & "','" & r(6) & "','" & r(7).ToString.Replace("'", " ") & "','" & r(8).ToString.Replace("'", " ") & "'," & CDbl(r(9)).ToString.Replace(",", ".") & "," & CDbl(r(10)).ToString.Replace(",", ".") & "," & CDbl(r(11)).ToString.Replace(",", ".") & ",'" & datPloseAnhang.Text & "')", "FMZOLL")
'Dim SQLQuery = "INSERT INTO tblMautbericht (Datenquelle,[Customer No],[Licence Plate Number],[Transaction Date],[Transaction Country],[Product description],[Card Number],[Entry Terminal],[Exit Terminal],[Nett Amount],[VAT Amount],[Total Amount]) VALUES (@P1,@P2,@P3,@P4,@P5,@P6,@P7,@P8,@P9,@P10,@P11,@P12) "
'' "SELECT * FROM DBParent WHERE P_ID = " & UniqeID & ";"
'Using Command As New OleDbCommand(SQLQuery, con)
' Command.Parameters.AddWithValue("@P1", r(0))
' Command.Parameters.AddWithValue("@P2", r(1))
' Command.Parameters.AddWithValue("@P3", r(2))
' Command.Parameters.AddWithValue("@P4", r(3))
' Command.Parameters.AddWithValue("@P5", r(4))
' Command.Parameters.AddWithValue("@P6", r(5))
' Command.Parameters.AddWithValue("@P7", r(6))
' Command.Parameters.AddWithValue("@P8", r(7))
' Command.Parameters.AddWithValue("@P9", r(8))
' Command.Parameters.AddWithValue("@P10", CDbl(r(9)))
' Command.Parameters.AddWithValue("@P11", CDbl(r(10)))
' Command.Parameters.AddWithValue("@P12", CDbl(r(11)))
' If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Command.ExecuteNonQuery()
' Command.Dispose()
'End Using
Catch ex2 As System.Exception
MsgBox("err: " & ex2.Message & ex2.StackTrace)
'Finally
' If reader IsNot Nothing Then reader.Close()
End Try
Next
'con.Close()
End If
pic.Visible = True
Return True
@@ -2380,10 +2357,12 @@ Public Class frmMDMDatenverarbetiung
End If
sqlstr = " Select 'MSE',adressen.AdressenNr As [Customer No],
sqlstr = " Select 'MSE' as Datenquelle,
adressen.AdressenNr As [Customer No],
trans.license_plate_number as [Licence Plate Number],
cast(trans.[purchase_datetime] as Date) as [Transaction Date],
trans.transaction_country As [Transaction Country],trans.device_product_type As [Product description],
trans.transaction_country As [Transaction Country],
trans.device_product_type As [Product description],
trans.device_product_number as [Card Number],
trans.entry_point_name as [Entry Terminal],
trans.exit_point_name as [Exit Terminal],
@@ -2400,64 +2379,39 @@ Public Class frmMDMDatenverarbetiung
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
'Dim connectionString = ""
'If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
' connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD_Test.accdb"
'Else
' connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD.accdb"
'End If
'Dim con As New OleDbConnection(connectionString)
'Dim cmd As New OleDbCommand
'Dim var1 As String
'Dim adapter As OleDbDataAdapter = New OleDbDataAdapter()
'Dim reader As OleDbDataReader = Nothing
If dt IsNot Nothing Then
'con.Open()
For Each r In dt.Rows
Try
'Zeitstempel
SQL.doSQL("INSERT INTO tblMautbericht (Datenquelle,[Customer No],[Licence Plate Number],[Transaction Date],[Transaction Country],[Product description],[Card Number],[Entry Terminal],[Exit Terminal],[Net Amount],[VAT Amount],[Total Amount], [BillingDate]) VALUES ('" &
r(0) & "'," & r(1) & ",'" & r(2) & "','" & r(3) & "','" & r(4) & "','" & r(5).ToString.Replace("'", " ") & "','" & r(6) & "','" & r(7).ToString.Replace("'", " ") & "','" & r(8).ToString.Replace("'", " ") & "'," & CDbl(r(9)).ToString.Replace(",", ".") & "," & CDbl(r(10)).ToString.Replace(",", ".") & "," & CDbl(r(11)).ToString.Replace(",", ".") & ",'" & datPloseAnhang.Text & "')", "FMZOLL")
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
Dim sqlstrBULKIMPORT As String = "SELECT *, cast( '" & datPloseAnhang.Text & "' as date) as Billingdate FROM ( " & sqlstr & " ) AS TEMP ORDER BY TEMP.[Customer No];"
Dim updated As Boolean = False
Dim InsertSatement As String = " INSERT INTO tblMautbericht
(
Datenquelle,
[Customer No],
[Licence Plate Number],
[Transaction Country],
[Transaction Date],
[Product description],
[Card Number],
[Entry Terminal],
[Exit Terminal],
[Net Amount],
[VAT Amount],
[Total Amount],
[Billingdate]
)"
' Dim SQLQuery = "INSERT INTO tblMautbericht (Datenquelle,[Customer No],[Licence Plate Number],[Transaction Date],[Transaction Country],[Product description],[Card Number],[Entry Terminal],[Exit Terminal],[Nett Amount],[VAT Amount],[Total Amount]) VALUES (@P1,@P2,@P3,@P4,@P5,@P6,@P7,@P8,@P9,@P10,@P11,@P12) "
' ' "SELECT * FROM DBParent WHERE P_ID = " & UniqeID & ";"
' Using Command As New OleDbCommand(SQLQuery, con)
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
' Command.Parameters.AddWithValue("@P1", r(0))
' Command.Parameters.AddWithValue("@P2", r(1))
' Command.Parameters.AddWithValue("@P3", r(2))
' Command.Parameters.AddWithValue("@P4", r(3))
' Command.Parameters.AddWithValue("@P5", r(4))
' Command.Parameters.AddWithValue("@P6", r(5))
' Command.Parameters.AddWithValue("@P7", r(6))
' Command.Parameters.AddWithValue("@P8", r(7))
' Command.Parameters.AddWithValue("@P9", r(8))
' Command.Parameters.AddWithValue("@P10", CDbl(r(9)))
' Command.Parameters.AddWithValue("@P11", CDbl(r(10)))
' Command.Parameters.AddWithValue("@P12", CDbl(r(11)))
updated = SQL.doSQL(InsertSatement & sqlstrBULKIMPORT, "FMZOLL",,,, 500)
' If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Command.ExecuteNonQuery()
' Command.Dispose()
' End Using
End If
Catch ex2 As System.Exception
MsgBox("err: " & ex2.Message & ex2.StackTrace)
'Finally
' If reader IsNot Nothing Then reader.Close()
End Try
Next
'con.Close()
End If
pic.Visible = True
Return True
@@ -2469,44 +2423,81 @@ Public Class frmMDMDatenverarbetiung
End Function
Function genIDSInsertMaut(kdNr, IDS) As Boolean
Try
pic.Visible = False
Dim displayFilter = False
Dim sqlstr As String = ""
Dim sqlWhere As String = ""
If kdNr <> "" Then
sqlWhere &= " AND Adressen.AdressenNr=" & kdNr
End If
Dim SQL_IDS = "SELECT 'IDS' as Datenquelle,
trans.KdNrVERAG As [Customer No],
isnull(det.LicencePlateNumber,'-') as [Licence Plate Number],
land.Lieferland_ISO2 As [Transaction Country],
det.Transactiondate as [Transaction Date] ,
'' AS [Product description],
det.CardNumber as [Card Number] ,
'' as [Entry Terminal],
'' as [Exit Terminal],
sum(det.[TotalNetAmount]) AS [Nett Amount],
sum(det.[VATAmount]) AS[VAT Amount],
sum(det.[AmminclVAT]) AS [Total Amount]
FROM [VERAG].[dbo].[tblIDSTransactionsNew_Details] as det
inner join [tblIDSTransactionsNew] as trans on det.[YearMonthDay] = trans.[YearMonthDay] and det.[CustomerCode] = trans.[CustomerCode] and det.[OutletCountryCode] = trans.[OutletCountryCode] and det.[OutletCode] = trans.[OutletCode] and det.[ProductTypeCode] = trans.[ProductTypeCode]
inner join [VERAG].[dbo].[tbl_IDS_Länder] as land on det.OutletCountryCode = land.OutletCountryCode
where cast(det.[YearMonthDay] as date) = '" & DateTimePicker2.Text & "' and trans.charged = 1
group by trans.KdNrVERAG,det.CustomerCode, det.[YearMonthDay], det.CardNumber, land.Lieferland_ISO2, det.LicencePlateNumber,det.Transactiondate "
Dim dt As DataTable = SQL.loadDgvBySql_Param(SQL_IDS, "FMZOLL")
Dim sqlstrBULKIMPORT As String = "SELECT *, cast( '" & datPloseAnhang.Text & "' as date) as Billingdate FROM ( " & SQL_IDS & " ) AS TEMP ORDER BY TEMP.[Customer No];"
Dim updated As Boolean = False
Dim InsertSatement As String = " INSERT INTO tblMautbericht
(
Datenquelle,
[Customer No],
[Licence Plate Number],
[Transaction Country],
[Transaction Date],
[Product description],
[Card Number],
[Entry Terminal],
[Exit Terminal],
[Net Amount],
[VAT Amount],
[Total Amount],
[Billingdate]
)"
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
updated = SQL.doSQL(InsertSatement & sqlstrBULKIMPORT, "FMZOLL",,,, 500)
End If
pic.Visible = updated
Return updated
Catch ex As System.Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return False
End Function
Function deleteMautD(Datenquelle As String) As Boolean
Try
'Dim connectionString = ""
'If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
' connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD_Test.accdb"
'Else
' connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD.accdb"
'End If
'Dim con As New OleDbConnection(connectionString)
'Dim cmd As New OleDbCommand
'Dim var1 As String
'Dim adapter As OleDbDataAdapter = New OleDbDataAdapter()
'Dim reader As OleDbDataReader = Nothing
'FMZOLL-Tabelle
'Try
' con.Open()
' 'Zeitstempel
' Dim SQLQuery = "DELETE FROM tblMautbericht WHERE Datenquelle='" & Datenquelle & "' "
' Using Command As New OleDbCommand(SQLQuery, con)
' If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Command.ExecuteNonQuery()
' Command.Dispose()
' End Using
'Catch ex2 As System.Exception
' MsgBox("err: " & ex2.Message & ex2.StackTrace)
' 'Finally
' ' If reader IsNot Nothing Then reader.Close()
'End Try
'con.Close()
Return SQL.doSQL("DELETE FROM tblMautbericht WHERE Datenquelle='" & Datenquelle & "' AND cast(Billingdate as Date)= '" & datPloseAnhang.Text & "'", "FMZOLL")
@@ -4766,10 +4757,12 @@ Public Class frmMDMDatenverarbetiung
Function MautD_Befuellen(Optional kdNr = "", Optional _Lieferant = "") As Boolean
Select Case LIEFERANT
Case "PLOSE" : deleteMautD("PLOSE") : Return genPLOSEInsertMautD(dat_Sum_Von.Value.ToShortDateString, dat_Sum_Bis.Value.ToShortDateString)
Case "PLOSE" : deleteMautD("PLOSE") : Return genPLOSEInsertMautD_NEW(dat_Sum_Von.Value.ToShortDateString, dat_Sum_Bis.Value.ToShortDateString)
Case "ASFINAG" : deleteMautD("AT") : Return genASFINAGInsertMautAT(kdNr)
Case "UTA" : deleteMautD("UTA") : Return genUTAInsertMaut(kdNr)
Case "MSE" : deleteMautD("MSE") : Return genMSEInsertMaut(kdNr)
Case "IDS" : deleteMautD("IDS") : Return genIDSInsertMaut(kdNr, LIEFERANT)
End Select
Return False
End Function
@@ -5304,7 +5297,7 @@ RabattBerechnen:
Dim idsParam As New cIDS()
idsParam.initImportPfade("IDS")
If genRGAtt_IDS(item.Name, idsParam) Then
If Not test Then
If Not test AndAlso MautD_Befuellen() Then
setFakturiert(item.Name)
End If
End If

14
SDL/seriendruck/usrCntlFakturierung.vb
View File

@@ -29,9 +29,9 @@ Public Class usrcntlFakturierung
KdSearchBox3.initKdBox(Me.FindForm)
cbxMautbericht.Items.Clear()
cbxMautbericht.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Mautsummenbericht", "Gesamtbericht_EXCEL"))
cbxMautbericht.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Mautbericht AT DE MSE UTA", "Lieferantenbericht_PDF"))
cbxMautbericht.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Mautsummenbericht als CSV-Datei", "Gesamtbericht_CSV"))
cbxMautbericht.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Mautsummenbericht (öffnen)", "Gesamtbericht_EXCEL"))
cbxMautbericht.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Mautbericht PDF (erzeugen)", "Lieferantenbericht_PDF"))
cbxMautbericht.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Mautsummenbericht CSV (erzeugen)", "Gesamtbericht_CSV"))
cbxDateMautbericht.Items.Clear()
cbxDateMautbericht.fillWithSQL("select distinct(cast(BillingDate as Date)) From tblMautbericht order by cast(BillingDate as Date) desc", False, "FMZOLL")
@@ -1372,7 +1372,7 @@ Public Class usrcntlFakturierung
Dim dtBerichtkunden_CSV As DataTable = (New SQL).loadDgvBySql("SELECT [Customer No], [Licence Plate Number], [Transaction Country], [Transaction date], tblMautbericht.[Product description], tblMautbericht.[Card number], tblMautbericht.[Entry Terminal], tblMautbericht.[Exit Terminal], tblMautbericht.[Net Amount], tblMautbericht.[VAT Amount], tblMautbericht.[Total Amount]
FROM Adressen
INNER JOIN tblMautbericht ON Adressen.AdressenNr = tblMautbericht.[Customer No]
WHERE Adressen.ExportMautberichtCSV=1 AND cast(BillingDate as Date) = '" & cbxDateMautbericht._value & "'
WHERE Adressen.ExportMautberichtCSV=1 AND cast(BillingDate as Date) = '" & cbxDateMautbericht._value & "' and Datenquelle <> 'IDS'
ORDER BY tblMautbericht.[Customer No], tblMautbericht.[Licence Plate Number], tblMautbericht.[Transaction Country], tblMautbericht.[Transaction date], tblMautbericht.[Product description], tblMautbericht.[Card number], tblMautbericht.[Entry Terminal], tblMautbericht.[Exit Terminal]", "FMZOLL")
If dtBerichtkunden_CSV.Rows.Count > 0 Then
@@ -1436,11 +1436,11 @@ Public Class usrcntlFakturierung
'für Kunde an RE anhängen (Tool Report to Verag Invoice aus FMZOLL)
Case "Lieferantenbericht_PDF"
Dim AnzahlPDF_Berichte As Integer = CInt((New SQL).getValueTxtBySql("SELECT count(distinct(tblMautbericht.[Customer No])) FROM tblMautbericht WHERE cast(BillingDate as Date) = '" & cbxDateMautbericht._value & "'", "FMZOLL"))
Dim AnzahlPDF_Berichte As Integer = CInt((New SQL).getValueTxtBySql("SELECT count(distinct(tblMautbericht.[Customer No])) FROM tblMautbericht WHERE cast(BillingDate as Date) = '" & cbxDateMautbericht._value & "' and Datenquelle <> 'IDS' ", "FMZOLL"))
Dim dtBerichtkunden_PDF As DataTable = (New SQL).loadDgvBySql("SELECT tblMautbericht.[Customer No], Adressen.Ordnungsbegriff AS [Customer name], tblMautbericht.[Licence Plate Number], tblMautbericht.[Transaction date], tblMautbericht.[Transaction Country], tblMautbericht.[Product description], tblMautbericht.[Card number], tblMautbericht.[Entry Terminal], tblMautbericht.[Exit Terminal], Sum(tblMautbericht.[Net Amount]) AS [Net Amount], Sum(tblMautbericht.[VAT Amount]) AS [VAT Amount], Sum(tblMautbericht.[Total Amount]) AS [Total Amount]
FROM tblMautbericht INNER JOIN Adressen ON tblMautbericht.[Customer No] = Adressen.AdressenNr
WHERE cast(BillingDate as Date) = '" & cbxDateMautbericht._value & "'
WHERE cast(BillingDate as Date) = '" & cbxDateMautbericht._value & "' and Datenquelle <> 'IDS'
GROUP BY tblMautbericht.[Customer No], Adressen.Ordnungsbegriff, tblMautbericht.[Licence Plate Number], tblMautbericht.[Transaction date], tblMautbericht.[Transaction Country], tblMautbericht.[Product description], tblMautbericht.[Card number], tblMautbericht.[Entry Terminal], tblMautbericht.[Exit Terminal]
ORDER BY tblMautbericht.[Licence Plate Number] , tblMautbericht.[Transaction Country], tblMautbericht.[Transaction date] ", "FMZOLL")
@@ -1471,7 +1471,7 @@ Public Class usrcntlFakturierung
Dim dt_PDF_selected = dtBerichtkunden_PDF.Select("[Customer No] ='" & pdf.Item(0) & "'").CopyToDataTable
Dim dtLaender As DataTable = (New SQL).loadDgvBySql("SELECT tblMautbericht.[Customer No], tblMautbericht.[Transaction Country], sum(tblMautbericht.[Net Amount]) as Netto, sum(tblMautbericht.[VAT Amount]) as MWST, sum(tblMautbericht.[Total Amount]) as Brutto
FROM tblMautbericht WHERE [Customer No] ='" & pdf.Item(0) & "' AND cast(BillingDate as Date) = '" & cbxDateMautbericht._value & "'
FROM tblMautbericht WHERE [Customer No] ='" & pdf.Item(0) & "' AND cast(BillingDate as Date) = '" & cbxDateMautbericht._value & "' and Datenquelle <> 'IDS'
GROUP BY [Customer No], [Transaction Country]
ORDER BY tblMautbericht.[Customer No], tblMautbericht.[Transaction Country]", "FMZOLL")

141
VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb
View File

@@ -379,57 +379,60 @@ Public Class cIDS
Dim vr = isleernothing((currentRow(13)))
Dim obo = isleernothing((currentRow(14)))
Dim MDMEinarb_check As New cMDMEinarbeitung("IDS", ymd)
If MDMEinarb_check.hasEntry AndAlso MDMEinarb_check.completed Then Return False
Dim zusParam = ""
Dim isOBO As Boolean = False
If vr IsNot Nothing AndAlso vr <> "" Then
zusParam = vr
ElseIf obo IsNot Nothing AndAlso obo <> "" Then
zusParam = obo
isOBO = True
If lngRecordCount = 2 Then
Dim MDMEinarb_check As New cMDMEinarbeitung("IDS", ymd)
If MDMEinarb_check.hasEntry AndAlso MDMEinarb_check.completed Then Return False
End If
Dim ids As New cIDS(ymd, pyn, cc, occ, oc, ptc, zusParam, isOBO)
Dim avprive = isleernothing((currentRow(12)))
With ids
.YearMonthDay = isleernothing((currentRow(0)))
.CustomerCode = isleernothing((currentRow(1)))
.Paymentsummarynumber = isleernothing((currentRow(2)))
.CustomerName = isleernothing((currentRow(3)))
.OutletCountry = isleernothing((currentRow(4)))
.OutletCountryCode = isleernothing((currentRow(5)))
.OutletCode = isleernothing((currentRow(6)))
.ProductTypeCode = isleernothing((currentRow(7)))
If lngRecordCount = 2 Then
MDMEinarb.invoicedate = CDate(.YearMonthDay)
Dim zusParam = ""
Dim isOBO As Boolean = False
If vr IsNot Nothing AndAlso vr <> "" Then
zusParam = vr
ElseIf obo IsNot Nothing AndAlso obo <> "" Then
zusParam = obo
isOBO = True
End If
Dim ids As New cIDS(ymd, pyn, cc, occ, oc, ptc, zusParam, isOBO)
.TransactionVolume = isleernothing((currentRow(8)))
.AmminclVAT = isleernothing((currentRow(9)))
.TotalNetAmount = isleernothing((currentRow(10)))
.VATAmount = isleernothing((currentRow(11)))
.avpriceexclVAT = IIf(avprive <> "" AndAlso IsNumeric(avprive), avprive, 0)
Dim avprive = isleernothing((currentRow(12)))
Console.WriteLine("IDS: " & isleernothing((currentRow(1))) & " - " & lngRecordCount & " - " & isleernothing((currentRow(10))))
If isOBO Then
If .SAVE_OBO() Then counTrans += 1
Else
If .SAVE_VR() Then counTrans += 1
End If
With ids
.YearMonthDay = isleernothing((currentRow(0)))
.CustomerCode = isleernothing((currentRow(1)))
.Paymentsummarynumber = isleernothing((currentRow(2)))
.CustomerName = isleernothing((currentRow(3)))
.OutletCountry = isleernothing((currentRow(4)))
.OutletCountryCode = isleernothing((currentRow(5)))
.OutletCode = isleernothing((currentRow(6)))
.ProductTypeCode = isleernothing((currentRow(7)))
End With
If lngRecordCount = 2 Then
MDMEinarb.invoicedate = CDate(.YearMonthDay)
End If
Else
Dim ymd = isleernothing((currentRow(0)))
.TransactionVolume = isleernothing((currentRow(8)))
.AmminclVAT = isleernothing((currentRow(9)))
.TotalNetAmount = isleernothing((currentRow(10)))
.VATAmount = isleernothing((currentRow(11)))
.avpriceexclVAT = IIf(avprive <> "" AndAlso IsNumeric(avprive), avprive, 0)
Console.WriteLine("IDS: " & isleernothing((currentRow(1))) & " - " & lngRecordCount & " - " & isleernothing((currentRow(10))))
If isOBO Then
If .SAVE_OBO() Then counTrans += 1
Else
If .SAVE_VR() Then counTrans += 1
End If
End With
Else
Dim ymd = isleernothing((currentRow(0)))
Dim cc = isleernothing((currentRow(1)))
Dim cn = isleernothing((currentRow(2)))
Dim occ = isleernothing((currentRow(8)))
@@ -440,23 +443,25 @@ Public Class cIDS
Dim t_date = isleernothing((currentRow(12)))
Dim tna = isleernothing((currentRow(16)))
Dim MDMEinarb_check As New cMDMEinarbeitung("IDS_Details", ymd)
If MDMEinarb_check.hasEntry AndAlso MDMEinarb_check.completed Then Return False
Dim ids_detail As New cIDSDetails(ymd, cc, cn, occ, oc, ptc, t_time, t_date, tv, tna)
ids_detail.AmminclVAT = isleernothing((currentRow(15)))
ids_detail.VATAmount = isleernothing((currentRow(17)))
ids_detail.avpriceexclVAT = isleernothing((currentRow(18)))
ids_detail.Paymentsummarynumber = ""
If ids_detail.SAVE() Then counTrans += 1
If lngRecordCount = 2 Then
MDMEinarb.invoicedate = CDate(ids_detail.YearMonthDay)
Dim MDMEinarb_check As New cMDMEinarbeitung("IDS_Details", ymd)
If MDMEinarb_check.hasEntry AndAlso MDMEinarb_check.completed Then Return False
End If
End If
Dim ids_detail As New cIDSDetails(ymd, cc, cn, occ, oc, ptc, t_time, t_date, tv, tna)
ids_detail.AmminclVAT = isleernothing((currentRow(15)))
ids_detail.VATAmount = isleernothing((currentRow(17)))
ids_detail.avpriceexclVAT = isleernothing((currentRow(18)))
ids_detail.Paymentsummarynumber = ""
If ids_detail.SAVE() Then counTrans += 1
If lngRecordCount = 2 Then
MDMEinarb.invoicedate = CDate(ids_detail.YearMonthDay)
End If
End If
Catch ex As Exception
@@ -468,11 +473,7 @@ Public Class cIDS
Loop
If Not isTransactionDetail Then
MDMEinarb.supplier = "IDS"
Else
MDMEinarb.supplier = "IDS_Details"
End If
cnt = CInt(lngRecordCount)
cnt = CInt(lngRecordCount)
MDMEinarb.ds_total += cnt - 1
MDMEinarb.ds_count += counTrans
MDMEinarb.import_date = Now()
@@ -484,8 +485,30 @@ Public Class cIDS
End If
MDMEinarb.SAVE()
Else
'LKW-Kennzeichen aktualisieren!
SQL.doSQL("UPDATE det SET det.LicencePlateNumber = s.KfzKennzeichen FROM tblIDSTransactionsNew_Details det INNER JOIN SDL.dbo.SDL s
ON s.KartenNr =
CAST(det.CustomerCode AS varchar(50)) + CAST(det.CardNumber AS varchar(50))
WHERE s.SDLNr = 100 AND ISNULL(s.Gesperrt,0) = 0 AND det.LicencePlateNumber is null", "FMZOLL")
objFileRead.Close()
MDMEinarb.supplier = "IDS_Details"
cnt = CInt(lngRecordCount)
MDMEinarb.ds_total += cnt - 1
MDMEinarb.ds_count += counTrans
MDMEinarb.import_date = Now()
MDMEinarb.importfilename = fi.Name
MDMEinarb.completed = True
MDMEinarb.completed_date = Now()
MDMEinarb.SAVE()
End If
objFileRead.Close()
Return True

2
VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
View File

@@ -51,7 +51,7 @@ Public Class frmMitarbeitersuche
End If
sbMitarbeiter.initSearchBox(Me.FindForm, " [mit_id] ,[mit_username] ,(mit_vname + ' ' + mit_nname ) AS Name , CASE WHEN mit_firma='ALL' THEN mit_firmaHaupt ELSE mit_firma END as Firma, mit_niederlassung as Niederlassung FROM tblMitarbeiter", {"mit_vname", "mit_nname"}, " 1=1 AND mit_gekuendigt=0 AND [mit_TESTonly]=0 AND [mit_pseudoUser]=0 ", "mit_id", "mit_id", "Name", "ADMIN", , 400, 200, {"mit_id", "mit_username"})
sbMitarbeiter.initSearchBox(Me.FindForm, " [mit_id] ,[mit_username] ,(mit_vname + ' ' + mit_nname ) AS Name , CASE WHEN mit_firma='ALL' THEN mit_firmaHaupt ELSE mit_firma END as Firma, mit_niederlassung as Niederlassung FROM tblMitarbeiter", {"mit_vname", "mit_nname"}, " 1=1 AND mit_gekuendigt=0 AND [mit_TESTonly]=0 AND [mit_pseudoUser]=0 AND isnull([mit_kundenportal], 0) <> 1 ", "mit_id", "mit_id", "Name", "ADMIN", , 400, 200, {"mit_id", "mit_username"})
initMA()
End Sub