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

Kundenablage fix

Browse Source
This commit is contained in:
d.breimaier
2026-11-12 13:27:45 +01:00
parent c059a5c3c2
commit 1ee31b3e60
5 changed files with 137 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SDL/My Project/AssemblyInfo.vb
View File

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

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

@@ -258,11 +258,15 @@ Partial Class frmKundenblatt
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
Me.Label2 = New System.Windows.Forms.Label()
Me.tbcntrMain = New System.Windows.Forms.TabControl()
Me.tbFirmendatenSDL = New System.Windows.Forms.TabPage()
Me.Panel7 = New System.Windows.Forms.Panel()
Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull()
Me.usrcntlKarten = New SDL.usrCntlKartenDaten()
Me.UsrCntlLKW1 = New SDL.usrCntlLKW()
Me.UsrCntlKundenlogin1 = New SDL.usrCntlKundenlogin()
Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte()
Me.UsrCntlUSTV = New SDL.usrCntlUSTV()
Me.UsrcntlKundeBearbeitenFull_SDL1 = New SDL.usrcntlKundeBearbeitenFull_SDL()
Me.pnlInfo.SuspendLayout()
Me.cntxtExcel.SuspendLayout()
Me.ContextMenuStrip2.SuspendLayout()
@@ -301,6 +305,7 @@ Partial Class frmKundenblatt
Me.tbZoll.SuspendLayout()
Me.tbcntrZOLL.SuspendLayout()
Me.tbFirmendaten.SuspendLayout()
Me.Panel4.SuspendLayout()
Me.tbAllgemein.SuspendLayout()
Me.GroupBox5.SuspendLayout()
CType(Me.dgvLeistungen, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -321,6 +326,8 @@ Partial Class frmKundenblatt
CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.tbcntrMain.SuspendLayout()
Me.tbFirmendatenSDL.SuspendLayout()
Me.Panel7.SuspendLayout()
Me.SuspendLayout()
'
'pnlInfo
@@ -486,7 +493,7 @@ Partial Class frmKundenblatt
'
Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4
Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8
Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
Me.cntxtCntxtMDM.Text = "cntxtMDM"
'
@@ -2240,6 +2247,7 @@ Partial Class frmKundenblatt
'
'Panel4
'
Me.Panel4.Controls.Add(Me.UsrcntlKundeBearbeitenFull1)
Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill
Me.Panel4.Location = New System.Drawing.Point(3, 3)
Me.Panel4.Name = "Panel4"
@@ -2800,7 +2808,7 @@ Partial Class frmKundenblatt
Me.TabControl1.Location = New System.Drawing.Point(8, 474)
Me.TabControl1.Name = "TabControl1"
Me.TabControl1.SelectedIndex = 0
Me.TabControl1.Size = New System.Drawing.Size(718, 516)
Me.TabControl1.Size = New System.Drawing.Size(718, 510)
Me.TabControl1.TabIndex = 186
'
'TabPage1
@@ -2812,7 +2820,7 @@ Partial Class frmKundenblatt
Me.TabPage1.Location = New System.Drawing.Point(4, 22)
Me.TabPage1.Name = "TabPage1"
Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage1.Size = New System.Drawing.Size(710, 490)
Me.TabPage1.Size = New System.Drawing.Size(710, 484)
Me.TabPage1.TabIndex = 0
Me.TabPage1.Text = "Offene Posten"
Me.TabPage1.UseVisualStyleBackColor = True
@@ -2871,7 +2879,7 @@ Partial Class frmKundenblatt
Me.dgvOffenePosten.RowHeadersDefaultCellStyle = DataGridViewCellStyle15
Me.dgvOffenePosten.RowHeadersVisible = False
Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 458)
Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 452)
Me.dgvOffenePosten.TabIndex = 175
'
'Label10
@@ -2904,7 +2912,7 @@ Partial Class frmKundenblatt
Me.TabPage2.Location = New System.Drawing.Point(4, 22)
Me.TabPage2.Name = "TabPage2"
Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage2.Size = New System.Drawing.Size(710, 490)
Me.TabPage2.Size = New System.Drawing.Size(710, 484)
Me.TabPage2.TabIndex = 1
Me.TabPage2.Text = "Umsatzbericht"
Me.TabPage2.UseVisualStyleBackColor = True
@@ -2949,7 +2957,7 @@ Partial Class frmKundenblatt
Me.dgvUmsaetze.RowHeadersDefaultCellStyle = DataGridViewCellStyle19
Me.dgvUmsaetze.RowHeadersVisible = False
Me.dgvUmsaetze.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 485)
Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 462)
Me.dgvUmsaetze.TabIndex = 182
'
'Label13
@@ -2997,7 +3005,7 @@ Partial Class frmKundenblatt
Me.TabPage3.Controls.Add(Me.dgvUmsatzNachLeistngsNr)
Me.TabPage3.Location = New System.Drawing.Point(4, 22)
Me.TabPage3.Name = "TabPage3"
Me.TabPage3.Size = New System.Drawing.Size(710, 490)
Me.TabPage3.Size = New System.Drawing.Size(710, 484)
Me.TabPage3.TabIndex = 2
Me.TabPage3.Text = "Umsatz nach LeistungsNr"
Me.TabPage3.UseVisualStyleBackColor = True
@@ -3053,7 +3061,7 @@ Partial Class frmKundenblatt
Me.dgvUmsatzNachLeistngsNr.RowHeadersDefaultCellStyle = DataGridViewCellStyle23
Me.dgvUmsatzNachLeistngsNr.RowHeadersVisible = False
Me.dgvUmsatzNachLeistngsNr.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 484)
Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 462)
Me.dgvUmsatzNachLeistngsNr.TabIndex = 183
'
'Label11
@@ -3236,13 +3244,14 @@ Partial Class frmKundenblatt
'
Me.tbcntrMain.Appearance = System.Windows.Forms.TabAppearance.FlatButtons
Me.tbcntrMain.Controls.Add(Me.tbAllgemein)
Me.tbcntrMain.Controls.Add(Me.tbFirmendaten)
Me.tbcntrMain.Controls.Add(Me.tbZoll)
Me.tbcntrMain.Controls.Add(Me.tbMdm)
Me.tbcntrMain.Controls.Add(Me.tbOfferte)
Me.tbcntrMain.Controls.Add(Me.tbUSTV)
Me.tbcntrMain.Controls.Add(Me.tbFIBU)
Me.tbcntrMain.Controls.Add(Me.tbRechnungen)
Me.tbcntrMain.Controls.Add(Me.tbFirmendaten)
Me.tbcntrMain.Controls.Add(Me.tbFirmendatenSDL)
Me.tbcntrMain.Dock = System.Windows.Forms.DockStyle.Fill
Me.tbcntrMain.ItemSize = New System.Drawing.Size(76, 0)
Me.tbcntrMain.Location = New System.Drawing.Point(0, 112)
@@ -3252,6 +3261,33 @@ Partial Class frmKundenblatt
Me.tbcntrMain.Size = New System.Drawing.Size(1689, 1025)
Me.tbcntrMain.TabIndex = 3
'
'tbFirmendatenSDL
'
Me.tbFirmendatenSDL.BackColor = System.Drawing.Color.White
Me.tbFirmendatenSDL.Controls.Add(Me.Panel7)
Me.tbFirmendatenSDL.Location = New System.Drawing.Point(4, 25)
Me.tbFirmendatenSDL.Name = "tbFirmendatenSDL"
Me.tbFirmendatenSDL.Size = New System.Drawing.Size(1681, 996)
Me.tbFirmendatenSDL.TabIndex = 15
Me.tbFirmendatenSDL.Text = "FirmendatenSDL"
'
'Panel7
'
Me.Panel7.Controls.Add(Me.UsrcntlKundeBearbeitenFull_SDL1)
Me.Panel7.Dock = System.Windows.Forms.DockStyle.Fill
Me.Panel7.Location = New System.Drawing.Point(0, 0)
Me.Panel7.Name = "Panel7"
Me.Panel7.Size = New System.Drawing.Size(1681, 996)
Me.Panel7.TabIndex = 1
'
'UsrcntlKundeBearbeitenFull1
'
Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White
Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(3, 3)
Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1"
Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1152, 628)
Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0
'
'usrcntlKarten
'
Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default
@@ -3300,6 +3336,14 @@ Partial Class frmKundenblatt
Me.UsrCntlUSTV.Size = New System.Drawing.Size(1667, 964)
Me.UsrCntlUSTV.TabIndex = 0
'
'UsrcntlKundeBearbeitenFull_SDL1
'
Me.UsrcntlKundeBearbeitenFull_SDL1.BackColor = System.Drawing.Color.White
Me.UsrcntlKundeBearbeitenFull_SDL1.Location = New System.Drawing.Point(0, 3)
Me.UsrcntlKundeBearbeitenFull_SDL1.Name = "UsrcntlKundeBearbeitenFull_SDL1"
Me.UsrcntlKundeBearbeitenFull_SDL1.Size = New System.Drawing.Size(1152, 628)
Me.UsrcntlKundeBearbeitenFull_SDL1.TabIndex = 0
'
'frmKundenblatt
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -3371,6 +3415,7 @@ Partial Class frmKundenblatt
Me.tbZoll.ResumeLayout(False)
Me.tbcntrZOLL.ResumeLayout(False)
Me.tbFirmendaten.ResumeLayout(False)
Me.Panel4.ResumeLayout(False)
Me.tbAllgemein.ResumeLayout(False)
Me.tbAllgemein.PerformLayout()
Me.GroupBox5.ResumeLayout(False)
@@ -3395,6 +3440,8 @@ Partial Class frmKundenblatt
CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
Me.tbcntrMain.ResumeLayout(False)
Me.tbFirmendatenSDL.ResumeLayout(False)
Me.Panel7.ResumeLayout(False)
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -3609,4 +3656,8 @@ Partial Class frmKundenblatt
Friend WithEvents PictureBox1 As PictureBox
Friend WithEvents Label2 As Label
Friend WithEvents tbcntrMain As TabControl
Friend WithEvents UsrcntlKundeBearbeitenFull1 As usrcntlKundeBearbeitenFull
Friend WithEvents tbFirmendatenSDL As TabPage
Friend WithEvents Panel7 As Panel
Friend WithEvents UsrcntlKundeBearbeitenFull_SDL1 As usrcntlKundeBearbeitenFull_SDL
End Class

251
SDL/kunden/frmKundenblatt.vb
View File

@@ -64,7 +64,7 @@ Public Class frmKundenblatt
Sub changeTab(index As Integer, tsi As ToolStripItem, Optional subItemIndexMDM As Integer = -1, Optional subItemIndexZoll As Integer = -1)
If kdNr <= 0 Then
If index <> 1 Then
If index <> 7 Then
Exit Sub 'Kein Wechsel --> Kundenerfassung
Else
@@ -123,26 +123,11 @@ Public Class frmKundenblatt
KdSearchBox1.initKdBox(Me)
AddHandler KdSearchBox1.PropertyChanged, Sub()
Try
' If KdSearchBox1.KdNr <= 0 Then
' tabindex = 0
' End If
'Exit Sub
' kdNr = KdSearchBox1.KdNr_value
' initDataBinding()
' Dim tabindex = Me.tbcntrMain.SelectedIndex
Dim tabindex = Me.tbcntrMain.SelectedIndex
Me.KUNDE = Nothing
Me.kdNr = KdSearchBox1.KdNr_value
initKUNDE() ' Me.frmKundenblatt_Load(Me, New EventArgs)
' Me.initAllgemein()
' If Me.tbcntrMain.SelectedIndex = 0 Then
' Else
' Me.tbcntrMain.SelectedIndex = 0
'End If
' Me.tbcntrMain.SelectedIndex = 0
initKUNDE()
initTABSDL_Allgemein()
changeTab(tabindex, AllgemeinToolStripMenuItem)
@@ -153,11 +138,17 @@ Public Class frmKundenblatt
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
KdSearchBox1.KdNr = kdNr ' Ruft initKUNDE auf
KdSearchBox1.KdNr = kdNr
changeTab(0, AllgemeinToolStripMenuItem)
If isAVISO() Then
tbcntrMain.TabPages.Remove(tbFirmendatenSDL)
Else
tbcntrMain.TabPages.Remove(tbFirmendaten)
End If
tbcntrMDM.TabPages.Remove(tbVERAGCard) 'Jetzt in SDL LEintstungen
If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", "SDL") Then
@@ -253,9 +244,16 @@ Public Class frmKundenblatt
lblBonitaet.Text = If(KUNDE.Bonität, "")
Else
'UsrcntlKundeBearbeitenFull1.Enabled = False
tbcntrMain.TabPages(2).Enabled = True
initTABSDL_Firmendaten()
If isAVISO() Then
initTABSDL_Firmendaten()
Else
initTABSDL_FirmendatenSDL()
End If
End If
' lblFirma.Text = KUNDE.Kurzname
@@ -270,6 +268,7 @@ Public Class frmKundenblatt
Select Case tbcntrMain.SelectedTab.Name
Case "tbAllgemein" : initTABSDL_Allgemein()
Case "tbFirmendaten" : initTABSDL_Firmendaten()
Case "tbFirmendatenSDL" : initTABSDL_FirmendatenSDL()
Case "tbMdm"
Select Case tbcntrMDM.SelectedTab.Name
Case "tbLKW" : initTABLKW()
@@ -351,73 +350,32 @@ Public Class frmKundenblatt
Sub initTABSDL_Firmendaten()
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("Kundendaten_bearbeiten", Me) = 0 Then
tbcntrMain.TabPages(1).Enabled = False
' cProgramFunctions.setAllReadOnly(Panel4)
Else
tbcntrMain.TabPages(1).Enabled = True
End If
If Not cAllgemein.PROGID = 16 Then
Dim CNTL_KUNDE_FULL As New usrcntlKundeBearbeitenFull_SDL
With CNTL_KUNDE_FULL
.Dock = DockStyle.Fill
.Visible = True
End With
Panel4.Controls.Add(CNTL_KUNDE_FULL)
CNTL_KUNDE_FULL.Enabled = True
CNTL_KUNDE_FULL.init(kdNr, True)
If FilialeNr > 0 Then
CNTL_KUNDE_FULL.cboFiliale.changeItem(FilialeNr)
End If
AddHandler CNTL_KUNDE_FULL.KD_SAVED, Sub(kdnrTMP As Integer)
If Me.kdNr < 0 And kdnrTMP > 0 Then
KdSearchBox1.KdNr = kdnrTMP
End If
End Sub
Else
Dim CNTL_KUNDE_FULL As New usrcntlKundeBearbeitenFull
With CNTL_KUNDE_FULL
.Dock = DockStyle.Fill
.Visible = True
End With
Panel4.Controls.Add(CNTL_KUNDE_FULL)
'If IsNumeric(kdNr) AndAlso kdNr >= 0 Then
CNTL_KUNDE_FULL.init(kdNr, False)
CNTL_KUNDE_FULL.Enabled = True
If FilialeNr > 0 Then
CNTL_KUNDE_FULL.cboFiliale.changeItem(FilialeNr)
End If
AddHandler CNTL_KUNDE_FULL.KD_SAVED, Sub(kdnrTMP As Integer)
If Me.kdNr < 0 And kdnrTMP > 0 Then
KdSearchBox1.KdNr = kdnrTMP
End If
End Sub
End If
tbcntrMain.TabPages(1).Enabled = True
UsrcntlKundeBearbeitenFull1.Enabled = True
UsrcntlKundeBearbeitenFull1.init(kdNr, isVerag360)
If FilialeNr > 0 Then
UsrcntlKundeBearbeitenFull1.cboFiliale.changeItem(FilialeNr)
End If
'End If
End Sub
Sub initTABSDL_FirmendatenSDL()
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("Kundendaten_bearbeiten", Me) = 0 Then
tbcntrMain.TabPages(7).Enabled = False
End If
tbcntrMain.TabPages(7).Enabled = True
UsrcntlKundeBearbeitenFull_SDL1.Enabled = True
UsrcntlKundeBearbeitenFull_SDL1.init(kdNr, isVerag360)
If FilialeNr > 0 Then
UsrcntlKundeBearbeitenFull_SDL1.cboFiliale.changeItem(FilialeNr)
End If
End Sub
Sub initTABVERAGCard()
@@ -745,63 +703,6 @@ Public Class frmKundenblatt
End With
'Dim SQL_Diesel As String = " FROM SDL, Speditionsdienstleistungen WHERE KundenNr=" & kdNr & " AND ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr AND SDL.SDLNr IN (100,101)"
'Dim dt_Diesel As DataTable = SQL.loadDgvBySql("SELECT SDL.SDLNr,Count(SDL.SDLNr) as Anzahl" & SQL_Diesel & " Group by SDL.SDLNr", "SDL")
'lblStat_SdlLeistungen_Diesel.Text = SQL.getSqlCount("SELECT Count(SDL.SDLNr)" & SQL_Diesel) & " aktive Tankkarten"
''If dt_Diesel.Rows.Count > 0 Then
'' lblStat_SdlLeistungen_Diesel.Text &= " ( "
'' For Each r In dt_Diesel.Rows
'' Dim Lieferant As String = ""
'' Select Case r.Item("SDLNr")
'' Case "100" : Lieferant = r.Item("Anzahl") & "x IDS "
'' Case "101" : Lieferant = r.Item("Anzahl") & "x RMC "
'' End Select
'' lblStat_SdlLeistungen_Diesel.Text &= Lieferant
'' Next
'' lblStat_SdlLeistungen_Diesel.Text &= ")"
''End If
'Dim SQL_Maut As String = " FROM SDL, Speditionsdienstleistungen WHERE KundenNr=" & kdNr & " AND ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr AND SDL.SDLNr BETWEEN 200 AND 218"
'Dim dt_Maut As DataTable = SQL.loadDgvBySql("SELECT SDL.SDLNr,Count(SDL.SDLNr) as Anzahl" & SQL_Maut & " Group by SDL.SDLNr", "SDL")
'lblStat_SdlLeistungen_Maut.Text = SQL.getSqlCount("SELECT Count(SDL.SDLNr)" & SQL_Maut) & " aktive Mautboxen/-karten"
''If dt_Maut.Rows.Count > 0 Then
'' lblStat_SdlLeistungen_Maut.Text &= " ( "
'' For Each r As DataRow In dt_Maut.Rows
'' Dim Lieferant As String = ""
'' Select Case r.Item("SDLNr")
'' Case "200" : Lieferant = r.Item("Anzahl") & "x AT "
'' Case "201" : Lieferant = r.Item("Anzahl") & "x DE "
'' Case "202" : Lieferant = r.Item("Anzahl") & "x TELEPASS "
'' Case "203" : Lieferant = r.Item("Anzahl") & "x CZ "
'' Case "205" : Lieferant = r.Item("Anzahl") & "x MotorWay "
'' Case "206" : Lieferant = r.Item("Anzahl") & "x DouBox "
'' Case "208" : Lieferant = r.Item("Anzahl") & "x MSE "
'' Case "209" : Lieferant = r.Item("Anzahl") & "x PL "
'' Case "210" : Lieferant = r.Item("Anzahl") & "x SI "
'' Case "211" : Lieferant = r.Item("Anzahl") & "x MSE-MP "
'' Case "212" : Lieferant = r.Item("Anzahl") & "x UTA "
'' Case "213" : Lieferant = r.Item("Anzahl") & "x HUGO "
'' Case "214" : Lieferant = r.Item("Anzahl") & "x PLOSE-RM "
'' Case "215" : Lieferant = r.Item("Anzahl") & "x PLOSE-IT "
'' Case "216" : Lieferant = r.Item("Anzahl") & "x PLOSE-CZ "
'' Case "217" : Lieferant = r.Item("Anzahl") & "x PLOSE-MP "
'' Case "218" : Lieferant = r.Item("Anzahl") & "x PLOSE-TM "
'' End Select
'' lblStat_SdlLeistungen_Maut.Text &= Lieferant
'' Next
'' lblStat_SdlLeistungen_Maut.Text &= ")"
''End If
End Sub
Function checkNullStr(o As Object) As String
If Not IsDBNull(o) Then
@@ -1034,16 +935,6 @@ Public Class frmKundenblatt
dgvOfferte.DataSource = SQL.loadDgvBySql("SELECT Offertenstamm.OffertenNr, Offertenstamm.OffertenBez FROM Kunden,Offerten,Offertenstamm WHERE Offerten.KundenNr=" & kdNr & " AND Kunden.KundenNr=Offerten.KundenNr AND Offertenstamm.OffertenNr=Offerten.OffertenNr ")
End Sub
' Sub initDgvSDLLeistungen()
' dgvSDLLeistungen.DataSource = SQL.loadDgvBySql("SELECT KundenSDL.SDLNr, Speditionsdienstleistungen.SDLBez FROM KundenSDL,Speditionsdienstleistungen WHERE KundenSDL.KundenNr=" & kdNr & " AND Speditionsdienstleistungen.SDLNr=KundenSDL.SDLNr ")
'showDgvOfferte()
' End Sub
Sub showDgvOfferte()
With dgvOfferte
.RowTemplate.Height = 20
@@ -1221,7 +1112,7 @@ Public Class frmKundenblatt
Sub initDgvSperrliste()
With dgvSperrliste
' .DataSource = SQL.loadDgvBySql("SELECT Speditionsdienstleistungen.SDLNr,Speditionsdienstleistungen.SDLBez,Sperrnummernverzeichnis.SperrNr,Sperrnummernverzeichnis.SperrBez,KundenSDL.Sperrdatum FROM Speditionsdienstleistungen,KundenSDL,Sperrnummernverzeichnis WHERE KundenSDL.KundenNr=" & kdNr & " AND Speditionsdienstleistungen.SDLNr=KundenSDL.SDLNr AND Sperrnummernverzeichnis.SperrNr=KundenSDL.Sperre /*AND KundenSDL.Sperrdatum IS NOT NULL*/ ORDER BY SperrNr")
.DataSource = SQL.loadDgvBySql(" SELECT KundenSDL.SDLNr, Speditionsdienstleistungen.SDLBez,Sperrnummernverzeichnis.SperrNr,Sperrnummernverzeichnis.SperrBez, [Sperrdatum], Vermerk " &
" FROM KundenSDL INNER JOIN Speditionsdienstleistungen ON Speditionsdienstleistungen.SDLNr=KundenSDL.SDLNr INNER JOIN Sperrnummernverzeichnis ON Sperrnummernverzeichnis.SperrNr=KundenSDL.Sperre " &
" WHERE KundenSDL.KundenNr='" & kdNr & "' AND KundenSDL.SDLNr in (select distinct(SDL.SDLNr) from SDL where SDL.SDLNr=KundenSDL.SDLNr AND SDL.KundenNr = KundenSDL.KundenNr) and SDLTypNr IN (1,2) ORDER BY Sperre,Speditionsdienstleistungen.SDLBez")
@@ -1818,7 +1709,12 @@ Public Class frmKundenblatt
Private Sub ToolStripMenuItem2_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem2.Click
changeTab(1, sender)
'If isAVISO() Then
' changeTab(7, sender)
'Else
changeTab(7, sender)
'End If
End Sub
' Private Sub ToolStripMenuItem4_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem4.DoubleClick
@@ -1827,28 +1723,28 @@ Public Class frmKundenblatt
'End Sub
Private Sub ToolStripMenuItem4_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem4.Click
changeTab(3, sender, 1)
changeTab(2, sender, 1)
End Sub
Private Sub ToolStripMenuItem5_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem5.Click
changeTab(2, sender)
changeTab(1, sender)
End Sub
Private Sub tbitVERAGCard_Click(sender As Object, e As EventArgs)
changeTab(3, ToolStripMenuItem4, 3)
changeTab(2, ToolStripMenuItem4, 3)
End Sub
Private Sub tbitLeistungen_Click(sender As Object, e As EventArgs)
changeTab(3, ToolStripMenuItem4, 0)
changeTab(2, ToolStripMenuItem4, 0)
End Sub
Private Sub tbitKartenverwaltung_Click(sender As Object, e As EventArgs)
changeTab(3, ToolStripMenuItem4, 1)
changeTab(2, ToolStripMenuItem4, 1)
End Sub
Private Sub tbitLKW_Click(sender As Object, e As EventArgs)
changeTab(3, ToolStripMenuItem4, 2)
changeTab(2, ToolStripMenuItem4, 2)
End Sub
Private Sub DropDownOpened(sender As Object, e As EventArgs) Handles ToolStripMenuItem4.DropDownOpened
@@ -2019,7 +1915,7 @@ Public Class frmKundenblatt
Return False
End Function
Private Sub frmKundenblatt_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
If showEdit Then changeTab(1, ToolStripMenuItem2)
If showEdit Then changeTab(7, ToolStripMenuItem2)
If My.Computer.Screen.WorkingArea.Width * 0.8 > Me.MinimumSize.Width Then
Me.Width = My.Computer.Screen.WorkingArea.Width * 0.8
@@ -2035,13 +1931,13 @@ Public Class frmKundenblatt
End Sub
Private Sub ToolStripMenuItem7_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem7.Click
changeTab(6, sender)
changeTab(5, sender)
End Sub
Private Sub ToolStripMenuItem8_Click(sender As Object, e As EventArgs)
changeTab(5, sender)
changeTab(4, sender)
End Sub
@@ -2057,11 +1953,6 @@ Public Class frmKundenblatt
End If
End Sub
Private Sub UsrcntlKundeBearbeitenFull1_KD_SAVED(kdnrTMP As Object)
If Me.kdNr < 0 And kdnrTMP > 0 Then
KdSearchBox1.KdNr = kdnrTMP
End If
End Sub
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
Dim LIST As New List(Of String)
@@ -2073,7 +1964,7 @@ Public Class frmKundenblatt
End Sub
Private Sub ToolStripMenuItem8_Click_1(sender As Object, e As EventArgs) Handles ToolStripMenuItem8.Click
changeTab(5, sender, 1)
changeTab(4, sender, 1)
End Sub
Private Sub btnOP_Click(sender As Object, e As EventArgs) Handles btnOP.Click
@@ -2482,12 +2373,20 @@ Public Class frmKundenblatt
End Sub
Private Sub UsrcntlKundeBearbeitenFull1_KD_SAVED(kdnrTMP As Object) Handles UsrcntlKundeBearbeitenFull1.KD_SAVED, UsrcntlKundeBearbeitenFull_SDL1.KD_SAVED
If Me.kdNr < 0 And kdnrTMP > 0 Then
KdSearchBox1.KdNr = kdnrTMP
End If
End Sub
Private Sub ToolStripMenuItem9_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem9.Click
changeTab(4, sender)
changeTab(3, sender)
End Sub
Private Sub ToolStripMenuItem10_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem10.Click
changeTab(7, sender)
changeTab(6, sender)
End Sub
Private Sub dgvRg_SelectionChanged(sender As Object, e As EventArgs) Handles dgvRg.SelectionChanged
@@ -3089,15 +2988,10 @@ Public Class frmKundenblatt
Dim f As New SDL.frmAbrechnungsMaskeEinzeln(dgvZinsnachberechnung.SelectedRows(0).Cells("RK_ID").Value)
f.Show(Me)
End If
End Sub
Private Sub btnRgMail_Click(sender As Object, e As EventArgs) Handles btnRgMail.Click
End Sub
Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button8.Click
Dim rptKundeUebersicht As New SDL.rptKundeUebersicht(kdNr, 19)
@@ -3110,12 +3004,9 @@ Public Class frmKundenblatt
rpt.Show()
End Sub
Private Sub PictureBox5_Click(sender As Object, e As EventArgs)
End Sub
Private Sub lblEmail_TextChanged(sender As Object, e As MouseEventArgs) Handles lblEmail2.MouseUp, lblEmail.MouseUp
End Sub
Private Function isAVISO() As Boolean
Return cAllgemein.PROGID = 16
End Function
End Class

7
SDL/kunden/usrcntlKundeBearbeitenFull_SDL.vb
View File

@@ -404,8 +404,6 @@ Public Class usrcntlKundeBearbeitenFull_SDL
Case "ATILLA"
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 100000-199999: ATILLA", "100000-199999"))
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 900000-999999: Sonstige", "900000-999999"))
'ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 700000-799999: ZOLL Abrechnung", "728000-799999"))
' ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 900000-999999: Sonstige", "900000-999999"))
cboKundenkreis.changeItem("100000-199999")
Case Else
@@ -417,11 +415,9 @@ Public Class usrcntlKundeBearbeitenFull_SDL
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 500000-599999: EV - Kunden", "500000-599999"))
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 700000-799999: ZOLL Abrechnung", "728000-799999"))
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 5-stellig: Fiskal (keine Abrechnung)", "30000-49999"))
' ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 800000-899999: XXXXXX", "800000-899999"))
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 800000-899999: BREXIT", "800000-899999"))
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 900000-999999: Sonstige", "900000-999999"))
' ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("1000000-1099999: IMEX", "1080000-1099990"))
cboKundenkreis.changeItem("728000-799999")
@@ -478,13 +474,10 @@ Public Class usrcntlKundeBearbeitenFull_SDL
End If
If kdnr > 0 Then
' Dim ADRESSE As New VERAG_PROG_ALLGEMEIN.cAdressen(kdnr)
ADRESSE.AdressenNr = kdnr
ADRESSE.Eingegeben_am = Now.ToShortDateString
ADRESSE.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
ADRESSE.INIT_NEWKD_DATA()
' Dim KUNDE As New VERAG_PROG_ALLGEMEIN.cKunde(kdnr)
KUNDE.KundenNr = kdnr
KUNDE.KundenNrZentrale = kdnr
KUNDE.FilialenNr = cboFiliale._value

8
SDL/mdm/frmMDMDatenverarbetiung.vb
View File

@@ -270,7 +270,7 @@ Public Class frmMDMDatenverarbetiung
sqlstr &= " order by plose_ProduktCode"
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL", 40000)
'DataGridView.DataSource = dt
@@ -358,7 +358,7 @@ Public Class frmMDMDatenverarbetiung
[plInv_SupplierCountry]"
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL", 20000)
'DataGridView.DataSource = dt
@@ -446,7 +446,7 @@ Public Class frmMDMDatenverarbetiung
order by plp_LeistungsNr"
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL", 20000)
'DataGridView.DataSource = dt
@@ -487,7 +487,7 @@ Public Class frmMDMDatenverarbetiung
' rpt.lblProduktBeschreibung.Text = isDbnullEmpty(rpt.Fields.Item("BC_DESCR").Value, "")
rpt.lblAnzahl.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Anzahl").Value, "")
rpt.lblProdukt.Text = SQL.isDbnullEmpty(rpt.Fields.Item("plp_LeistungsNr").Value, "")
rpt.lblMenge.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Währung").Value, "")
rpt.lblMenge.Text = SQL.isDbnullEmpty(rpt.Fields.Item("plose_Menge").Value, "")
' rpt.lblPreis.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_Preis").Value, 2, "")
rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_Nettobetrag").Value, 2, "")
rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_MWSTBetrag").Value, 2, "")