TimasAPI, Uberstunden, Mailvorlagen, etc,

2024-04-24 11:09:58 +02:00
parent a7371e22ae
commit 41a236ad45
12 changed files with 323 additions and 91 deletions
--- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb
+++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb
@@ -1,4 +1,5 @@
 Imports java.awt.print
+Imports VERAG_PROG_ALLGEMEIN

 Public Class ustCntlUSTV_AntragPosition
    Public UStV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen = Nothing
@@ -26,6 +27,9 @@ Public Class ustCntlUSTV_AntragPosition
    End Sub

    Sub setValues(kdnr As Integer, UStV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen, Antrag_LandKz As String, UStV_Leitender As VERAG_PROG_ALLGEMEIN.cUStVLeistender)
+
+
+
        gridAktiv = False
        picSave.Visible = False
        Me.Antrag_LandKz = Antrag_LandKz
@@ -91,11 +95,11 @@ Public Class ustCntlUSTV_AntragPosition

    Function save()
        getValues(UStV_POS)
-        MsgBox("TEST")
-        Return UStV_POS.save
+        'MsgBox("TEST")
+        Return UStV_POS.SAVE
    End Function

-    Private Sub txtBestellung_TextChanged(sender As Object, e As EventArgs) Handles txtRgDatum.PropertyChanged, txtRgNr.TextChanged, cboLeistungsgeber.SelectedIndexChanged,
+    Private Sub txtBestellung_TextChanged(sender As Object, e As EventArgs) Handles txtRgDatum.PropertyChanged, txtRgNr.TextChanged,
            txtLeistungsbezeichnung.TextChanged, txtUSTBetrag.TextChanged, txtUSTBetrag.TextChanged, txtUSTBetragEUR.TextChanged ', cbxAPI.CheckedChanged, cboSchnittstellennr.SelectedIndexChanged

        If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", Me.FindForm) Then Exit Sub
@@ -105,8 +109,8 @@ Public Class ustCntlUSTV_AntragPosition
            '    If Not PROG.checkSDLNrPartnerKdNr(kdNr, SDLNr) Then MsgBox("Bitte geben Sie die Partner-Kundennummer im Kundenblatt oder im FM-ZOLL ein!")
            'End If

-            If sender Is cboLeistungsgeber Then
-                UStV_POS.UStVPo_Leistender = cboLeistungsgeber.Text
+            If sender Is cboLeistungsgeber AndAlso cboLeistungsgeber.SelectedItem <> "" Then
+                UStV_POS.UStVPo_Leistender = cboLeistungsgeber.SelectedItem

            End If
            values_changed()
@@ -122,6 +126,7 @@ Public Class ustCntlUSTV_AntragPosition

    Private Sub loadChangedDSToPanel(enablePanel As Boolean, UStV_Leitender As VERAG_PROG_ALLGEMEIN.cUStVLeistender)
        pnlAdresse.Enabled = True 'enablePanel 'immer änderbar!
+        'cboLeistungsgeber._value = If(UStV_Leitender.UStV_Leistender, "")
        txtStrasse.Text = If(UStV_Leitender.UstV_Leistender_Strasse, "")
        txtStrassenNr.Text = If(UStV_Leitender.UstV_Leistender_StrasseNr, "")
        txtPLZ.Text = If(UStV_Leitender.UstV_Leistender_PLZ, "")
@@ -134,6 +139,9 @@ Public Class ustCntlUSTV_AntragPosition
            If TypeOf (c) Is TextBox Then
                AddHandler CType(c, TextBox).TextChanged, AddressOf SomethingChanged
            End If
+            If TypeOf (c) Is MyComboBox Then
+                AddHandler CType(c, MyComboBox).TextChanged, AddressOf SomethingChanged
+            End If
        Next
    End Sub

@@ -164,4 +172,15 @@ Public Class ustCntlUSTV_AntragPosition
        End If

    End Sub
+
+    Private Sub cboLeistungsgeber_Enter(sender As Object, e As EventArgs) Handles cboLeistungsgeber.Enter
+
+    End Sub
+
+    Private Sub cboLeistungsgeber_DropDown(sender As Object, e As EventArgs) Handles cboLeistungsgeber.DropDown
+        cboLeistungsgeber.Items.Clear()
+        cboLeistungsgeber.fillWithSQL("select top 100 UStV_Leistender from tblUStVLeistender Where 1= 1 " & IIf(cboLeistungsgeber.Text <> "", "AND UStV_Leistender like '" & cboLeistungsgeber.Text & "%'", ""), False, "FMZOLL", True)
+        cboLeistungsgeber.changeItem(If(cboLeistungsgeber.Text, ""))
+
+    End Sub
 End Class
--- a/SDL/frmMain.Designer.vb
+++ b/SDL/frmMain.Designer.vb
@@ -316,13 +316,13 @@ Partial Class frmMain
        '
        Me.FakturierungToolStripMenuItem.Enabled = False
        Me.FakturierungToolStripMenuItem.Name = "FakturierungToolStripMenuItem"
-        Me.FakturierungToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.FakturierungToolStripMenuItem.Size = New System.Drawing.Size(163, 22)
        Me.FakturierungToolStripMenuItem.Text = "Fakturierung"
        '
        'RechnungsdatenToolStripMenuItem
        '
        Me.RechnungsdatenToolStripMenuItem.Name = "RechnungsdatenToolStripMenuItem"
-        Me.RechnungsdatenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.RechnungsdatenToolStripMenuItem.Size = New System.Drawing.Size(163, 22)
        Me.RechnungsdatenToolStripMenuItem.Text = "Rechnungsdaten"
        '
        'mnueBuchhaltung
@@ -896,7 +896,7 @@ Partial Class frmMain
        Me.KdSearchBox1._display_Name1 = False
        Me.KdSearchBox1._displayAVISO_Email = False
        Me.KdSearchBox1._displayFullName = False
-        Me.KdSearchBox1._displayWoelflKd = False
+        Me.KdSearchBox1._displayWoelflKd = True
        Me.KdSearchBox1._hideIfListEmpty = True
        Me.KdSearchBox1._loadKdData = False
        Me.KdSearchBox1._searchName1 = True
--- a/SDL/frmdynMailvorlage.Designer.vb
+++ b/SDL/frmdynMailvorlage.Designer.vb
@@ -54,6 +54,11 @@ Partial Class frmdynMailvorlage
        Me.Label3 = New System.Windows.Forms.Label()
        Me.cbxFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.dgvMailvorlagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.cbSendungsvermerk = New System.Windows.Forms.CheckBox()
+        Me.txtSendungsvermerk = New System.Windows.Forms.TextBox()
+        Me.Label9 = New System.Windows.Forms.Label()
+        Me.cbxSendungsvermerk = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label10 = New System.Windows.Forms.Label()
        Me.mainPanel.SuspendLayout()
        Me.pnlTop.SuspendLayout()
        CType(Me.dgvMailvorlagen, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -64,6 +69,11 @@ Partial Class frmdynMailvorlage
        Me.mainPanel.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
            Or System.Windows.Forms.AnchorStyles.Left) _
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.mainPanel.Controls.Add(Me.cbxSendungsvermerk)
+        Me.mainPanel.Controls.Add(Me.Label10)
+        Me.mainPanel.Controls.Add(Me.txtSendungsvermerk)
+        Me.mainPanel.Controls.Add(Me.Label9)
+        Me.mainPanel.Controls.Add(Me.cbSendungsvermerk)
        Me.mainPanel.Controls.Add(Me.TextBox2)
        Me.mainPanel.Controls.Add(Me.btn)
        Me.mainPanel.Controls.Add(Me.lblWordcount)
@@ -84,7 +94,7 @@ Partial Class frmdynMailvorlage
        Me.mainPanel.Controls.Add(Me.Label1)
        Me.mainPanel.Location = New System.Drawing.Point(0, 425)
        Me.mainPanel.Name = "mainPanel"
-        Me.mainPanel.Size = New System.Drawing.Size(1283, 449)
+        Me.mainPanel.Size = New System.Drawing.Size(1283, 457)
        Me.mainPanel.TabIndex = 101
        '
        'TextBox2
@@ -416,6 +426,57 @@ Partial Class frmdynMailvorlage
        Me.dgvMailvorlagen.Size = New System.Drawing.Size(1283, 365)
        Me.dgvMailvorlagen.TabIndex = 104
        '
+        'cbSendungsvermerk
+        '
+        Me.cbSendungsvermerk.AutoSize = True
+        Me.cbSendungsvermerk.Location = New System.Drawing.Point(678, 394)
+        Me.cbSendungsvermerk.Name = "cbSendungsvermerk"
+        Me.cbSendungsvermerk.Size = New System.Drawing.Size(211, 17)
+        Me.cbSendungsvermerk.TabIndex = 35
+        Me.cbSendungsvermerk.Text = "Sendungsvermerk beim Senden setzen"
+        Me.cbSendungsvermerk.UseVisualStyleBackColor = True
+        '
+        'txtSendungsvermerk
+        '
+        Me.txtSendungsvermerk.Location = New System.Drawing.Point(791, 436)
+        Me.txtSendungsvermerk.Name = "txtSendungsvermerk"
+        Me.txtSendungsvermerk.Size = New System.Drawing.Size(290, 20)
+        Me.txtSendungsvermerk.TabIndex = 37
+        Me.txtSendungsvermerk.Visible = False
+        '
+        'Label9
+        '
+        Me.Label9.AutoSize = True
+        Me.Label9.Location = New System.Drawing.Point(788, 419)
+        Me.Label9.Name = "Label9"
+        Me.Label9.Size = New System.Drawing.Size(93, 13)
+        Me.Label9.TabIndex = 36
+        Me.Label9.Text = "Sendungsvermerk"
+        Me.Label9.Visible = False
+        '
+        'cbxSendungsvermerk
+        '
+        Me.cbxSendungsvermerk._allowedValuesFreiText = Nothing
+        Me.cbxSendungsvermerk._allowFreiText = False
+        Me.cbxSendungsvermerk._value = ""
+        Me.cbxSendungsvermerk.DropDownWidth = 250
+        Me.cbxSendungsvermerk.FormattingEnabled = True
+        Me.cbxSendungsvermerk.Location = New System.Drawing.Point(678, 435)
+        Me.cbxSendungsvermerk.Name = "cbxSendungsvermerk"
+        Me.cbxSendungsvermerk.Size = New System.Drawing.Size(100, 21)
+        Me.cbxSendungsvermerk.TabIndex = 39
+        Me.cbxSendungsvermerk.Visible = False
+        '
+        'Label10
+        '
+        Me.Label10.AutoSize = True
+        Me.Label10.Location = New System.Drawing.Point(675, 419)
+        Me.Label10.Name = "Label10"
+        Me.Label10.Size = New System.Drawing.Size(107, 13)
+        Me.Label10.TabIndex = 38
+        Me.Label10.Text = "Sendungsvermerk-ID"
+        Me.Label10.Visible = False
+        '
        'frmdynMailvorlage
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -468,4 +529,9 @@ Partial Class frmdynMailvorlage
    Friend WithEvents cbxSpracheSelected As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents Label8 As Label
    Friend WithEvents TextBox2 As TextBox
+    Friend WithEvents cbxSendungsvermerk As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label10 As Label
+    Friend WithEvents txtSendungsvermerk As TextBox
+    Friend WithEvents Label9 As Label
+    Friend WithEvents cbSendungsvermerk As CheckBox
 End Class
--- a/SDL/frmdynMailvorlage.vb
+++ b/SDL/frmdynMailvorlage.vb
@@ -37,6 +37,8 @@ Public Class frmdynMailvorlage

        cbxFirma.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)

+        cbxSendungsvermerk.fillWithSQL("SELECT VermerkCodeId,Bezeichnung  FROM [VermerkeCodes]", True, "AVISO", True)
+
        cbxFirma.Enabled = editall
        btnDelete.Enabled = editall

@@ -94,6 +96,9 @@ Public Class frmdynMailvorlage
            .Columns("txt_letzteAenderung").Width = 100
            .Columns("txt_letzteAenderungUser").HeaderText = "letzte Änderung durch"
            .Columns("txt_letzteAenderungUser").Width = 75
+            .Columns("txt_sendungsvermerk").HeaderText = "Sendungsvermerk"
+            .Columns("txt_sendungsvermerkId").Visible = False
+            .Columns("txt_sendungsvermerkText").Visible = False
        End With


@@ -204,6 +209,10 @@ Public Class frmdynMailvorlage
            cboFirmensignatur.changeItem(txtkonserve.txt_firmaSig)
            cbxFirmaChange.changeItem(txtkonserve.txt_FIRMA)

+            cbSendungsvermerk.Checked = txtkonserve.txt_sendungsvermerk
+            cbxSendungsvermerk.changeItem(txtkonserve.txt_sendungsvermerkId)
+            txtSendungsvermerk.Text = txtkonserve.txt_sendungsvermerkText
+

        Catch ex As Exception
            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
@@ -230,6 +239,11 @@ Public Class frmdynMailvorlage
            txtKS.txt_letzteAenderung = DateTime.Now
            txtKS.txt_letzteAenderungUser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME

+            txtKS.txt_sendungsvermerk = cbSendungsvermerk.Checked
+            txtKS.txt_sendungsvermerkId = cbxSendungsvermerk._value
+            txtKS.txt_sendungsvermerkText = txtSendungsvermerk.Text
+
+
            txtKS.SAVE()

            dgvMailvorlagen.GetOrder()
@@ -358,6 +372,12 @@ Public Class frmdynMailvorlage

    End Function

+    Private Sub cbSendungsvermerk_CheckedChanged(sender As Object, e As EventArgs) Handles cbSendungsvermerk.CheckedChanged

+        txtSendungsvermerk.Visible = cbSendungsvermerk.Checked
+        cbxSendungsvermerk.Visible = cbSendungsvermerk.Checked
+        Label10.Visible = cbSendungsvermerk.Checked
+        Label9.Visible = cbSendungsvermerk.Checked

+    End Sub
 End Class