merge

2025-01-09 09:41:00 +01:00
parent 0046d354a5 955ae80d62
commit cbfebc091e
10 changed files with 185 additions and 87 deletions
--- a/initATLASAufschubkonten/frmStartOptions.Designer.vb
+++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb
@@ -27,6 +27,8 @@ Partial Class frmStartOptions
        Me.pnl = New System.Windows.Forms.Panel()
        Me.LinkLabel69 = New System.Windows.Forms.LinkLabel()
        Me.Button26 = New System.Windows.Forms.Button()
+        Me.Button27 = New System.Windows.Forms.Button()
+        Me.Button26 = New System.Windows.Forms.Button()
        Me.txtMRNPrefix = New System.Windows.Forms.TextBox()
        Me.LinkLabel66 = New System.Windows.Forms.LinkLabel()
        Me.PictureBox24 = New System.Windows.Forms.PictureBox()
@@ -80,6 +82,7 @@ Partial Class frmStartOptions
        Me.CheckBox3 = New System.Windows.Forms.CheckBox()
        Me.tbcntr = New System.Windows.Forms.TabControl()
        Me.TabPage1 = New System.Windows.Forms.TabPage()
+        Me.LinkLabel68 = New System.Windows.Forms.LinkLabel()
        Me.PictureBox26 = New System.Windows.Forms.PictureBox()
        Me.cbxGestellungspeichern = New System.Windows.Forms.CheckBox()
        Me.MyTextBox4 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -322,6 +325,7 @@ Partial Class frmStartOptions
        CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'pnl
@@ -329,6 +333,7 @@ Partial Class frmStartOptions
        Me.pnl.BackColor = System.Drawing.Color.White
        Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
        Me.pnl.Controls.Add(Me.LinkLabel69)
+        Me.pnl.Controls.Add(Me.Button27)
        Me.pnl.Controls.Add(Me.Button26)
        Me.pnl.Controls.Add(Me.txtMRNPrefix)
        Me.pnl.Controls.Add(Me.LinkLabel66)
@@ -412,16 +417,17 @@ Partial Class frmStartOptions
        Me.pnl.Size = New System.Drawing.Size(1229, 1007)
        Me.pnl.TabIndex = 0
        '
-        'LinkLabel69
+        'Button27
        '
-        Me.LinkLabel69.AutoSize = True
-        Me.LinkLabel69.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.LinkLabel69.Location = New System.Drawing.Point(668, 73)
-        Me.LinkLabel69.Name = "LinkLabel69"
-        Me.LinkLabel69.Size = New System.Drawing.Size(121, 13)
-        Me.LinkLabel69.TabIndex = 140
-        Me.LinkLabel69.TabStop = True
-        Me.LinkLabel69.Text = "LandKZ in Steuertabelle"
+        Me.Button27.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button27.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Button27.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button27.Location = New System.Drawing.Point(1062, 459)
+        Me.Button27.Name = "Button27"
+        Me.Button27.Size = New System.Drawing.Size(123, 24)
+        Me.Button27.TabIndex = 140
+        Me.Button27.Text = "test ATEZ"
+        Me.Button27.UseVisualStyleBackColor = True
        '
        'Button26
        '
@@ -432,7 +438,7 @@ Partial Class frmStartOptions
        Me.Button26.Name = "Button26"
        Me.Button26.Size = New System.Drawing.Size(123, 24)
        Me.Button26.TabIndex = 139
-        Me.Button26.Text = "test ATEZ"
+        Me.Button26.Text = "NCTS Einlesen"
        Me.Button26.UseVisualStyleBackColor = True
        '
        'txtMRNPrefix
@@ -1069,6 +1075,7 @@ Partial Class frmStartOptions
        '
        'TabPage1
        '
+        Me.TabPage1.Controls.Add(Me.LinkLabel68)
        Me.TabPage1.Controls.Add(Me.PictureBox26)
        Me.TabPage1.Controls.Add(Me.cbxGestellungspeichern)
        Me.TabPage1.Controls.Add(Me.MyTextBox4)
@@ -1127,6 +1134,17 @@ Partial Class frmStartOptions
        Me.TabPage1.Text = "Zollverfahren"
        Me.TabPage1.UseVisualStyleBackColor = True
        '
+        'LinkLabel68
+        '
+        Me.LinkLabel68.AutoSize = True
+        Me.LinkLabel68.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.LinkLabel68.Location = New System.Drawing.Point(760, 37)
+        Me.LinkLabel68.Name = "LinkLabel68"
+        Me.LinkLabel68.Size = New System.Drawing.Size(52, 13)
+        Me.LinkLabel68.TabIndex = 140
+        Me.LinkLabel68.TabStop = True
+        Me.LinkLabel68.Text = "KN8 EZT"
+        '
        'PictureBox26
        '
        Me.PictureBox26.BackgroundImage = CType(resources.GetObject("PictureBox26.BackgroundImage"), System.Drawing.Image)
@@ -3772,6 +3790,7 @@ Partial Class frmStartOptions
        CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)

    End Sub
@@ -4037,4 +4056,5 @@ Partial Class frmStartOptions
    Friend WithEvents Button26 As Button
    Friend WithEvents LinkLabel69 As LinkLabel
    Friend WithEvents LinkLabel70 As LinkLabel
+    Friend WithEvents Button27 As Button
 End Class
--- a/initATLASAufschubkonten/frmStartOptions.vb
+++ b/initATLASAufschubkonten/frmStartOptions.vb
@@ -5414,7 +5414,7 @@ Public Class frmStartOptions

    End Sub

-    Private Sub LinkLabel67_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel68.LinkClicked
+    Private Sub LinkLabel68_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel68.LinkClicked
        Me.Cursor = Cursors.WaitCursor
        Try
            Dim erg = VERAG_PROG_ALLGEMEIN.cTariffKN8_Interface.UPDATE_KN8()
@@ -5427,7 +5427,12 @@ Public Class frmStartOptions
    '    VERAG_PROG_ALLGEMEIN.cATEZ_ncts_api.query_declarations(CDate("01.01.2024"), CDate("31.12.2024"))
    'End Sub
    Private Sub Button26_Click(sender As Object, e As EventArgs) Handles Button26.Click
+        VERAG_PROG_ALLGEMEIN.cATEZ_ncts_api.query_declarations("01.12.2024", "31.12.2024")
+    End Sub
+
+    Private Sub Button27_Click(sender As Object, e As EventArgs) Handles Button27.Click
        VERAG_PROG_ALLGEMEIN.cATEZ_ncts_api.get_ie015_xml_by_mrn("24TR34340000000145")
+
    End Sub

    Private Sub LinkLabel70_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel70.LinkClicked