atr

2025-05-20 15:56:56 +02:00
parent c924780c27
commit a30b989e24
3 changed files with 48 additions and 31 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.4.0.3")>
-<Assembly: AssemblyFileVersion("1.4.0.3")>
+<Assembly: AssemblyVersion("1.4.0.4")>
+<Assembly: AssemblyFileVersion("1.4.0.4")>
--- a/SDL/OriginalArchiv_ATR/frmOriginalArchiv_ATR.Designer.vb
+++ b/SDL/OriginalArchiv_ATR/frmOriginalArchiv_ATR.Designer.vb
@@ -25,6 +25,7 @@ Partial Class frmOriginalArchiv_ATR
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmOriginalArchiv_ATR))
        Me.pnl = New System.Windows.Forms.Panel()
+        Me.cboDatum = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.txtSuche = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label9 = New System.Windows.Forms.Label()
        Me.txtSB = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -74,7 +75,7 @@ Partial Class frmOriginalArchiv_ATR
        Me.lblErgebnis = New System.Windows.Forms.Label()
        Me.Label37 = New System.Windows.Forms.Label()
        Me.txtMaxSrch = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.cboDatum = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label10 = New System.Windows.Forms.Label()
        Me.pnl.SuspendLayout()
        Me.pnlTop.SuspendLayout()
        CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -87,6 +88,7 @@ Partial Class frmOriginalArchiv_ATR
        '
        Me.pnl.BackColor = System.Drawing.Color.WhiteSmoke
        Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnl.Controls.Add(Me.Label10)
        Me.pnl.Controls.Add(Me.cboDatum)
        Me.pnl.Controls.Add(Me.txtSuche)
        Me.pnl.Controls.Add(Me.Label9)
@@ -129,6 +131,23 @@ Partial Class frmOriginalArchiv_ATR
        Me.pnl.Size = New System.Drawing.Size(1419, 171)
        Me.pnl.TabIndex = 0
        '
+        'cboDatum
+        '
+        Me.cboDatum._allowedValuesFreiText = Nothing
+        Me.cboDatum._allowFreiText = False
+        Me.cboDatum._value = ""
+        Me.cboDatum.BackColor = System.Drawing.Color.WhiteSmoke
+        Me.cboDatum.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboDatum.DropDownWidth = 250
+        Me.cboDatum.FlatStyle = System.Windows.Forms.FlatStyle.Popup
+        Me.cboDatum.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboDatum.FormattingEnabled = True
+        Me.cboDatum.Items.AddRange(New Object() {"Rechnungsdatum", "Abfertigungsdatum"})
+        Me.cboDatum.Location = New System.Drawing.Point(15, 52)
+        Me.cboDatum.Name = "cboDatum"
+        Me.cboDatum.Size = New System.Drawing.Size(141, 22)
+        Me.cboDatum.TabIndex = 78
+        '
        'txtSuche
        '
        Me.txtSuche._DateTimeOnly = False
@@ -876,22 +895,15 @@ Partial Class frmOriginalArchiv_ATR
        Me.txtMaxSrch.Text = "1000"
        Me.txtMaxSrch.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
        '
-        'cboDatum
+        'Label10
        '
-        Me.cboDatum._allowedValuesFreiText = Nothing
-        Me.cboDatum._allowFreiText = False
-        Me.cboDatum._value = ""
-        Me.cboDatum.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.cboDatum.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.cboDatum.DropDownWidth = 250
-        Me.cboDatum.FlatStyle = System.Windows.Forms.FlatStyle.Popup
-        Me.cboDatum.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboDatum.FormattingEnabled = True
-        Me.cboDatum.Items.AddRange(New Object() {"Rechnungsdatum", "Abfertigungsdatum"})
-        Me.cboDatum.Location = New System.Drawing.Point(15, 52)
-        Me.cboDatum.Name = "cboDatum"
-        Me.cboDatum.Size = New System.Drawing.Size(141, 22)
-        Me.cboDatum.TabIndex = 78
+        Me.Label10.AutoSize = True
+        Me.Label10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label10.Location = New System.Drawing.Point(440, 59)
+        Me.Label10.Name = "Label10"
+        Me.Label10.Size = New System.Drawing.Size(156, 13)
+        Me.Label10.TabIndex = 79
+        Me.Label10.Text = "Wortteilsuche mit * im jew. Feld."
        '
        'frmOriginalArchiv_ATR
        '
@@ -968,4 +980,5 @@ Partial Class frmOriginalArchiv_ATR
    Friend WithEvents btnSendungKoppeln As Button
    Friend WithEvents PictureBox6 As PictureBox
    Friend WithEvents cboDatum As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label10 As Label
 End Class
--- a/SDL/OriginalArchiv_ATR/frmOriginalArchiv_ATR.vb
+++ b/SDL/OriginalArchiv_ATR/frmOriginalArchiv_ATR.vb
@@ -1,4 +1,5 @@
-Imports javax.smartcardio
+Imports GrapeCity.DataVisualization.TypeScript
+Imports javax.smartcardio

 Public Class frmOriginalArchiv_ATR

@@ -24,7 +25,7 @@ Public Class frmOriginalArchiv_ATR
        cboDatum.Items.Clear()
        cboDatum.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ausstellungs-Datum", "ADat"))
        cboDatum.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Erhalten-Datum", "EDat"))
-        cboDatum.changeItem("ADat")
+        cboDatum.changeItem("EDat")


        btnMonat.Text = MONAT.ToString("MMMM")
@@ -70,7 +71,7 @@ Public Class frmOriginalArchiv_ATR
        'End Select


-        btnMonat.PerformClick()
+        btnVonMonat.PerformClick()
        btnSuche.PerformClick()


@@ -176,19 +177,21 @@ Public Class frmOriginalArchiv_ATR
            End If
        End If

-
-        If txtSuche._value <> "" Then
+        Dim srchstr = txtSuche._value
+        If srchstr <> "" Then
            sqlstr &= " AND ( "
-            sqlstr &= " atr_documentNr LIKE '" & txtSuche._value & "%' OR "
-            sqlstr &= " atr_absender LIKE '" & txtSuche._value & "%' OR "
-            sqlstr &= " atr_empfaenger LIKE '" & txtSuche._value & "%' OR "
-            sqlstr &= " atr_DHL_ReferenzNr LIKE '" & txtSuche._value & "%' OR "
-            sqlstr &= " atr_LKW LIKE '" & txtSuche._value & "%' OR "
-            sqlstr &= " atr_location LIKE '" & txtSuche._value & "%' OR "
-            sqlstr &= " atr_info LIKE '" & txtSuche._value & "%' OR "
-            sqlstr &= " atr_DHL_ReferenzNr LIKE '" & txtSuche._value & "%' "
+            sqlstr &= " atr_documentNr LIKE '" & srchstr & "%' OR "
+            sqlstr &= " atr_absender LIKE '" & srchstr & "%' OR "
+            sqlstr &= " atr_empfaenger LIKE '" & srchstr & "%' OR "
+            sqlstr &= " atr_DHL_ReferenzNr LIKE '" & srchstr & "%' OR "
+            sqlstr &= " atr_LKW LIKE '" & srchstr & "%' OR "
+            sqlstr &= " atr_location LIKE '" & srchstr & "%' OR "
+            sqlstr &= " atr_info LIKE '" & srchstr & "%' OR "
+            sqlstr &= " atr_DHL_ReferenzNr LIKE '" & srchstr & "%' "
            sqlstr &= " ) "
        End If
+        sqlstr = sqlstr.Replace("*%", "%")
+        sqlstr = sqlstr.Replace("%%", "%")

        If txtAbfertigungsnummer.Text <> "" Then
            '     If txtAbfertigungsnummerBis.Text <> "" Then
@@ -349,6 +352,7 @@ Public Class frmOriginalArchiv_ATR
    Private Sub btnVonMonat_Click(sender As Object, e As EventArgs) Handles btnVonMonat.Click
        MONAT = MONAT.AddMonths(-1)
        initBtns("Monat")
+        initBtns("Monat")
    End Sub

    Private Sub btnBisJahr_Click(sender As Object, e As EventArgs) Handles btnBisJahr.Click