diff --git a/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb b/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb
index 8d049192..1404d743 100644
--- a/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb
+++ b/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb
@@ -71,7 +71,6 @@ Partial Class usrcntlFiskaluebersicht
Me.Button2 = New System.Windows.Forms.Button()
Me.picEORIOK = New System.Windows.Forms.PictureBox()
Me.picOK = New System.Windows.Forms.PictureBox()
- Me.usrcntlUnterlagen = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
Me.Button1 = New System.Windows.Forms.Button()
Me.cbxVollmacht = New System.Windows.Forms.CheckBox()
Me.lblUnterlagen = New System.Windows.Forms.Label()
@@ -311,7 +310,6 @@ Partial Class usrcntlFiskaluebersicht
Me.MyPanel2.Controls.Add(Me.Button2)
Me.MyPanel2.Controls.Add(Me.picEORIOK)
Me.MyPanel2.Controls.Add(Me.picOK)
- Me.MyPanel2.Controls.Add(Me.usrcntlUnterlagen)
Me.MyPanel2.Controls.Add(Me.Button1)
Me.MyPanel2.Controls.Add(Me.cbxVollmacht)
Me.MyPanel2.Controls.Add(Me.lblUnterlagen)
@@ -706,7 +704,7 @@ Partial Class usrcntlFiskaluebersicht
Me.btnAddAttachments.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.btnAddAttachments.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnAddAttachments.ForeColor = System.Drawing.Color.Black
- Me.btnAddAttachments.Location = New System.Drawing.Point(433, 512)
+ Me.btnAddAttachments.Location = New System.Drawing.Point(627, 512)
Me.btnAddAttachments.Name = "btnAddAttachments"
Me.btnAddAttachments.Size = New System.Drawing.Size(29, 19)
Me.btnAddAttachments.TabIndex = 142
@@ -719,9 +717,9 @@ Partial Class usrcntlFiskaluebersicht
Me.cbxAttachmentArt._allowFreiText = False
Me.cbxAttachmentArt._value = ""
Me.cbxAttachmentArt.FormattingEnabled = True
- Me.cbxAttachmentArt.Location = New System.Drawing.Point(326, 512)
+ Me.cbxAttachmentArt.Location = New System.Drawing.Point(477, 510)
Me.cbxAttachmentArt.Name = "cbxAttachmentArt"
- Me.cbxAttachmentArt.Size = New System.Drawing.Size(101, 21)
+ Me.cbxAttachmentArt.Size = New System.Drawing.Size(132, 21)
Me.cbxAttachmentArt.TabIndex = 131
'
'Label4
@@ -775,25 +773,6 @@ Partial Class usrcntlFiskaluebersicht
Me.picOK.TabStop = False
Me.picOK.Visible = False
'
- 'usrcntlUnterlagen
- '
- Me.usrcntlUnterlagen._DATENSERVER_KATEGORIE = "DOKUMENTE"
- Me.usrcntlUnterlagen._DATENSERVER_ORDNER = ""
- Me.usrcntlUnterlagen._DATENSERVER_UOrdner1 = ""
- Me.usrcntlUnterlagen._DATENSERVER_UOrdner2 = ""
- Me.usrcntlUnterlagen._DATENSERVER_UOrdner3 = ""
- Me.usrcntlUnterlagen._OPEN_ORIGINAL = False
- Me.usrcntlUnterlagen._TYPE = "PDF"
- Me.usrcntlUnterlagen.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
- Me.usrcntlUnterlagen.BackColor = System.Drawing.Color.White
- Me.usrcntlUnterlagen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.usrcntlUnterlagen.Cursor = System.Windows.Forms.Cursors.Default
- Me.usrcntlUnterlagen.Location = New System.Drawing.Point(153, 410)
- Me.usrcntlUnterlagen.Margin = New System.Windows.Forms.Padding(0)
- Me.usrcntlUnterlagen.Name = "usrcntlUnterlagen"
- Me.usrcntlUnterlagen.Size = New System.Drawing.Size(170, 123)
- Me.usrcntlUnterlagen.TabIndex = 121
- '
'Button1
'
Me.Button1.BackgroundImage = Global.SDL.My.Resources.Resources.pdf
@@ -971,15 +950,14 @@ Partial Class usrcntlFiskaluebersicht
Me.dgvUnterlagen.AllowUserToResizeRows = False
Me.dgvUnterlagen.BackgroundColor = System.Drawing.Color.White
Me.dgvUnterlagen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- Me.dgvUnterlagen.Location = New System.Drawing.Point(326, 430)
+ Me.dgvUnterlagen.Location = New System.Drawing.Point(144, 399)
Me.dgvUnterlagen.MultiSelect = False
Me.dgvUnterlagen.Name = "dgvUnterlagen"
Me.dgvUnterlagen.ReadOnly = True
Me.dgvUnterlagen.RowHeadersVisible = False
Me.dgvUnterlagen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
- Me.dgvUnterlagen.Size = New System.Drawing.Size(56, 51)
+ Me.dgvUnterlagen.Size = New System.Drawing.Size(512, 107)
Me.dgvUnterlagen.TabIndex = 115
- Me.dgvUnterlagen.Visible = False
'
'cbxUID
'
@@ -1078,7 +1056,6 @@ Partial Class usrcntlFiskaluebersicht
Friend WithEvents cbxFiskalart As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents lblWarning As Label
Friend WithEvents Button4 As Button
- Friend WithEvents usrcntlUnterlagen As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList
Friend WithEvents picOK As PictureBox
Friend WithEvents picEORIOK As PictureBox
Friend WithEvents Button2 As Button
diff --git a/SDL/kunden/usrcntlFiskaluebersicht.vb b/SDL/kunden/usrcntlFiskaluebersicht.vb
index a756522b..cd53d977 100644
--- a/SDL/kunden/usrcntlFiskaluebersicht.vb
+++ b/SDL/kunden/usrcntlFiskaluebersicht.vb
@@ -10,6 +10,8 @@ Imports DAKOSY_Worker.DEERRE
Imports DAKOSY_Worker.VERAG_KundenStamm_Export
Imports DAKOSY_Worker.VERAG_KundenStamm_Export_V2
Imports jdk.internal.org.objectweb.asm.tree
+Imports DocumentFormat.OpenXml.Drawing.Charts
+Imports System.IO
Public Class usrcntlFiskaluebersicht
@@ -77,35 +79,17 @@ Public Class usrcntlFiskaluebersicht
End Sub
-
-
-
-
-
Sub initDGVUnterlagen()
- 'scanFB.INIT(kdNr, "FISKAL-" & fk.FK_Art, fk.FK_Kdnr, fk.FK_Datum)
- 'scanInfo.INIT(kdNr, "FISKAL-" & fk.FK_Art, fk.FK_Kdnr, fk.FK_Datum)
- 'scanPass.INIT(kdNr, "FISKAL-" & fk.FK_Art, fk.FK_Kdnr, fk.FK_Datum)
- 'scanHandelsreg.INIT(kdNr, "FISKAL-" & fk.FK_Art, fk.FK_Kdnr, fk.FK_Datum)
-
- usrcntlUnterlagen.INIT(kdNr, "FISKAL-" & fk.FK_Art, fk.FK_Kdnr, fk.FK_Datum)
- 'usrcntlUnterlagen.picAdd.Visible = False
- If usrcntlUnterlagen.MyListBox1.Items.Count > 0 Then lblUnterlagen.Text = "Unterlagen (" & usrcntlUnterlagen.MyListBox1.Items.Count & ")"
- Exit Sub
With dgvUnterlagen
- .DataSource = SQL.loadDgvBySql("SELECT [da_id],[da_pfad],[da_name] FROM [tblDatenarchiv] " &
- " WHERE [da_KundenNr]='" & kdNr & "' and [da_kategorie]='DOKUMENTE' AND da_ordner ='FISKAL-'" & fk.FK_Art & " AND da_uordner1 = '" & fk.FK_Kdnr & "' AND da_uordner2 ='" & fk.FK_Datum & "'", "FMZOLL")
+ .DataSource = SQL.loadDgvBySql("SELECT [fka_id],[fka_KdNr],[fka_Name],[fka_Datum] , [fka_ArtId], [fka_docId] FROM [tblFiskalkundenAnhaenge] " &
+ " WHERE [fka_KdNr]='" & fk.FK_Kdnr & "' AND fka_fkId='" & fk.FK_Id & "'", "AVISO")
- .Columns("da_id").Visible = False
- .Columns("da_pfad").Visible = False
- .Columns("da_name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
- .Columns("da_name").HeaderText = "Datei"
.ClearSelection()
AddHandler .CellDoubleClick, Sub()
If dgvUnterlagen.SelectedRows.Count > 0 Then
dgvUnterlagen.Cursor = Cursors.WaitCursor
- Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvUnterlagen.SelectedRows(0).Cells("da_id").Value)
+ Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvUnterlagen.SelectedRows(0).Cells("fka_docId").Value)
DS.OPEN_SINGLE(True)
dgvUnterlagen.Cursor = Cursors.Default
@@ -113,6 +97,8 @@ Public Class usrcntlFiskaluebersicht
End Sub
End With
+
+
End Sub
@@ -125,10 +111,10 @@ Public Class usrcntlFiskaluebersicht
cbxAttachmentArt.Items.Clear()
- cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Passkopie", "Pass"))
- cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Firmenbuchauszug", "FB"))
- cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Handelsregister", "HR"))
- cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Infoblatt", "Info"))
+ cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Passkopie", 1))
+ cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Firmenbuchauszug", 2))
+ cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Handelsregister", 3))
+ cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Infoblatt", 4))
kdNr = _kdnr
@@ -155,7 +141,7 @@ Public Class usrcntlFiskaluebersicht
Exit Sub
End If
- Dim input = InputBox("Bitte geben Sie das Datum der neuen Fiskal-Übersicht ein:", "Fiskal-Übersicht anlegen")
+ Dim input = InputBox("Bitte geben Sie das Datum der neuen Fiskal-Übersicht ein: ", "Fiskal-Übersicht anlegen")
If input <> "" Then
Dim hint As String
If checkDateIsValid(input, hint) Then
@@ -234,7 +220,6 @@ Public Class usrcntlFiskaluebersicht
fk = New cFiskalkunden(dgvFiskaluebersicht.SelectedRows(0).Cells("FK_Id").Value)
-
Dim locked As Boolean = IIf(fk.FK_locked Is Nothing, False, fk.FK_locked)
setFields()
initDGVUnterlagen()
@@ -244,7 +229,9 @@ Public Class usrcntlFiskaluebersicht
setUIenabled(locked)
Button4.Enabled = True
setAbschlusstxt(locked)
+
Else
+
Button4.Enabled = False
clearTXT()
End If
@@ -609,7 +596,7 @@ Public Class usrcntlFiskaluebersicht
For Each c As Control In MyPanel2.Controls
- If Not c.GetType.FullName = "System.Windows.Forms.CheckBox" Or c.GetType.FullName = "VERAG_PROG_ALLGEMEIN.usrcntlPDFScan" Then c.Enabled = Not locked
+ If Not c.GetType.FullName = "System.Windows.Forms.CheckBox" Then c.Enabled = Not locked
Next
@@ -715,11 +702,17 @@ Public Class usrcntlFiskaluebersicht
If e.KeyCode = Keys.Delete Then
If dgvUnterlagen.SelectedRows.Count > 0 Then
If vbYes = MsgBox("Möchten Sie die Datei wirklich löschen?", vbYesNoCancel) Then
- Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvUnterlagen.SelectedRows(0).Cells("da_id").Value)
- DS.DELETE_COMPLETE()
+ Dim anhId = dgvUnterlagen.SelectedRows(0).Cells("fka_id").Value
+ Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvUnterlagen.SelectedRows(0).Cells("fka_docId").Value)
+ If DS.DELETE_COMPLETE() Then
+ Dim anh As New cFiskalkundenAnhaenge(anhId)
+ anh.DELETE()
+ initDGVUnterlagen()
+ End If
+
+
- initDGVUnterlagen()
End If
End If
End If
@@ -747,8 +740,27 @@ Public Class usrcntlFiskaluebersicht
Private Sub btnAddAttachments_Click(sender As Object, e As EventArgs) Handles btnAddAttachments.Click
+ If cbxAttachmentArt._value = "" Then Exit Sub
+ Dim ArtId As Integer = cbxAttachmentArt._value
+
+
+ Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "FISKALKUNDENANHAENGE", "", "", "", "ART_" & ArtId, kdNr)
+ If DS.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") Then
+
+ Dim ANH = New VERAG_PROG_ALLGEMEIN.cFiskalkundenAnhaenge()
+ ANH.fka_ArtId = ArtId
+ ANH.fka_docId = DS.da_id
+ ANH.fka_Datum = Now()
+ ANH.fka_KdNr = kdNr
+ ANH.fka_Name = cbxAttachmentArt.SelectedItem.ToString
+ ANH.SAVE()
+ initDGVUnterlagen()
+ End If
+
End Sub
+
+
Private Sub cbxAttachmentArt_SelectedValueChanged(sender As Object, e As EventArgs) Handles cbxAttachmentArt.SelectedValueChanged
btnAddAttachments.Enabled = cbxAttachmentArt._value <> ""
End Sub
@@ -768,7 +780,7 @@ Public Class usrcntlFiskaluebersicht
For Each c As Control In MyPanel1.Controls
If TypeOf (c) Is CheckBox Then
- AddHandler CType(c, CheckBox).CheckedChanged, AddressOf SomethingChanged
+ AddHandler CType(c, CheckBox).CheckedChanged, AddressOf somethingChanged
ElseIf TypeOf (c) Is TextBox Then
AddHandler CType(c, TextBox).TextChanged, AddressOf SomethingChanged
End If
@@ -776,6 +788,8 @@ Public Class usrcntlFiskaluebersicht
End Sub
Private Sub somethingChanged()
-
+ If Not btnSave.Enabled Then btnSave.Enabled = True
End Sub
+
+
End Class
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkundenAnhaenge.vb b/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkundenAnhaenge.vb
new file mode 100644
index 00000000..c6773267
--- /dev/null
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkundenAnhaenge.vb
@@ -0,0 +1,145 @@
+Imports System.Data.SqlClient
+Imports System.Reflection
+
+Public Class cFiskalkundenAnhaenge
+
+ Property fka_id As Integer
+ Property fka_KdNr As Integer
+ Property fka_fkId As Integer
+ Property fka_Name As String
+ Property fka_docId As Integer
+ Property fka_ArtId As Object = Nothing
+ Property fka_Datum As Object = Nothing
+
+ Public hasEntry As Boolean = False
+
+ Dim SQL As New SQL
+
+ Sub New()
+ End Sub
+
+ Sub New(fka_id As Integer)
+ Me.fka_id = fka_id
+ LOAD()
+
+ End Sub
+
+ Sub New(fka_Name, anh_docId, anh_Art, anh_Typ)
+
+ Me.fka_Name = fka_Name
+ Me.fka_docId = fka_docId
+ Me.fka_ArtId = fka_ArtId
+
+ End Sub
+
+
+ Public Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+ Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fka_id", fka_id, , True, True))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fka_KdNr", fka_KdNr))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fka_Name", fka_Name))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fka_docId", fka_docId))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fka_ArtId", fka_ArtId))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fka_Datum", fka_Datum))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fka_fkId", fka_fkId))
+
+ Return list
+ End Function
+
+
+ Shared Sub LOAD_LIST_ByKdNr(ByRef ANH_LIST As List(Of cFiskalkundenAnhaenge), fka_KdNr As Integer, fka_fkId As Integer)
+ If ANH_LIST Is Nothing Then ANH_LIST = New List(Of cFiskalkundenAnhaenge)
+ ANH_LIST.Clear()
+ Dim SQL As New SQL
+ For Each r In SQL.loadDgvBySql("SELECT fka_id FROM [tblFiskalkundenAnhaenge] WHERE fka_KdNr=" & fka_KdNr & " And fka_fkId = " & fka_fkId & " ORDER BY fka_id, fka_ArtId", "AVISO").Rows
+ ANH_LIST.Add(New VERAG_PROG_ALLGEMEIN.cFiskalkundenAnhaenge(r("fka_id")))
+ Next
+
+ End Sub
+
+ Public Function SAVE(Optional errHinweis = "") As Boolean
+ Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+ Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM [tblFiskalkundenAnhaenge] WITH(updlock,serializable) WHERE fka_id=@fka_id) " &
+ " BEGIN " & getUpdateCmd() & " END " &
+ " Else " &
+ " BEGIN " & getInsertCmd() & " END " &
+ " commit tran "
+
+ fka_id = SQL.doSQLVarListID(fka_id, sqlstr, "AVISO", , list,, errHinweis)
+ Return fka_id > 0
+ End Function
+
+ Public Sub LOAD()
+ Try
+ Using conn As SqlConnection = SQL.GetNewOpenConnectionAVISO()
+ Using cmd As New SqlCommand("SELECT * FROM [tblFiskalkundenAnhaenge] WHERE fka_id=@fka_id ", conn)
+ cmd.Parameters.AddWithValue("@fka_id", fka_KdNr)
+ Dim dr = cmd.ExecuteReader()
+ If dr.Read Then
+ For Each li In getParameterList()
+ Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
+
+ If dr.Item(li.Text) Is DBNull.Value Then
+ propInfo.SetValue(Me, Nothing)
+ Else
+ propInfo.SetValue(Me, dr.Item(li.Text))
+ End If
+ hasEntry = True
+ Next
+
+ End If
+ dr.Close()
+ End Using
+ End Using
+ Catch ex As Exception
+ MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+ End Try
+ End Sub
+
+ Public Function getUpdateCmd() As String
+ Try
+ Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+ Dim str As String = ""
+ For Each i In list
+ If Not i.isPrimaryParam Then
+ str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+ End If
+ Next
+ str = str.Substring(0, str.Length - 1) 'wg. ','
+ Return (" UPDATE [tblFiskalkundenAnhaenge] SET " & str & " WHERE fka_id=@fka_id ")
+
+ Catch ex As Exception
+ MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+ End Try
+ Return ""
+ End Function
+
+
+ Public Function getInsertCmd() As String
+ Try
+ Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+ Dim str As String = ""
+ Dim values As String = ""
+ For Each i In list
+ If Not i.isPrimaryParam Then
+ str &= "[" & i.Text & "],"
+ values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+ End If
+ Next
+ str = str.Substring(0, str.Length - 1) 'wg. ','
+ values = values.Substring(0, values.Length - 1) 'wg. ','
+ Return (" INSERT INTO [tblFiskalkundenAnhaenge] (" & str & ") VALUES(" & values & ") ")
+ Catch ex As Exception
+ MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+ End Try
+ Return ""
+ End Function
+
+ Public Function DELETE() As Boolean 'obj As Object, tablename As String, where As String) As Boolean
+ Dim sqlstr = " DELETE FROM [tblFiskalkundenAnhaenge] WITH(updlock,serializable) WHERE fka_id=" & Me.fka_id
+ Return SQL.doSQL(sqlstr, "AVISO")
+ End Function
+
+End Class
diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
index 9070dd92..1bbc05d3 100644
--- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
+++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
@@ -340,6 +340,7 @@
+