Ustv

2024-04-19 14:32:51 +02:00
parent 3bb9137fb0
commit 4872285083
6 changed files with 348 additions and 258 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.6")>
-<Assembly: AssemblyFileVersion("1.2.8.6")>
+<Assembly: AssemblyVersion("1.2.8.7")>
+<Assembly: AssemblyFileVersion("1.2.8.7")>
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -112,9 +112,6 @@
    <Reference Include="com.esendex.sdk, Version=3.8.0.0, Culture=neutral, PublicKeyToken=9dceac28a20578e2, processorArchitecture=MSIL">
      <HintPath>..\..\..\AVISO\Aviso\packages\esendex-dotnet-sdk.3.8.0\lib\net35\com.esendex.sdk.dll</HintPath>
    </Reference>
-    <Reference Include="DAKOSY_Worker">
-      <HintPath>..\..\..\ADMIN\ADMIN\DAKOSY_Worker\bin\Debug\DAKOSY_Worker.dll</HintPath>
-    </Reference>
    <Reference Include="DiffieHellman, Version=0.0.0.0, Culture=neutral">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\dll\SharpSSH\DiffieHellman.dll</HintPath>
@@ -5039,6 +5036,10 @@
    <WCFMetadata Include="Service References\" />
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\..\..\ADMIN\ADMIN\DAKOSY_Worker\DAKOSY_Worker_lib.vbproj">
+      <Project>{50e8e49b-4fd9-4dd4-b159-bdc2b7d0e94f}</Project>
+      <Name>DAKOSY_Worker_lib</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\ADMIN\ADMIN\MDM_Worker\MDM_Worker_lib.vbproj">
      <Project>{2e4dbc09-e57b-4ac5-8554-6117d71f993b}</Project>
      <Name>MDM_Worker_lib</Name>
--- a/SDL/USTV/usrCntlUSTV.Designer.vb
+++ b/SDL/USTV/usrCntlUSTV.Designer.vb
@@ -28,6 +28,8 @@ Partial Class usrCntlUSTV
        Me.dgvUSTV = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Label1 = New System.Windows.Forms.Label()
        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.cbxTopMax = New System.Windows.Forms.CheckBox()
+        Me.txtMaxSrch = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.cboJahrBis = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label2 = New System.Windows.Forms.Label()
        Me.lblKunde = New System.Windows.Forms.Label()
@@ -43,6 +45,7 @@ Partial Class usrCntlUSTV
        Me.Button5 = New System.Windows.Forms.Button()
        Me.Button8 = New System.Windows.Forms.Button()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.cbxEingereicht = New System.Windows.Forms.CheckBox()
        CType(Me.dgvUSTV, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.Panel2.SuspendLayout()
@@ -90,6 +93,9 @@ Partial Class usrCntlUSTV
        'Panel1
        '
        Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.Panel1.Controls.Add(Me.cbxEingereicht)
+        Me.Panel1.Controls.Add(Me.cbxTopMax)
+        Me.Panel1.Controls.Add(Me.txtMaxSrch)
        Me.Panel1.Controls.Add(Me.cboJahrBis)
        Me.Panel1.Controls.Add(Me.Label2)
        Me.Panel1.Controls.Add(Me.lblKunde)
@@ -103,6 +109,44 @@ Partial Class usrCntlUSTV
        Me.Panel1.Size = New System.Drawing.Size(1072, 84)
        Me.Panel1.TabIndex = 0
        '
+        'cbxTopMax
+        '
+        Me.cbxTopMax.AutoSize = True
+        Me.cbxTopMax.Checked = True
+        Me.cbxTopMax.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxTopMax.Location = New System.Drawing.Point(668, 10)
+        Me.cbxTopMax.Name = "cbxTopMax"
+        Me.cbxTopMax.Size = New System.Drawing.Size(46, 17)
+        Me.cbxTopMax.TabIndex = 45
+        Me.cbxTopMax.Text = "Max"
+        Me.cbxTopMax.UseVisualStyleBackColor = True
+        '
+        'txtMaxSrch
+        '
+        Me.txtMaxSrch._DateTimeOnly = False
+        Me.txtMaxSrch._numbersOnly = True
+        Me.txtMaxSrch._numbersOnlyKommastellen = ""
+        Me.txtMaxSrch._numbersOnlyTrennzeichen = True
+        Me.txtMaxSrch._Prozent = False
+        Me.txtMaxSrch._ShortDateNew = False
+        Me.txtMaxSrch._ShortDateOnly = False
+        Me.txtMaxSrch._TimeOnly = False
+        Me.txtMaxSrch._TimeOnly_Seconds = False
+        Me.txtMaxSrch._value = ""
+        Me.txtMaxSrch._Waehrung = False
+        Me.txtMaxSrch._WaehrungZeichen = True
+        Me.txtMaxSrch.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtMaxSrch.ForeColor = System.Drawing.Color.Black
+        Me.txtMaxSrch.Location = New System.Drawing.Point(720, 9)
+        Me.txtMaxSrch.MaxLineLength = -1
+        Me.txtMaxSrch.MaxLines_Warning = ""
+        Me.txtMaxSrch.MaxLines_Warning_Label = Nothing
+        Me.txtMaxSrch.Name = "txtMaxSrch"
+        Me.txtMaxSrch.Size = New System.Drawing.Size(41, 20)
+        Me.txtMaxSrch.TabIndex = 44
+        Me.txtMaxSrch.Text = "200"
+        Me.txtMaxSrch.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        '
        'cboJahrBis
        '
        Me.cboJahrBis._allowedValuesFreiText = Nothing
@@ -303,6 +347,19 @@ Partial Class usrCntlUSTV
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
        Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
        '
+        'cbxEingereicht
+        '
+        Me.cbxEingereicht.AutoSize = True
+        Me.cbxEingereicht.Checked = True
+        Me.cbxEingereicht.CheckState = System.Windows.Forms.CheckState.Indeterminate
+        Me.cbxEingereicht.Location = New System.Drawing.Point(367, 35)
+        Me.cbxEingereicht.Name = "cbxEingereicht"
+        Me.cbxEingereicht.Size = New System.Drawing.Size(118, 17)
+        Me.cbxEingereicht.TabIndex = 46
+        Me.cbxEingereicht.Text = "Anträge eingereicht"
+        Me.cbxEingereicht.ThreeState = True
+        Me.cbxEingereicht.UseVisualStyleBackColor = True
+        '
        'usrCntlUSTV
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -340,4 +397,7 @@ Partial Class usrCntlUSTV
    Friend WithEvents btnPLOSEAlle As Button
    Friend WithEvents btnMail As Button
    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
+    Friend WithEvents cbxTopMax As CheckBox
+    Friend WithEvents txtMaxSrch As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents cbxEingereicht As CheckBox
 End Class
--- a/SDL/USTV/usrCntlUSTV.vb
+++ b/SDL/USTV/usrCntlUSTV.vb
@@ -28,8 +28,16 @@ Public Class usrCntlUSTV
        With dgvUSTV
            .ClearSelection()

+            Dim topMax = ""
+            If cbxTopMax.Checked Then
+                If IsNumeric(txtMaxSrch.Text) Then
+                    topMax = " TOP (" & txtMaxSrch.Text.Trim & ")"
+                Else
+                    topMax = " TOP (200)"
+                End If
+            End If

-            .SET_SQL("SELECT TOP (200) [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_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")
@@ -116,6 +124,14 @@ Public Class usrCntlUSTV
            End If
        End If

+        Select Case cbxEingereicht.CheckState
+            Case CheckState.Checked
+                whereStr &= " AND UStVAn_AntragEingereichtAm is not null "
+            Case CheckState.Unchecked
+                whereStr &= " AND UStVAn_AntragEingereichtAm is null "
+            Case CheckState.Indeterminate
+        End Select
+
        If KdSearchBox1.KdNr > 0 Then whereStr &= " AND UStVAn_KuNr=" & KdSearchBox1.KdNr & " "
        Return whereStr
    End Function
@@ -333,4 +349,15 @@ Public Class usrCntlUSTV

    End Sub

+    Private Sub cbxTopMax_CheckedChanged(sender As Object, e As EventArgs) Handles cbxTopMax.CheckedChanged
+        init()
+    End Sub
+
+    Private Sub txtMaxSrch_TextChanged(sender As Object, e As EventArgs) Handles txtMaxSrch.Leave
+        init()
+    End Sub
+
+    Private Sub cbxEingereicht_CheckedChanged(sender As Object, e As EventArgs) Handles cbxEingereicht.CheckStateChanged
+        init()
+    End Sub
 End Class