From 3a7af7940e65a016cf5576275d78ee78510dae79 Mon Sep 17 00:00:00 2001
From: Andreas Luxbauer <al@verag.ag>
Date: Tue, 13 May 2025 16:40:56 +0200
Subject: [PATCH] EZOLL Aufschub

---
 .../EZollAufschubEinlesen.vb                  |  2 +-
 .../frmRoutineManager.Designer.vb             | 22 +++++++++----------
 initATLASAufschubkonten/frmRoutineManager.vb  |  1 +
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/initATLASAufschubkonten/EZollAufschubEinlesen.vb b/initATLASAufschubkonten/EZollAufschubEinlesen.vb
index fe67eee..309344b 100644
--- a/initATLASAufschubkonten/EZollAufschubEinlesen.vb
+++ b/initATLASAufschubkonten/EZollAufschubEinlesen.vb
@@ -101,7 +101,7 @@ Public Class EZollAufschubEinlesen
             " 	/*AND (ztIMsgGdsItemDutyCalc.Ty IN ('1BD','0ML','0PB','0PG','0PS','1LG','1ZN','2AS','2DU','2EU','2IG','2KO','2PE','2RB','2SB','2SI','2VF','2VS','5DU','5EU','5SI','5VS','5ZO','5ZZ','6AK','6BE','6MS','6SS','6TS','6ZW','9EA','A20','A30','A35','A40','A45','C00','C10','D00','D10','E00') /*like 'A%'*/)*/ " &
             " 	AND (zsAnmGdsItem.LizenzNr =  'S01122' ) " &
             " 	AND (zsAnmHea.DecDT >=  convert(datetime, @datumVon,104)) " &
-            " 	AND (zsAnmHea.DecDT <  convert(datetime, @datumBis,104)) " &
+            " 	AND (zsAnmHea.DecDT <=  convert(datetime, @datumBis,104)) " &
                   " GROUP BY ztIMsgGdsItem.IMsgID, zsAnmGdsItem.LizenzNr, zsAnmGdsItem.OperatorID, zsAnmGdsItem.VorgangID, zsAnmGdsItem.AnmID, " &
             " 	 ztIMsgGdsItemDutyCalc.Ty, zsAnmRefs.CRN, " &
             " 	zsAnmRefs.LRN, isnull(zsAnmRefs.FRN,''), zsAnmHea.DefPayRef,  " &
diff --git a/initATLASAufschubkonten/frmRoutineManager.Designer.vb b/initATLASAufschubkonten/frmRoutineManager.Designer.vb
index 41c56c0..d1c954c 100644
--- a/initATLASAufschubkonten/frmRoutineManager.Designer.vb
+++ b/initATLASAufschubkonten/frmRoutineManager.Designer.vb
@@ -53,11 +53,11 @@ Partial Class frmRoutineManager
         Me.lblLastAktBRG_ATLAS_SBG = New System.Windows.Forms.Label()
         Me.lblLastAktBRG_ATLAS_EZOLL = New System.Windows.Forms.Label()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Button3 = New System.Windows.Forms.Button()
         Me.lblEZOLL_Ds = New System.Windows.Forms.Label()
         Me.lblASBG_Ds = New System.Windows.Forms.Label()
         Me.lblASUB_Ds = New System.Windows.Forms.Label()
         Me.TimerClose = New System.Windows.Forms.Timer(Me.components)
-        Me.Button3 = New System.Windows.Forms.Button()
         Me.mneNotifyIcon.SuspendLayout()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -369,6 +369,15 @@ Partial Class frmRoutineManager
         Me.Panel1.Size = New System.Drawing.Size(398, 262)
         Me.Panel1.TabIndex = 21
         '
+        'Button3
+        '
+        Me.Button3.Location = New System.Drawing.Point(47, 194)
+        Me.Button3.Name = "Button3"
+        Me.Button3.Size = New System.Drawing.Size(75, 23)
+        Me.Button3.TabIndex = 23
+        Me.Button3.Text = "Button3"
+        Me.Button3.UseVisualStyleBackColor = True
+        '
         'lblEZOLL_Ds
         '
         Me.lblEZOLL_Ds.AutoSize = True
@@ -406,15 +415,6 @@ Partial Class frmRoutineManager
         '
         Me.TimerClose.Interval = 60000
         '
-        'Button3
-        '
-        Me.Button3.Location = New System.Drawing.Point(47, 194)
-        Me.Button3.Name = "Button3"
-        Me.Button3.Size = New System.Drawing.Size(75, 23)
-        Me.Button3.TabIndex = 23
-        Me.Button3.Text = "Button3"
-        Me.Button3.UseVisualStyleBackColor = True
-        '
         'frmRoutineManager
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -426,7 +426,7 @@ Partial Class frmRoutineManager
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.Name = "frmRoutineManager"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
-        Me.Text = "RoutineManager"
+        Me.Text = "v"
         Me.mneNotifyIcon.ResumeLayout(False)
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
diff --git a/initATLASAufschubkonten/frmRoutineManager.vb b/initATLASAufschubkonten/frmRoutineManager.vb
index d6e086f..6be8121 100644
--- a/initATLASAufschubkonten/frmRoutineManager.vb
+++ b/initATLASAufschubkonten/frmRoutineManager.vb
@@ -97,6 +97,7 @@ Public Class frmRoutineManager
                 'lblStatusATLAS
             End Try
         End If
+
         setLabel(lblStatusEZOLL, "läuft ...", "green")
         Try
             Dim EZollAufschubEinlesen As New EZollAufschubEinlesen