neu
This commit is contained in:
@@ -230,6 +230,8 @@ Partial Class frmNacherfassungNEU
|
||||
Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
|
||||
Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn()
|
||||
Me.DataGridViewTextBoxColumn5 = New System.Windows.Forms.DataGridViewTextBoxColumn()
|
||||
Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
|
||||
Me.KopierenZwischenablageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.pnl.SuspendLayout()
|
||||
Me.Panel3.SuspendLayout()
|
||||
Me.GroupBox4.SuspendLayout()
|
||||
@@ -241,6 +243,7 @@ Partial Class frmNacherfassungNEU
|
||||
Me.Panel2.SuspendLayout()
|
||||
Me.pnlZOll.SuspendLayout()
|
||||
Me.Panel4.SuspendLayout()
|
||||
Me.ContextMenuStrip2.SuspendLayout()
|
||||
Me.SuspendLayout()
|
||||
'
|
||||
'lblAbfertigungsdatum
|
||||
@@ -3260,6 +3263,18 @@ Partial Class frmNacherfassungNEU
|
||||
Me.DataGridViewTextBoxColumn5.HeaderText = "Anzahl"
|
||||
Me.DataGridViewTextBoxColumn5.Name = "DataGridViewTextBoxColumn5"
|
||||
'
|
||||
'ContextMenuStrip2
|
||||
'
|
||||
Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KopierenZwischenablageToolStripMenuItem})
|
||||
Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
|
||||
Me.ContextMenuStrip2.Size = New System.Drawing.Size(218, 48)
|
||||
'
|
||||
'KopierenZwischenablageToolStripMenuItem
|
||||
'
|
||||
Me.KopierenZwischenablageToolStripMenuItem.Name = "KopierenZwischenablageToolStripMenuItem"
|
||||
Me.KopierenZwischenablageToolStripMenuItem.Size = New System.Drawing.Size(217, 22)
|
||||
Me.KopierenZwischenablageToolStripMenuItem.Text = "Kopieren (Zwischenablage)"
|
||||
'
|
||||
'frmNacherfassungNEU
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
@@ -3290,6 +3305,7 @@ Partial Class frmNacherfassungNEU
|
||||
Me.pnlZOll.PerformLayout()
|
||||
Me.Panel4.ResumeLayout(False)
|
||||
Me.Panel4.PerformLayout()
|
||||
Me.ContextMenuStrip2.ResumeLayout(False)
|
||||
Me.ResumeLayout(False)
|
||||
|
||||
End Sub
|
||||
@@ -3497,4 +3513,6 @@ Partial Class frmNacherfassungNEU
|
||||
Public WithEvents cboAbklärungFiliale As VERAG_PROG_ALLGEMEIN.MyComboBox
|
||||
Friend WithEvents Button4 As Button
|
||||
Friend WithEvents cbxEIDR As CheckBox
|
||||
Friend WithEvents ContextMenuStrip2 As ContextMenuStrip
|
||||
Friend WithEvents KopierenZwischenablageToolStripMenuItem As ToolStripMenuItem
|
||||
End Class
|
||||
|
||||
@@ -262,6 +262,9 @@
|
||||
<metadata name="ColorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>174, 17</value>
|
||||
</metadata>
|
||||
<metadata name="ContextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>297, 17</value>
|
||||
</metadata>
|
||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>32</value>
|
||||
</metadata>
|
||||
|
||||
@@ -324,7 +324,7 @@ Public Class frmNacherfassungNEU
|
||||
|
||||
If .RowCount > 0 Then .Rows.Clear()
|
||||
If (txtAbfertigungsnummer.Text.Trim <> "" AndAlso IsNumeric(txtAbfertigungsnummer.Text) AndAlso txtAbfertigungsnummer.Text > 0) And (cboFiliale._value.Trim <> "" AndAlso IsNumeric(cboFiliale._value) AndAlso cboFiliale._value > 0) Then
|
||||
.DataSource = SQL.loadDgvBySql("SELECT rksv_BelegId, rksv_umsatz ,BelegNr,BelegDat,Benutzer,[Name],LKW_Beleg FROM [tblEABelegnummer] INNER JOIN Personal ON ID=Benutzer where ((FilialenNr='" & SPEDITIONSBUCH.FilialenNr & "' and AbfertigungsNr='" & SPEDITIONSBUCH.AbfertigungsNr & "' and FilialenNr>0 and AbfertigungsNr>0) OR LKW_id='" & If(SPEDITIONSBUCH.AvisoID, -123456) & "') and storniert=0 and gebuchtstorno=0 order by rksv_BelegId", "FMZOLL")
|
||||
.DataSource = SQL.loadDgvBySql("SELECT rksv_BelegId, rksv_umsatz ,BelegNr,BelegDat,Benutzer,[Name],LKW_Beleg,tblEABelegnummer.Mandant, tblEABelegnummer.Niederlassung FROM [tblEABelegnummer] INNER JOIN Personal ON ID=Benutzer where ((FilialenNr='" & SPEDITIONSBUCH.FilialenNr & "' and AbfertigungsNr='" & SPEDITIONSBUCH.AbfertigungsNr & "' and FilialenNr>0 and AbfertigungsNr>0) OR LKW_id='" & If(SPEDITIONSBUCH.AvisoID, -123456) & "') and storniert=0 and gebuchtstorno=0 order by rksv_BelegId", "FMZOLL")
|
||||
'AND UnterNr='" & SPEDITIONSBUCH.UnterNr & "' --> Unternr gibts ned
|
||||
'MsgBox("SELECT rksv_BelegId, rksv_umsatz ,BelegNr,BelegDat,Benutzer FROM [tblEABelegnummer] where AbfertigungsNr='" & txtAbfertigungsnummer.Text & "' and FilialenNr='" & cboFiliale._value & "' and storniert=0 and gebuchtstorno=0 order by rksv_BelegId")
|
||||
.Columns("rksv_BelegId").HeaderText = "Beleg-Id"
|
||||
@@ -336,6 +336,8 @@ Public Class frmNacherfassungNEU
|
||||
.Columns("rksv_umsatz").DefaultCellStyle.Format = "C"
|
||||
.Columns("BelegNr").Visible = False
|
||||
.Columns("BelegDat").Visible = False
|
||||
.Columns("Mandant").Visible = False
|
||||
.Columns("Niederlassung").Visible = False
|
||||
.Columns("Benutzer").Visible = False
|
||||
.Columns("LKW_Beleg").HeaderText = "LKW"
|
||||
.Columns("LKW_Beleg").Width = 35
|
||||
@@ -1450,7 +1452,9 @@ Public Class frmNacherfassungNEU
|
||||
|
||||
Dim r As DataGridViewRow = dgvBelege.SelectedRows(0)
|
||||
Dim PERSONALTmp As SDL.cPersonal = sqlTMP.getPersonalById(r.Cells("Benutzer").Value)
|
||||
Dim B As New SDL.EABeleg("LOAD", PERSONALTmp.Mandant, PERSONALTmp.Niederlassung, PERSONALTmp.ID, r.Cells("BelegNr").Value, r.Cells("BelegDat").Value)
|
||||
' Dim B As New SDL.EABeleg("LOAD", PERSONALTmp.Mandant, PERSONALTmp.Niederlassung, PERSONALTmp.ID, r.Cells("BelegNr").Value, r.Cells("BelegDat").Value)
|
||||
Dim B As New SDL.EABeleg("LOAD", r.Cells("Mandant").Value, r.Cells("Niederlassung").Value, PERSONALTmp.ID, r.Cells("BelegNr").Value, r.Cells("BelegDat").Value)
|
||||
|
||||
openBELEG(PERSONALTmp, B)
|
||||
End If
|
||||
ElseIf tbcntrRg.SelectedTab Is TabPage2 Then
|
||||
@@ -1501,14 +1505,14 @@ Public Class frmNacherfassungNEU
|
||||
Case "E"
|
||||
|
||||
'If B.storniert Then MsgBox("Der Beleg wurde bereits storiniert!") : Exit Sub
|
||||
Dim frmBeleg As New SDL.frmFremdbeleg(PERSONAL, PERSONAL.Mandant, PERSONAL.Niederlassung, B.Benutzer, B.BelegNr, B.BelegDat)
|
||||
Dim frmBeleg As New SDL.frmFremdbeleg(PERSONAL, B.Mandant, B.Niederlassung, B.Benutzer, B.BelegNr, B.BelegDat)
|
||||
frmBeleg.ShowDialog(Me)
|
||||
Case "L"
|
||||
If B.storniert Then MsgBox("Der Beleg wurde bereits storiniert!") : Exit Sub
|
||||
Dim frmBeleg As New SDL.frmNacherfassungLeihgeld(PERSONAL, Nothing, PERSONAL.Mandant, PERSONAL.Niederlassung, B.Benutzer, B.BelegNr, B.BelegDat)
|
||||
Dim frmBeleg As New SDL.frmNacherfassungLeihgeld(PERSONAL, Nothing, B.Mandant, B.Niederlassung, B.Benutzer, B.BelegNr, B.BelegDat)
|
||||
frmBeleg.ShowDialog(Me)
|
||||
Case Else
|
||||
Dim frmBeleg As New SDL.frmBelegNeu(PERSONAL, Nothing, PERSONAL.Mandant, PERSONAL.Niederlassung, B.Benutzer, B.BelegNr, B.BelegDat)
|
||||
Dim frmBeleg As New SDL.frmBelegNeu(PERSONAL, Nothing, B.Mandant, B.Niederlassung, B.Benutzer, B.BelegNr, B.BelegDat)
|
||||
frmBeleg.ShowDialog(Me)
|
||||
End Select
|
||||
|
||||
@@ -1539,4 +1543,35 @@ Public Class frmNacherfassungNEU
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
Private Sub grid_CellMouseClick(sender As Object, e As System.Windows.Forms.DataGridViewCellMouseEventArgs) Handles dgvBelege.CellMouseClick
|
||||
If tbcntrRg.SelectedTab Is TabPage4 Then
|
||||
If e.Button = MouseButtons.Right Then
|
||||
If e.RowIndex < 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt
|
||||
If Not dgvBelege.Rows(e.RowIndex).Selected Then
|
||||
dgvBelege.ClearSelection()
|
||||
dgvBelege.Rows(e.RowIndex).Selected = True
|
||||
End If
|
||||
ContextMenuStrip2.Show(Cursor.Position)
|
||||
End If
|
||||
End If
|
||||
End Sub
|
||||
|
||||
|
||||
Private Sub KopierenZwischenablageToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KopierenZwischenablageToolStripMenuItem.Click
|
||||
|
||||
If tbcntrRg.SelectedTab Is TabPage4 Then
|
||||
If dgvBelege.SelectedRows.Count >= 1 Then
|
||||
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvBelege.SelectedRows(0).Cells("clmnAnhaengeDokId").Value)
|
||||
' MsgBox(DS.OPEN_SINGLE_ORIG(False))
|
||||
|
||||
'Zwischenablage
|
||||
Dim f() As String = {DS.OPEN_SINGLE_ORIG(False)}
|
||||
Dim d As New DataObject(DataFormats.FileDrop, f)
|
||||
Clipboard.SetDataObject(d, True)
|
||||
|
||||
End If
|
||||
End If
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
@@ -45,6 +45,7 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
Me.kdtxtAvisierer = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
|
||||
Me.txtAvisiererKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
|
||||
Me.pnlRechts = New System.Windows.Forms.Panel()
|
||||
Me.Button12 = New System.Windows.Forms.Button()
|
||||
Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox()
|
||||
Me.Button2 = New System.Windows.Forms.Button()
|
||||
Me.Button13 = New System.Windows.Forms.Button()
|
||||
@@ -56,6 +57,7 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
Me.dgvLKW = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
|
||||
Me.pnlOpt = New System.Windows.Forms.Panel()
|
||||
Me.pnlBerichte = New System.Windows.Forms.Panel()
|
||||
Me.Button21 = New System.Windows.Forms.Button()
|
||||
Me.btnSpedBuchEinnahmen = New System.Windows.Forms.Button()
|
||||
Me.lblKdAusFortschritt = New System.Windows.Forms.Label()
|
||||
Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
|
||||
@@ -183,6 +185,7 @@ 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.Button22 = New System.Windows.Forms.Button()
|
||||
Me.cntxtCntxtSpeditionsbuch.SuspendLayout()
|
||||
Me.pnlRechts.SuspendLayout()
|
||||
CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
@@ -518,6 +521,7 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
'pnlRechts
|
||||
'
|
||||
Me.pnlRechts.AutoSize = True
|
||||
Me.pnlRechts.Controls.Add(Me.Button12)
|
||||
Me.pnlRechts.Controls.Add(Me.MyListBox1)
|
||||
Me.pnlRechts.Controls.Add(Me.Button2)
|
||||
Me.pnlRechts.Controls.Add(Me.Button13)
|
||||
@@ -528,6 +532,17 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
Me.pnlRechts.Size = New System.Drawing.Size(234, 217)
|
||||
Me.pnlRechts.TabIndex = 35
|
||||
'
|
||||
'Button12
|
||||
'
|
||||
Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.Button12.Location = New System.Drawing.Point(4, 191)
|
||||
Me.Button12.Margin = New System.Windows.Forms.Padding(0)
|
||||
Me.Button12.Name = "Button12"
|
||||
Me.Button12.Size = New System.Drawing.Size(225, 26)
|
||||
Me.Button12.TabIndex = 42
|
||||
Me.Button12.Text = "Nur Abfertigungs Leistungen"
|
||||
Me.Button12.UseVisualStyleBackColor = True
|
||||
'
|
||||
'MyListBox1
|
||||
'
|
||||
Me.MyListBox1._value = ""
|
||||
@@ -538,16 +553,16 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
Me.MyListBox1.Location = New System.Drawing.Point(4, 19)
|
||||
Me.MyListBox1.Name = "MyListBox1"
|
||||
Me.MyListBox1.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple
|
||||
Me.MyListBox1.Size = New System.Drawing.Size(225, 134)
|
||||
Me.MyListBox1.Size = New System.Drawing.Size(225, 147)
|
||||
Me.MyListBox1.TabIndex = 1
|
||||
'
|
||||
'Button2
|
||||
'
|
||||
Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.Button2.Location = New System.Drawing.Point(4, 182)
|
||||
Me.Button2.Location = New System.Drawing.Point(4, 166)
|
||||
Me.Button2.Margin = New System.Windows.Forms.Padding(0)
|
||||
Me.Button2.Name = "Button2"
|
||||
Me.Button2.Size = New System.Drawing.Size(112, 26)
|
||||
Me.Button2.Size = New System.Drawing.Size(115, 26)
|
||||
Me.Button2.TabIndex = 41
|
||||
Me.Button2.Text = "Alle"
|
||||
Me.Button2.UseVisualStyleBackColor = True
|
||||
@@ -555,10 +570,10 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
'Button13
|
||||
'
|
||||
Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.Button13.Location = New System.Drawing.Point(119, 182)
|
||||
Me.Button13.Location = New System.Drawing.Point(118, 166)
|
||||
Me.Button13.Margin = New System.Windows.Forms.Padding(0)
|
||||
Me.Button13.Name = "Button13"
|
||||
Me.Button13.Size = New System.Drawing.Size(110, 26)
|
||||
Me.Button13.Size = New System.Drawing.Size(111, 26)
|
||||
Me.Button13.TabIndex = 40
|
||||
Me.Button13.Text = "Keine"
|
||||
Me.Button13.UseVisualStyleBackColor = True
|
||||
@@ -672,6 +687,8 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
'
|
||||
'pnlBerichte
|
||||
'
|
||||
Me.pnlBerichte.Controls.Add(Me.Button22)
|
||||
Me.pnlBerichte.Controls.Add(Me.Button21)
|
||||
Me.pnlBerichte.Controls.Add(Me.btnSpedBuchEinnahmen)
|
||||
Me.pnlBerichte.Controls.Add(Me.lblKdAusFortschritt)
|
||||
Me.pnlBerichte.Controls.Add(Me.MenuStrip1)
|
||||
@@ -705,6 +722,20 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
Me.pnlBerichte.TabIndex = 6
|
||||
Me.pnlBerichte.Visible = False
|
||||
'
|
||||
'Button21
|
||||
'
|
||||
Me.Button21.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.Button21.Image = Global.SDL.My.Resources.Resources.statistik_small
|
||||
Me.Button21.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
Me.Button21.Location = New System.Drawing.Point(155, 129)
|
||||
Me.Button21.Margin = New System.Windows.Forms.Padding(0)
|
||||
Me.Button21.Name = "Button21"
|
||||
Me.Button21.Size = New System.Drawing.Size(154, 25)
|
||||
Me.Button21.TabIndex = 91
|
||||
Me.Button21.Text = "Anzahl nach Monaten"
|
||||
Me.Button21.TextAlign = System.Drawing.ContentAlignment.MiddleRight
|
||||
Me.Button21.UseVisualStyleBackColor = True
|
||||
'
|
||||
'btnSpedBuchEinnahmen
|
||||
'
|
||||
Me.btnSpedBuchEinnahmen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
@@ -735,7 +766,7 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KundenauswertungenToolStripMenuItem1})
|
||||
Me.MenuStrip1.Location = New System.Drawing.Point(601, 128)
|
||||
Me.MenuStrip1.Name = "MenuStrip1"
|
||||
Me.MenuStrip1.Size = New System.Drawing.Size(283, 27)
|
||||
Me.MenuStrip1.Size = New System.Drawing.Size(163, 27)
|
||||
Me.MenuStrip1.TabIndex = 89
|
||||
Me.MenuStrip1.Text = "Kundenauswertungen"
|
||||
'
|
||||
@@ -753,13 +784,13 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
'
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image = CType(resources.GetObject("ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image"), System.Drawing.Image)
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Name = "ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem"
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(274, 24)
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(282, 24)
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Text = "ZF Passau (Zeitraum auswählen)"
|
||||
'ZFThyrnauZeitraumAuswählenToolStripMenuItem
|
||||
'
|
||||
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Image = CType(resources.GetObject("ZFThyrnauZeitraumAuswählenToolStripMenuItem .Image"), System.Drawing.Image)
|
||||
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Name = "ZFThyrnauZeitraumAuswählenToolStripMenuItem "
|
||||
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(274, 24)
|
||||
'ZFThyrnauZeitraumAuswählenToolStripMenuItem
|
||||
'
|
||||
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Name = "ZFThyrnauZeitraumAuswählenToolStripMenuItem"
|
||||
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(282, 24)
|
||||
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Text = "ZF Thyrnau (Zeitraum auswählen)"
|
||||
'
|
||||
'cboHandlingssatz
|
||||
@@ -2517,6 +2548,19 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
Me.SplitContainer.SplitterWidth = 2
|
||||
Me.SplitContainer.TabIndex = 3
|
||||
'
|
||||
'Button22
|
||||
'
|
||||
Me.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.Button22.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
Me.Button22.Location = New System.Drawing.Point(308, 129)
|
||||
Me.Button22.Margin = New System.Windows.Forms.Padding(0)
|
||||
Me.Button22.Name = "Button22"
|
||||
Me.Button22.Size = New System.Drawing.Size(62, 25)
|
||||
Me.Button22.TabIndex = 92
|
||||
Me.Button22.Text = "Woche"
|
||||
Me.Button22.TextAlign = System.Drawing.ContentAlignment.MiddleRight
|
||||
Me.Button22.UseVisualStyleBackColor = True
|
||||
'
|
||||
'usrCntlSpeditionsBuchSuche
|
||||
'
|
||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
|
||||
@@ -2720,4 +2764,7 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
Friend WithEvents lblKdAusFortschritt As Label
|
||||
Friend WithEvents cbxEIDR As CheckBox
|
||||
Friend WithEvents btnSpedBuchEinnahmen As Button
|
||||
Friend WithEvents Button12 As Button
|
||||
Friend WithEvents Button21 As Button
|
||||
Friend WithEvents Button22 As Button
|
||||
End Class
|
||||
|
||||
@@ -174,7 +174,7 @@
|
||||
XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
|
||||
fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
|
||||
tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
|
||||
6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAAB3VJREFUSEu9VntQ1NUe
|
||||
6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDwAACw8BkvkDpQAAB3VJREFUSEu9VntQ1NUe
|
||||
/86Uo8VVROUlsrsoBGlyNeURECuwPCXSBG0GAXktr2WX5S0GCob4GEF8XdIGAcP0innTMMsxrczb4A3r
|
||||
ZjpxJ3F0uk5aaioomn7u95zdhQWb+u+eme/8zp45nA/f1+f7oSVNxaRtXUWZLasopiGHslqrKf+dWkrZ
|
||||
UUGR67W0Yn8jVb+3jVJ3rCBNXRpV7GsYW9BaOz1mnTZVXZNclrK93IaN5lTGk0NeECkLNKQwhpHSyN+C
|
||||
|
||||
@@ -516,6 +516,7 @@ Public Class usrCntlSpeditionsBuchSuche
|
||||
End If
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen", "SDL") Then
|
||||
pnlBerichte.Visible = True
|
||||
Button21.Visible = True
|
||||
Button16.Visible = True
|
||||
Button17.Visible = True
|
||||
End If
|
||||
@@ -2118,4 +2119,91 @@ Public Class usrCntlSpeditionsBuchSuche
|
||||
print.Show()
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub Button12_Click_1(sender As Object, e As EventArgs) Handles Button12.Click
|
||||
Dim dt = SQL.loadDgvBySql("SELECT Abfertigungsart FROM [Abfertigungsarten] where isAbfertigung=1", "FMZOLL")
|
||||
MyListBox1.ClearSelected()
|
||||
If dt IsNot Nothing Then
|
||||
For Each r In dt.Rows
|
||||
For i = 0 To MyListBox1.Items.Count - 1
|
||||
If DirectCast(MyListBox1.Items(i), VERAG_PROG_ALLGEMEIN.MyListItem).Value = r("Abfertigungsart") Then
|
||||
MyListBox1.SetSelected(i, True)
|
||||
End If
|
||||
Next
|
||||
Next
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub Button21_Click(sender As Object, e As EventArgs) Handles Button21.Click
|
||||
DataGridView.Columns.Clear()
|
||||
Dim dt As DataTable
|
||||
|
||||
If False Then
|
||||
|
||||
Dim sqlstr As String = ""
|
||||
sqlstr &= " SELECT DATEPART(YEAR,Abfertigungsdatum) Jahr, DATEPART(month,Abfertigungsdatum) Monat, sum(Abfertigungsanzahl) Anzahl FROM Speditionsbuch "
|
||||
sqlstr &= " WHERE 1=1 "
|
||||
dt = SQL.loadDgvBySql_Param(sqlstr & getSpedBuchWhere() &
|
||||
" GROUP BY DATEPART(YEAR,Abfertigungsdatum), DATEPART(month,Abfertigungsdatum) " &
|
||||
" ORDER BY DATEPART(YEAR,Abfertigungsdatum), DATEPART(month,Abfertigungsdatum) ",
|
||||
"FMZOLL", , getSpedbuchList())
|
||||
Else
|
||||
|
||||
Dim sqlstr As String = ""
|
||||
sqlstr &= " SELECT DATEPART(YEAR,Speditionsbuch.Abfertigungsdatum) Jahr, DATEPART(month,Speditionsbuch.Abfertigungsdatum) Monat, sum(Abfertigungsanzahl) Anzahl,SUM(Barzahlungsbetrag) as Barzahlungsbetrag,isnull(sum(SteuerfreierGesamtbetrag+SteuerpflichtigerGesamtbetrag),0) as RgBetrag "
|
||||
sqlstr &= " FROM Speditionsbuch "
|
||||
sqlstr &= " LEFT JOIN Rechnungsausgang ON Rechnungsausgang.FilialenNr=Speditionsbuch.FilialenNr and Rechnungsausgang.AbfertigungsNr=Speditionsbuch.AbfertigungsNr and Rechnungsausgang.SpeditionsbuchUnterNr=Speditionsbuch.UnterNr "
|
||||
sqlstr &= " INNER JOIN RechnungsausgangPositionen ON Rechnungsausgang.RK_ID=RechnungsausgangPositionen.RK_ID "
|
||||
sqlstr &= " INNER JOIN leistungen ON RechnungsausgangPositionen.LeistungsNr=leistungen.LeistungsNr "
|
||||
sqlstr &= " WHERE 1=1 and leistungen.Abfertigungskosten=1 "
|
||||
|
||||
dt = SQL.loadDgvBySql_Param(sqlstr & getSpedBuchWhere() &
|
||||
" GROUP BY DATEPART(YEAR,Speditionsbuch.Abfertigungsdatum), DATEPART(month,Speditionsbuch.Abfertigungsdatum) " &
|
||||
" ORDER BY DATEPART(YEAR,Speditionsbuch.Abfertigungsdatum), DATEPART(month,Speditionsbuch.Abfertigungsdatum) ",
|
||||
"FMZOLL", , getSpedbuchList())
|
||||
End If
|
||||
|
||||
|
||||
If dt IsNot Nothing Then DataGridView.DataSource = dt
|
||||
End Sub
|
||||
|
||||
Private Sub Button22_Click(sender As Object, e As EventArgs) Handles Button22.Click
|
||||
DataGridView.Columns.Clear()
|
||||
Dim dt As DataTable
|
||||
|
||||
'Dim sqlstr As String = ""
|
||||
'sqlstr &= " SELECT DATEPART(YEAR,Abfertigungsdatum) Jahr, DATEPART(iso_week,Abfertigungsdatum) Woche, count(*) Anzahl FROM Speditionsbuch "
|
||||
'sqlstr &= " WHERE 1=1 "
|
||||
'Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr & getSpedBuchWhere() &
|
||||
' " GROUP BY DATEPART(YEAR,Abfertigungsdatum), DATEPART(iso_week,Abfertigungsdatum) " &
|
||||
' " ORDER BY DATEPART(YEAR,Abfertigungsdatum), DATEPART(iso_week,Abfertigungsdatum) ",
|
||||
' "FMZOLL", , getSpedbuchList())
|
||||
|
||||
If False Then
|
||||
|
||||
Dim sqlstr As String = ""
|
||||
sqlstr &= " SELECT DATEPART(YEAR,Abfertigungsdatum) Jahr, DATEPART(iso_week,Abfertigungsdatum) Monat, sum(Abfertigungsanzahl) Anzahl FROM Speditionsbuch "
|
||||
sqlstr &= " WHERE 1=1 "
|
||||
dt = SQL.loadDgvBySql_Param(sqlstr & getSpedBuchWhere() &
|
||||
" GROUP BY DATEPART(YEAR,Abfertigungsdatum), DATEPART(iso_week,Abfertigungsdatum) " &
|
||||
" ORDER BY DATEPART(YEAR,Abfertigungsdatum), DATEPART(iso_week,Abfertigungsdatum) ",
|
||||
"FMZOLL", , getSpedbuchList())
|
||||
Else
|
||||
|
||||
Dim sqlstr As String = ""
|
||||
sqlstr &= " SELECT DATEPART(YEAR,Speditionsbuch.Abfertigungsdatum) Jahr, DATEPART(iso_week,Speditionsbuch.Abfertigungsdatum) Monat, sum(Abfertigungsanzahl) Anzahl,SUM(Barzahlungsbetrag) as Barzahlungsbetrag,isnull(sum(SteuerfreierGesamtbetrag+SteuerpflichtigerGesamtbetrag),0) as RgBetrag "
|
||||
sqlstr &= " FROM Speditionsbuch "
|
||||
sqlstr &= " LEFT JOIN Rechnungsausgang ON Rechnungsausgang.FilialenNr=Speditionsbuch.FilialenNr and Rechnungsausgang.AbfertigungsNr=Speditionsbuch.AbfertigungsNr and Rechnungsausgang.SpeditionsbuchUnterNr=Speditionsbuch.UnterNr "
|
||||
sqlstr &= " INNER JOIN RechnungsausgangPositionen ON Rechnungsausgang.RK_ID=RechnungsausgangPositionen.RK_ID "
|
||||
sqlstr &= " INNER JOIN leistungen ON RechnungsausgangPositionen.LeistungsNr=leistungen.LeistungsNr "
|
||||
sqlstr &= " WHERE 1=1 and leistungen.Abfertigungskosten=1 "
|
||||
|
||||
dt = SQL.loadDgvBySql_Param(sqlstr & getSpedBuchWhere() &
|
||||
" GROUP BY DATEPART(YEAR,Speditionsbuch.Abfertigungsdatum), DATEPART(iso_week,Speditionsbuch.Abfertigungsdatum) " &
|
||||
" ORDER BY DATEPART(YEAR,Speditionsbuch.Abfertigungsdatum), DATEPART(iso_week,Speditionsbuch.Abfertigungsdatum) ",
|
||||
"FMZOLL", , getSpedbuchList())
|
||||
End If
|
||||
|
||||
If dt IsNot Nothing Then DataGridView.DataSource = dt
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
Reference in New Issue
Block a user