USTV Antragsart

2024-05-14 22:05:21 +02:00
parent 6d7ec064cc
commit 57d030605a
7 changed files with 44 additions and 26 deletions
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("1.2.8.9")>
-<Assembly: AssemblyFileVersion("1.2.8.9")>
+<Assembly: AssemblyVersion("1.2.9.0")>
+<Assembly: AssemblyFileVersion("1.2.9.0")>
--- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb
@@ -64,16 +64,16 @@ Partial Class frmMDM_USTVAntrag
        Me.Label5 = New System.Windows.Forms.Label()
        Me.cboStatus = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.lblFirma = New System.Windows.Forms.Label()
-        Me.Label1 = New System.Windows.Forms.Label()
        Me.pnlFilter = New System.Windows.Forms.Panel()
        Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.pnl = New System.Windows.Forms.Panel()
        Me.Panel2 = New System.Windows.Forms.Panel()
+        Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
        Me.Panel4 = New System.Windows.Forms.Panel()
        Me.Button3 = New System.Windows.Forms.Button()
        Me.Button2 = New System.Windows.Forms.Button()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
+        Me.cboAntragArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Panel3.SuspendLayout()
        Me.Panel1.SuspendLayout()
        Me.Panel9.SuspendLayout()
@@ -168,6 +168,7 @@ Partial Class frmMDM_USTVAntrag
        'Panel1
        '
        Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Panel1.Controls.Add(Me.cboAntragArt)
        Me.Panel1.Controls.Add(Me.lblKdNr)
        Me.Panel1.Controls.Add(Me.Panel9)
        Me.Panel1.Controls.Add(Me.Panel8)
@@ -180,7 +181,6 @@ Partial Class frmMDM_USTVAntrag
        Me.Panel1.Controls.Add(Me.Label7)
        Me.Panel1.Controls.Add(Me.Panel5)
        Me.Panel1.Controls.Add(Me.lblFirma)
-        Me.Panel1.Controls.Add(Me.Label1)
        Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
        Me.Panel1.Location = New System.Drawing.Point(0, 0)
        Me.Panel1.Name = "Panel1"
@@ -636,18 +636,6 @@ Partial Class frmMDM_USTVAntrag
        Me.lblFirma.TabIndex = 3
        Me.lblFirma.Text = "VERAG Spedition AG"
        '
-        'Label1
-        '
-        Me.Label1.AutoSize = True
-        Me.Label1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Underline), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label1.ForeColor = System.Drawing.Color.White
-        Me.Label1.Location = New System.Drawing.Point(78, 14)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(116, 20)
-        Me.Label1.TabIndex = 0
-        Me.Label1.Text = "USTV-Antrag"
-        '
        'pnlFilter
        '
        Me.pnlFilter.BackColor = System.Drawing.Color.White
@@ -700,6 +688,14 @@ Partial Class frmMDM_USTVAntrag
        Me.Panel2.Size = New System.Drawing.Size(1300, 269)
        Me.Panel2.TabIndex = 1
        '
+        'UstCntlUSTV_AntragPosition1
+        '
+        Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(0, 0)
+        Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1"
+        Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1298, 267)
+        Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
+        '
        'Panel4
        '
        Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke
@@ -747,13 +743,19 @@ Partial Class frmMDM_USTVAntrag
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
        Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
        '
-        'UstCntlUSTV_AntragPosition1
+        'cboAntragArt
        '
-        Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(0, 0)
-        Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1"
-        Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1298, 267)
-        Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
+        Me.cboAntragArt._allowedValuesFreiText = Nothing
+        Me.cboAntragArt._allowFreiText = False
+        Me.cboAntragArt._value = ""
+        Me.cboAntragArt.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.cboAntragArt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
+        Me.cboAntragArt.FormattingEnabled = True
+        Me.cboAntragArt.Location = New System.Drawing.Point(83, 10)
+        Me.cboAntragArt.Name = "cboAntragArt"
+        Me.cboAntragArt.Size = New System.Drawing.Size(191, 28)
+        Me.cboAntragArt.TabIndex = 21
+        Me.cboAntragArt.Text = "USTV-Antrag"
        '
        'frmMDM_USTVAntrag
        '
@@ -795,7 +797,6 @@ Partial Class frmMDM_USTVAntrag
    Friend WithEvents Button14 As Button
    Friend WithEvents Panel1 As Panel
    Friend WithEvents lblFirma As Label
-    Friend WithEvents Label1 As Label
    Friend WithEvents pnlFilter As Panel
    Friend WithEvents dgvUSTVPositionen As VERAG_PROG_ALLGEMEIN.MyDatagridview
    Friend WithEvents lblPLOSE_EintrageVerarbetiet As Label
@@ -840,4 +841,5 @@ Partial Class frmMDM_USTVAntrag
    Friend WithEvents Panel9 As Panel
    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
    Friend WithEvents btnMail As Button
+    Friend WithEvents cboAntragArt As VERAG_PROG_ALLGEMEIN.MyComboBox
 End Class
--- a/SDL/USTV/frmMDM_USTVAntrag.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.vb
@@ -137,6 +137,8 @@ Public Class frmMDM_USTVAntrag
        txtBis._value = CDate(USTV_ANTRAG.UStVAn_ReDatBis)
        'lblZeitraum.Text = CDate(USTV_ANTRAG.UStVAn_ReDatVon).ToString("dd.MM.yyyy") & " - " & CDate(USTV_ANTRAG.UStVAn_ReDatBis).ToString("dd.MM.yyyy")
        cboStatus.changeItem(If(USTV_ANTRAG.UStVAn_Status, ""))
+        If If(USTV_ANTRAG.UStVAn_AntragArt, "") = "" Then cboAntragArt.changeItem("MWST")
+        cboAntragArt.changeItem(If(USTV_ANTRAG.UStVAn_AntragArt, ""))
        rtbStatusText.Text = If(USTV_ANTRAG.UStVAn_StatusText, "")

    End Sub
@@ -152,6 +154,7 @@ Public Class frmMDM_USTVAntrag
            'lblZeitraum.Text = CDate(USTV_ANTRAG.UStVAn_ReDatVon).ToString("dd.MM.yyyy") & " - " & CDate(USTV_ANTRAG.UStVAn_ReDatBis).ToString("dd.MM.yyyy")

            USTV_ANTRAG.UStVAn_Status = cboStatus._value
+            USTV_ANTRAG.UStVAn_AntragArt = cboAntragArt._value
            USTV_ANTRAG.UStVAn_StatusText = rtbStatusText.Text
        End If
    End Sub
@@ -188,6 +191,10 @@ Public Class frmMDM_USTVAntrag
        cboStatus.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Storno", cUSTVStatus.STAT_STORNO))
        cboStatus.changeItem(cUSTVStatus.STAT_INBEARBEITUNG)

+        cboAntragArt.Items.Clear()
+        cboAntragArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("USTV-Antrag", "MWST"))
+        cboAntragArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MÖST-Antrag", "MOEST"))
+        cboAntragArt.changeItem("MWST")



--- a/SDL/USTV/usrCntlUSTV.vb
+++ b/SDL/USTV/usrCntlUSTV.vb
@@ -37,7 +37,7 @@ Public Class usrCntlUSTV
                End If
            End If

-            .SET_SQL("SELECT " & topMax & " [UStVAn_ID],[UStVAn_KuNr],[UStVAn_Name],LandKz,[UStVAn_ReDatVon],[UStVAn_ReDatBis] ,UStVAn_AntragEingereichtAm,[UStVAn_3470] ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],[UStVAn_Sachbearbeiter]
+            .SET_SQL("SELECT " & topMax & " [UStVAn_ID],UStVAn_AntragArt,[UStVAn_KuNr],[UStVAn_Name],LandKz,[UStVAn_ReDatVon],[UStVAn_ReDatBis] ,UStVAn_AntragEingereichtAm,[UStVAn_3470] ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],[UStVAn_Sachbearbeiter]
                  FROM [tblUStVAntrag] inner join [Länderverzeichnis für die Außenhandelsstatistik] on UStVAn_LandNr=Landnr
                  where 1=1 " & getWhere() & "
                  order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LandKz,[UStVAn_ReDatVon] desc", "FMZOLL")
@@ -50,6 +50,9 @@ Public Class usrCntlUSTV
            If .Columns.Count > 0 Then

                .Columns("UStVAn_ID").Visible = False
+                .Columns("UStVAn_AntragArt").HeaderText = "Art"
+                .Columns("UStVAn_AntragArt").MinimumWidth = 50
+
                .Columns("UStVAn_KuNr").HeaderText = "KundenNr"
                .Columns("UStVAn_Name").MinimumWidth = 70

@@ -173,6 +176,7 @@ Public Class usrCntlUSTV

            Dim f As New frmMDM_USTVAntrag(dgvUSTV.SelectedRows(0).Cells("UStVAn_ID").Value)
            f.ShowDialog(Me)
+            dgvUSTV.RELOAD()
        End If
    End Sub

--- a/SDL/frmMain.resx
+++ b/SDL/frmMain.resx
@@ -162,7 +162,7 @@
    <value>174, 17</value>
  </metadata>
  <metadata name="Timer_REFRESH.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1557, 17</value>
+    <value>525, 14</value>
  </metadata>
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
--- a/SDL/frmMain.vb
+++ b/SDL/frmMain.vb
@@ -881,10 +881,12 @@ Public Class frmMain
        End If
        Try
            If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_ChatBenutzer And picAVISOMessenger.Visible Then
+                VERAG_PROG_ALLGEMEIN.cMessenger.NEW_MESSGE = False 'NEUE NACHTICHTEN
                Dim newMsg = VERAG_PROG_ALLGEMEIN.cMessenger.GET_NewMSG_COUNT()
                ' MsgBox(newMsg)
                Label20.Text = newMsg
                Label20.Visible = (newMsg > 0)
+                VERAG_PROG_ALLGEMEIN.cMessenger.NEW_MESSGE = True 'NEUE NACHTICHTEN
                If newMsg Then
                    ' Me.Icon = My.Resources.avisoNewMsg

@@ -914,6 +916,7 @@ Public Class frmMain
        Catch ex As Exception

        End Try
+
    End Sub

    Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles picAVISOMessenger.Click
--- a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb
@@ -56,6 +56,7 @@ Public Class cUSTVAntrag
    Property UStVAn_Zeitstempel As Object = Nothing '            DATETIME       Default (getdate()) NULL,
    Property UStVAn_Status As Object = Nothing
    Property UStVAn_StatusText As Object = Nothing
+    Property UStVAn_AntragArt As Object = Nothing

    Property POSITIONEN As New List(Of cUStVPositionen) '= Nothing

@@ -122,6 +123,7 @@ Public Class cUSTVAntrag
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_Zeitstempel", UStVAn_Zeitstempel)) '            DATETIME       Default (getdate()) NULL,
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_Status", UStVAn_Status)) '            DATETIME       Default (getdate()) NULL,
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_StatusText", UStVAn_StatusText)) '            DATETIME       Default (getdate()) NULL,
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_AntragArt", UStVAn_AntragArt)) '            DATETIME       Default (getdate()) NULL,


        Return list