UID-Prüfung, etc.
This commit is contained in:
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("1.4.7.6")>
|
||||
<Assembly: AssemblyFileVersion("1.4.7.6")>
|
||||
<Assembly: AssemblyVersion("1.4.7.7")>
|
||||
<Assembly: AssemblyFileVersion("1.4.7.7")>
|
||||
|
||||
1251
SDL/buchhaltung/usrCntlBH.Designer.vb
generated
1251
SDL/buchhaltung/usrCntlBH.Designer.vb
generated
File diff suppressed because it is too large
Load Diff
@@ -4,6 +4,7 @@ Imports System.Windows.Media.Animation
|
||||
Imports com.sun.crypto.provider
|
||||
Imports com.sun.xml.internal.rngom
|
||||
Imports GrapeCity.ActiveReports.ReportsCore.Tools
|
||||
Imports jdk.nashorn.internal.objects.annotations
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
|
||||
Public Class usrCntlBH
|
||||
@@ -33,7 +34,12 @@ Public Class usrCntlBH
|
||||
cboAbfVerbFirma.fillWithSQL(" SELECT distinct([Firma]) FROM [VERAG].[dbo].[Filialen] order by [Firma]", False, "FMZOLL", True)
|
||||
cboAbfVerbFirma.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
|
||||
|
||||
cbxFirmaUID.fillWithSQL(" SELECT distinct([Firma]) FROM [VERAG].[dbo].[Filialen] order by [Firma]", False, "FMZOLL", True)
|
||||
cbxFirmaUID.Items.Add(New MyListItem("AMBAR", "AMBAR"))
|
||||
cbxFirmaUID.Items.Add(New MyListItem("IMEX", "IMEX"))
|
||||
cbxFirmaUID.Items.Add(New MyListItem("ATILLA", "ATILLA"))
|
||||
cbxFirmaUID.Items.Add(New MyListItem("UNISPED", "UNISPED"))
|
||||
cbxFirmaUID.Items.Add(New MyListItem("VERAG", "VERAG"))
|
||||
cbxFirmaUID.Items.Add(New MyListItem("", ""))
|
||||
cbxFirmaUID.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
|
||||
|
||||
txtUID_Jahr.Text = Now().Year
|
||||
@@ -1279,14 +1285,14 @@ Public Class usrCntlBH
|
||||
|
||||
If txtUID_Monat.Text = "" OrElse txtUID_Monat.Text <> "" AndAlso IsNumeric(txtUID_Monat.Text) AndAlso CInt(txtUID_Monat.Text) > 0 AndAlso CInt(txtUID_Monat.Text) < 13 Then
|
||||
|
||||
Dim SQL_UID As String = "SELECT [uid_KundenNr] as KdNr , Adressen.[Name 1],[uid_UstIdKz] as UstIdKz,[uid_UstIdNr] as UstIdnr, case when [uid_valid] = 1 then 'GUELTIG' else 'UNGUELTIG' end as Ergebnis, cast([uid_Datum] as date) as Pruefdatum,Convert(varchar(8), [uid_Datum], 108) As Pruefzeit, [firma] as Firma, cast(Adressen.UstIdGeprüft as date) as [letzte Prüfung], uid_pruefungstool as Quelle, uid_Sachbearbeiter as Sachbearbeiter
|
||||
FROM [VERAG].[dbo].[tblUIDPruefung] inner join Adressen on Adressen.AdressenNr = [uid_KundenNr]
|
||||
where YEAR(uid_Datum) = " & txtUID_Jahr.Text & IIf(txtUID_Monat.Text <> "", " AND MONTH(uid_Datum) = " & txtUID_Monat.Text, "") & IIf(cbxFirmaUID._value <> "", " And [firma] = '" & cbxFirmaUID._value & "'", "") & IIf(cbx_nur_ungueltige.Checked, " AND [uid_valid] = 0 ", "")
|
||||
Dim SQL_UID As String = "SELECT [uid_KundenNr] as KdNr , Adressen.[Name 1],[uid_UstIdKz] as UstIdKz,[uid_UstIdNr] as UstIdnr, case when [uid_valid] = 1 then 'GUELTIG' else 'UNGUELTIG' end as Ergebnis, cast([uid_Datum] as date) as Pruefdatum,Convert(varchar(8), [uid_Datum], 108) As Pruefzeit, [tblUIDPruefung].[firma] as Firma, cast(Adressen.UstIdGeprüft as date) as [letzte Prüfung], uid_pruefungstool as Quelle, uid_Sachbearbeiter as Sachbearbeiter, Filialen.FilialenNr
|
||||
FROM [VERAG].[dbo].[tblUIDPruefung] inner join Adressen on Adressen.AdressenNr = [uid_KundenNr] inner Join kunden On KundenNr=AdressenNr inner join Filialen On Filialen.FilialenNr=Kunden.FilialenNr
|
||||
where YEAR(uid_Datum) = " & txtUID_Jahr.Text & IIf(txtUID_Monat.Text <> "", " AND MONTH(uid_Datum) = " & txtUID_Monat.Text, "") & IIf(cbxFirmaUID._value <> "", " And [tblUIDPruefung].[firma] = '" & cbxFirmaUID._value & "'", "") & IIf(cbx_nur_ungueltige.Checked, " AND [uid_valid] = 0 ", "") & " ORDER BY Filialen.FilialenNr "
|
||||
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
Dim dt_UID As DataTable = SQL.loadDgvBySql(SQL_UID, "FMZOLL")
|
||||
If dt_UID.Rows.Count > 0 Then
|
||||
cProgramFunctions.genExcelFromDT_NEW(dt_UID,,,,,, True)
|
||||
cProgramFunctions.genExcelFromDT_NEW(dt_UID)
|
||||
Me.Cursor = Cursors.Default
|
||||
Else
|
||||
MsgBox("keine Daten für den ausgewählten Zeitraum!")
|
||||
@@ -1303,4 +1309,43 @@ Public Class usrCntlBH
|
||||
Me.Cursor = Cursors.Default
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
Private Sub txtUID_Monat_TextChanged(sender As Object, e As EventArgs) Handles txtUID_Monat.TextChanged
|
||||
calcUIDPruefungen()
|
||||
End Sub
|
||||
|
||||
Private Sub cbxFirmaUID_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbxFirmaUID.SelectedIndexChanged
|
||||
calcUIDPruefungen()
|
||||
End Sub
|
||||
|
||||
Private Sub calcUIDPruefungen()
|
||||
|
||||
If txtUID_Jahr.Text <> "" AndAlso IsNumeric(txtUID_Jahr.Text) AndAlso txtUID_Jahr.Text.Length = 4 Then
|
||||
|
||||
If txtUID_Monat.Text = "" OrElse txtUID_Monat.Text <> "" AndAlso IsNumeric(txtUID_Monat.Text) AndAlso CInt(txtUID_Monat.Text) > 0 AndAlso CInt(txtUID_Monat.Text) < 13 Then
|
||||
|
||||
Dim SQL_FIRMA As String = ""
|
||||
Select Case cbxFirmaUID._value
|
||||
Case "AMBAR" : SQL_FIRMA = " And Filialen.FilialenNr IN (5701)"
|
||||
Case "IMEX" : SQL_FIRMA = " And Filialen.FilialenNr IN (5501)"
|
||||
Case "ATILLA" : SQL_FIRMA = " And Filialen.FilialenNr IN (4801)"
|
||||
Case "UNISPED" : SQL_FIRMA = " AND Filialen.firma='UNISPED' "
|
||||
Case "VERAG" : SQL_FIRMA = " AND Filialen.firma='VERAG' "
|
||||
Case Else : SQL_FIRMA = ""
|
||||
End Select
|
||||
|
||||
|
||||
Dim Month As Integer = CInt(txtUID_Monat.Text).ToString("D2")
|
||||
Dim Year As Integer = CInt(txtUID_Jahr.Text)
|
||||
|
||||
Dim datum = CDate("15." & Month & "." & Year).AddMonths(-1)
|
||||
|
||||
Dim SQL_UID_zupruefen As String = "Select count(*) From [Adressen] inner Join kunden On KundenNr=AdressenNr inner join Filialen On Filialen.FilialenNr=Kunden.FilialenNr where(UstIdGeprüft <= '" & datum & "' OR UstIdGeprüft is null) and (Adressen.UstIdKz is not null And Auswahl='A'" & SQL_FIRMA & ")"
|
||||
|
||||
lblUID_zupruefen.Text = "nicht geprüft: " & SQL.getValueTxtBySql(SQL_UID_zupruefen, "FMZOLL",,, "0")
|
||||
|
||||
End If
|
||||
|
||||
End If
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
18
SDL/frmdynMailvorlage.Designer.vb
generated
18
SDL/frmdynMailvorlage.Designer.vb
generated
@@ -66,9 +66,12 @@ Partial Class frmdynMailvorlagen
|
||||
Me.Label3 = New System.Windows.Forms.Label()
|
||||
Me.cbxFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
|
||||
Me.dgvMailvorlagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
|
||||
Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
|
||||
Me.KopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.mainPanel.SuspendLayout()
|
||||
Me.pnlTop.SuspendLayout()
|
||||
CType(Me.dgvMailvorlagen, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.ContextMenuStrip1.SuspendLayout()
|
||||
Me.SuspendLayout()
|
||||
'
|
||||
'mainPanel
|
||||
@@ -562,6 +565,18 @@ Partial Class frmdynMailvorlagen
|
||||
Me.dgvMailvorlagen.Size = New System.Drawing.Size(1283, 365)
|
||||
Me.dgvMailvorlagen.TabIndex = 104
|
||||
'
|
||||
'ContextMenuStrip1
|
||||
'
|
||||
Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KopierenToolStripMenuItem})
|
||||
Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
|
||||
Me.ContextMenuStrip1.Size = New System.Drawing.Size(181, 48)
|
||||
'
|
||||
'KopierenToolStripMenuItem
|
||||
'
|
||||
Me.KopierenToolStripMenuItem.Name = "KopierenToolStripMenuItem"
|
||||
Me.KopierenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
|
||||
Me.KopierenToolStripMenuItem.Text = "Kopieren"
|
||||
'
|
||||
'frmdynMailvorlagen
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
@@ -580,6 +595,7 @@ Partial Class frmdynMailvorlagen
|
||||
Me.pnlTop.ResumeLayout(False)
|
||||
Me.pnlTop.PerformLayout()
|
||||
CType(Me.dgvMailvorlagen, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.ContextMenuStrip1.ResumeLayout(False)
|
||||
Me.ResumeLayout(False)
|
||||
|
||||
End Sub
|
||||
@@ -626,4 +642,6 @@ Partial Class frmdynMailvorlagen
|
||||
Friend WithEvents cbxTyp As VERAG_PROG_ALLGEMEIN.MyComboBox
|
||||
Friend WithEvents Label13 As Label
|
||||
Friend WithEvents TextBox2 As TextBox
|
||||
Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
|
||||
Friend WithEvents KopierenToolStripMenuItem As ToolStripMenuItem
|
||||
End Class
|
||||
|
||||
@@ -117,4 +117,7 @@
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
</root>
|
||||
@@ -1,8 +1,4 @@
|
||||
Imports System.Windows.Controls
|
||||
Imports System.Windows.Documents
|
||||
Imports DocumentFormat.OpenXml.Drawing.Charts
|
||||
Imports GrapeCity.ActiveReports.SectionReportModel
|
||||
Imports Microsoft.Office.Interop
|
||||
Imports Microsoft.Office.Interop
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
|
||||
Public Class frmdynMailvorlagen
|
||||
@@ -57,17 +53,89 @@ Public Class frmdynMailvorlagen
|
||||
cbxFirma.Enabled = editall
|
||||
btnDelete.Enabled = editall
|
||||
|
||||
|
||||
For Each firmen_temp In cbxFirma.Items
|
||||
If firmen_temp.ToString <> "" Then
|
||||
If Not KopierenToolStripMenuItem.DropDownItems.ContainsKey(firmen_temp.ToString) Then
|
||||
|
||||
If Not editall AndAlso firmen_temp.ToString = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then
|
||||
Dim menuItem = New ToolStripMenuItem() With {.Text = firmen_temp.ToString, .Name = firmen_temp.ToString}
|
||||
KopierenToolStripMenuItem.DropDownItems.Add(menuItem)
|
||||
AddHandler menuItem.Click, AddressOf mnusubItem_Click
|
||||
|
||||
ElseIf editall Then
|
||||
Dim menuItem = New ToolStripMenuItem() With {.Text = firmen_temp.ToString, .Name = firmen_temp.ToString}
|
||||
KopierenToolStripMenuItem.DropDownItems.Add(menuItem)
|
||||
AddHandler menuItem.Click, AddressOf mnusubItem_Click
|
||||
|
||||
End If
|
||||
|
||||
|
||||
End If
|
||||
End If
|
||||
|
||||
Next
|
||||
|
||||
initDGVMailvorlagen(cbxFirma._value,, cbxSpracheSelected._value)
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
|
||||
Private Sub mnusubItem_Click(sender As Object, e As EventArgs)
|
||||
ContextMenuStrip1.Hide()
|
||||
Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem)
|
||||
|
||||
Try
|
||||
Dim Info As String = "Möchten Sie diesen Mailvorlage für die Firma " & item.Name & " kopieren?"
|
||||
|
||||
If dgvMailvorlagen.SelectedRows(0).Cells("txt_FIRMA").Value = item.Name Then
|
||||
Info &= vbNewLine & "Die ausgewählte Vorlage existiert bereits für die Firma " & item.Name
|
||||
End If
|
||||
|
||||
If vbYes = MsgBox(Info, vbYesNo) Then
|
||||
|
||||
|
||||
txtkonserve = New cTextkonserve(dgvMailvorlagen.SelectedRows(0).Cells("txt_id").Value)
|
||||
|
||||
Dim txtkonserve_new = New cTextkonserve()
|
||||
|
||||
txtkonserve_new.txt_text = txtkonserve.txt_text
|
||||
txtkonserve_new.txt_bezeichnung = txtkonserve.txt_bezeichnung
|
||||
txtkonserve_new.txt_betreff = txtkonserve.txt_betreff
|
||||
txtkonserve_new.txt_dynMailvorlage = txtkonserve.txt_dynMailvorlage
|
||||
txtkonserve_new.txt_sprache = txtkonserve.txt_sprache
|
||||
txtkonserve_new.txt_sendungsvermerk = txtkonserve.txt_sendungsvermerk
|
||||
txtkonserve_new.txt_sendungsvermerkId = txtkonserve.txt_sendungsvermerkId
|
||||
txtkonserve_new.txt_sendungsvermerkText = txtkonserve.txt_sendungsvermerkText
|
||||
txtkonserve_new.txt_fixerEmpfaengerEmail = txtkonserve.txt_fixerEmpfaengerEmail
|
||||
txtkonserve_new.txt_FIRMA = item.Name
|
||||
txtkonserve_new.txt_kategorie = txtkonserve.txt_kategorie
|
||||
txtkonserve_new.txt_typ = txtkonserve.txt_typ
|
||||
txtkonserve_new.txt_letzteAenderungUser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
|
||||
txtkonserve_new.txt_letzteAenderung = DateTime.Now
|
||||
|
||||
txtkonserve_new.SAVE()
|
||||
initDGVMailvorlagen(item.ToString)
|
||||
End If
|
||||
|
||||
|
||||
Catch ex As Exception
|
||||
|
||||
|
||||
|
||||
End Try
|
||||
|
||||
|
||||
End sub
|
||||
|
||||
|
||||
Private Sub initDGVMailvorlagen(Optional firma As String = "", Optional searchparam As String = "", Optional sprache As String = "")
|
||||
|
||||
lblWarning.Text = ""
|
||||
|
||||
Dim SQLString As String = "SELECT * FROM [tblTextkonserve] WHERE txt_kategorie = 'FRM_MNGR_MailText'"
|
||||
Dim SQLWHere = ""
|
||||
Dim SQLWHere = ""
|
||||
If firma <> "" Then
|
||||
SQLWHere &= " AND txt_FIRMA = '" & firma & "'"
|
||||
End If
|
||||
@@ -464,4 +532,36 @@ Public Class frmdynMailvorlagen
|
||||
End Select
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub dgvMailvorlagen_CellMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles dgvMailvorlagen.CellMouseClick
|
||||
|
||||
If e.RowIndex < 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt
|
||||
If e.ColumnIndex < 0 Then Exit Sub
|
||||
|
||||
DirectCast(sender, DataGridView).Rows(e.RowIndex).Selected = True
|
||||
If e.Button = MouseButtons.Right Then
|
||||
|
||||
If dgvMailvorlagen.SelectedRows.Count = 1 Then
|
||||
|
||||
If (dgvMailvorlagen.SelectedRows(0).Cells("txt_FIRMA").Value Is DBNull.Value Or dgvMailvorlagen.SelectedRows(0).Cells("txt_FIRMA").Value Is Nothing Or dgvMailvorlagen.SelectedRows(0).Cells("txt_FIRMA").Value = "") Then
|
||||
|
||||
ContextMenuStrip1.Show(Cursor.Position)
|
||||
|
||||
Else
|
||||
|
||||
ContextMenuStrip1.Show(Cursor.Position)
|
||||
|
||||
|
||||
|
||||
End If
|
||||
|
||||
|
||||
End If
|
||||
|
||||
|
||||
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
Reference in New Issue
Block a user