UID und EORI markierbar

2024-01-08 16:37:40 +01:00
parent ee5055cd85
commit 2a895d0946
3 changed files with 40 additions and 34 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("3.9.4.5")>
-<Assembly: AssemblyFileVersion("3.9.4.5")>
+<Assembly: AssemblyVersion("3.9.5.8")>
+<Assembly: AssemblyFileVersion("3.9.5.8")>
--- a/Aviso/frmSendungsdetailsNEU.Designer.vb
+++ b/Aviso/frmSendungsdetailsNEU.Designer.vb
@@ -47,13 +47,13 @@ Partial Class frmSendungsdetailsNEU
        Me.Button17 = New System.Windows.Forms.Button()
        Me.btnQuckScan = New System.Windows.Forms.Button()
        Me.Panel21 = New System.Windows.Forms.Panel()
+        Me.txteori_Pruef = New System.Windows.Forms.TextBox()
+        Me.txtUIDPruef = New System.Windows.Forms.TextBox()
        Me.Label53 = New System.Windows.Forms.Label()
        Me.btnEORIPruef = New System.Windows.Forms.Button()
        Me.btnUIDPruef = New System.Windows.Forms.Button()
        Me.Label45 = New System.Windows.Forms.Label()
        Me.Label49 = New System.Windows.Forms.Label()
-        Me.lblUID_Pruef = New System.Windows.Forms.Label()
-        Me.lbleori_Pruef = New System.Windows.Forms.Label()
        Me.btnPDFZusammenfueren = New System.Windows.Forms.Button()
        Me.btnMailVorlage = New System.Windows.Forms.Button()
        Me.btnOptionen = New System.Windows.Forms.Button()
@@ -672,19 +672,42 @@ Partial Class frmSendungsdetailsNEU
        'Panel21
        '
        Me.Panel21.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.Panel21.Controls.Add(Me.txteori_Pruef)
+        Me.Panel21.Controls.Add(Me.txtUIDPruef)
        Me.Panel21.Controls.Add(Me.Label53)
        Me.Panel21.Controls.Add(Me.btnEORIPruef)
        Me.Panel21.Controls.Add(Me.btnUIDPruef)
        Me.Panel21.Controls.Add(Me.Label45)
        Me.Panel21.Controls.Add(Me.Label49)
-        Me.Panel21.Controls.Add(Me.lblUID_Pruef)
-        Me.Panel21.Controls.Add(Me.lbleori_Pruef)
        Me.Panel21.Dock = System.Windows.Forms.DockStyle.Right
        Me.Panel21.Location = New System.Drawing.Point(938, 0)
        Me.Panel21.Name = "Panel21"
        Me.Panel21.Size = New System.Drawing.Size(268, 45)
        Me.Panel21.TabIndex = 7
        '
+        'txteori_Pruef
+        '
+        Me.txteori_Pruef.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.txteori_Pruef.BorderStyle = System.Windows.Forms.BorderStyle.None
+        Me.txteori_Pruef.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txteori_Pruef.Location = New System.Drawing.Point(37, 26)
+        Me.txteori_Pruef.Name = "txteori_Pruef"
+        Me.txteori_Pruef.ReadOnly = True
+        Me.txteori_Pruef.Size = New System.Drawing.Size(136, 13)
+        Me.txteori_Pruef.TabIndex = 66
+        '
+        'txtUIDPruef
+        '
+        Me.txtUIDPruef.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.txtUIDPruef.BorderStyle = System.Windows.Forms.BorderStyle.None
+        Me.txtUIDPruef.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtUIDPruef.ForeColor = System.Drawing.SystemColors.WindowFrame
+        Me.txtUIDPruef.Location = New System.Drawing.Point(37, 7)
+        Me.txtUIDPruef.Name = "txtUIDPruef"
+        Me.txtUIDPruef.ReadOnly = True
+        Me.txtUIDPruef.Size = New System.Drawing.Size(144, 13)
+        Me.txtUIDPruef.TabIndex = 65
+        '
        'Label53
        '
        Me.Label53.AutoSize = True
@@ -744,24 +767,6 @@ Partial Class frmSendungsdetailsNEU
        Me.Label49.Text = "EORI:"
        Me.Label49.TextAlign = System.Drawing.ContentAlignment.TopRight
        '
-        'lblUID_Pruef
-        '
-        Me.lblUID_Pruef.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblUID_Pruef.Location = New System.Drawing.Point(44, 7)
-        Me.lblUID_Pruef.Name = "lblUID_Pruef"
-        Me.lblUID_Pruef.Size = New System.Drawing.Size(205, 13)
-        Me.lblUID_Pruef.TabIndex = 3
-        Me.lblUID_Pruef.Text = "-"
-        '
-        'lbleori_Pruef
-        '
-        Me.lbleori_Pruef.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lbleori_Pruef.Location = New System.Drawing.Point(44, 26)
-        Me.lbleori_Pruef.Name = "lbleori_Pruef"
-        Me.lbleori_Pruef.Size = New System.Drawing.Size(205, 13)
-        Me.lbleori_Pruef.TabIndex = 6
-        Me.lbleori_Pruef.Text = "-"
-        '
        'btnPDFZusammenfueren
        '
        Me.btnPDFZusammenfueren.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -5247,7 +5252,7 @@ Partial Class frmSendungsdetailsNEU
        Me.ctxtWeitereFormulare.ImageScalingSize = New System.Drawing.Size(24, 24)
        Me.ctxtWeitereFormulare.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolGelangensbestätigung, Me.toolOriginalSendungsunterlagen, Me.LaufzettelDruckenToolStripMenuItem, Me.ZollstoppAMBARToolStripMenuItem, Me.ATANAKToolStripMenuItem, Me.AMBARZollbeschauToolStripMenuItem, Me.AMBARZollbeschauNEUToolStripMenuItem, Me.AntragQualitätskontrolleToolStripMenuItem})
        Me.ctxtWeitereFormulare.Name = "cntxt"
-        Me.ctxtWeitereFormulare.Size = New System.Drawing.Size(263, 202)
+        Me.ctxtWeitereFormulare.Size = New System.Drawing.Size(263, 180)
        '
        'toolGelangensbestätigung
        '
@@ -5967,9 +5972,7 @@ Partial Class frmSendungsdetailsNEU
    Friend WithEvents picKdAtrNr_Empfänger As PictureBox
    Friend WithEvents picKdAtrNr_Auftraggeber As PictureBox
    Friend WithEvents picKdAtrNr_Avisierer As PictureBox
-    Friend WithEvents lbleori_Pruef As Label
    Friend WithEvents Label49 As Label
-    Friend WithEvents lblUID_Pruef As Label
    Friend WithEvents Label45 As Label
    Friend WithEvents btnEORIPruef As Button
    Friend WithEvents btnUIDPruef As Button
@@ -6066,4 +6069,6 @@ Partial Class frmSendungsdetailsNEU
    Friend WithEvents btnLKWUmmelden As Button
    Friend WithEvents ContextMenuStrip3 As ContextMenuStrip
    Friend WithEvents XXXToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents txteori_Pruef As TextBox
+    Friend WithEvents txtUIDPruef As TextBox
 End Class
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -714,16 +714,16 @@ Public Class frmSendungsdetailsNEU
    Sub fillUIDEORI(kdSB As VERAG_PROG_ALLGEMEIN.KdSearchBox)
        btnEORIPruef.Visible = False
        btnUIDPruef.Visible = False
-        lblUID_Pruef.Text = "-"
-        lbleori_Pruef.Text = "-"
+        txtUIDPruef.Text = "-"
+        txteori_Pruef.Text = "-"
        If kdSB IsNot Nothing Then
            If kdSB.KdData_KUNDE IsNot Nothing AndAlso kdSB.KdData_KUNDE.EORITIN IsNot Nothing Then
-                lbleori_Pruef.Text = kdSB.KdData_KUNDE.EORITIN ' & If(kdSB.KdData_KUNDE.EORITIN_NL, "")
+                txteori_Pruef.Text = kdSB.KdData_KUNDE.EORITIN ' & If(kdSB.KdData_KUNDE.EORITIN_NL, "")
                kdnrEORI = kdSB.KdData_KUNDE.KundenNr
                btnEORIPruef.Visible = True
            End If
            If kdSB.KdData_ADRESSEN IsNot Nothing AndAlso kdSB.KdData_ADRESSEN.UstIdKz IsNot Nothing AndAlso kdSB.KdData_ADRESSEN.UstIdNr IsNot Nothing Then
-                lblUID_Pruef.Text = kdSB.KdData_ADRESSEN.UstIdKz & kdSB.KdData_ADRESSEN.UstIdNr
+                txtUIDPruef.Text = kdSB.KdData_ADRESSEN.UstIdKz & kdSB.KdData_ADRESSEN.UstIdNr
                btnUIDPruef.Visible = True
            End If
        End If
@@ -4507,10 +4507,10 @@ Public Class frmSendungsdetailsNEU
    Private Sub Button25_Click(sender As Object, e As EventArgs) Handles btnUIDPruef.Click
        Me.Cursor = Cursors.WaitCursor
        Try
-            If lblUID_Pruef.Text.Replace("-", "").Trim = "" Then Me.Cursor = Cursors.Default : Exit Sub
+            If txtUIDPruef.Text.Replace("-", "").Trim = "" Then Me.Cursor = Cursors.Default : Exit Sub

            Dim UID_ERG As Integer = -1
-            Dim path = SDL.cFinanzOnlineWebService.genUID_Formular(lblUID_Pruef.Text, AvisoId, SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, UID_ERG)
+            Dim path = SDL.cFinanzOnlineWebService.genUID_Formular(txtUIDPruef.Text, AvisoId, SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, UID_ERG)

            btnUIDPruef.BackgroundImage = My.Resources.fragezeichen
            Select Case UID_ERG
@@ -4539,7 +4539,7 @@ Public Class frmSendungsdetailsNEU
        Me.Cursor = Cursors.WaitCursor
        Try

-            Dim EORI_NR = lbleori_Pruef.Text.Replace("-", "").Replace(" ", "").Trim
+            Dim EORI_NR = txteori_Pruef.Text.Replace("-", "").Replace(" ", "").Trim

            If EORI_NR = "" Then Me.Cursor = Cursors.Default : Exit Sub

@@ -6606,4 +6606,5 @@ Public Class frmSendungsdetailsNEU
            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
        End Try
    End Sub
+
 End Class