Artikelstamm, EZA Vorlagen XLS, WiseApi

2025-12-09 14:57:08 +01:00
parent ccdd963fd6
commit 69489d9eaf
26 changed files with 5103 additions and 1623 deletions
--- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/cATLAS_EZA_IMPORT.Designer.vb
+++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/cATLAS_EZA_IMPORT.Designer.vb
@@ -0,0 +1,258 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class cATLAS_EZA_IMPORT
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(cATLAS_EZA_IMPORT))
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.Button2 = New System.Windows.Forms.Button()
+        Me.Button3 = New System.Windows.Forms.Button()
+        Me.Button4 = New System.Windows.Forms.Button()
+        Me.Button5 = New System.Windows.Forms.Button()
+        Me.Button6 = New System.Windows.Forms.Button()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.cbxGezeKN8 = New System.Windows.Forms.CheckBox()
+        Me.cbxGezeTranslate = New System.Windows.Forms.CheckBox()
+        Me.cbxVERAG_V1_translate = New System.Windows.Forms.CheckBox()
+        Me.cbxVERAG_V1_Kn8 = New System.Windows.Forms.CheckBox()
+        Me.cbxGezeTNR8to11 = New System.Windows.Forms.CheckBox()
+        Me.cbxVERAG_V1_TNR8to11 = New System.Windows.Forms.CheckBox()
+        Me.Button7 = New System.Windows.Forms.Button()
+        Me.SuspendLayout()
+        '
+        'Button1
+        '
+        Me.Button1.Image = Global.SDL.My.Resources.Resources.Excel_logo
+        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.Button1.Location = New System.Drawing.Point(4, 35)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(130, 71)
+        Me.Button1.TabIndex = 0
+        Me.Button1.Text = "VERAG Template" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "importieren"
+        Me.Button1.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'Button2
+        '
+        Me.Button2.Image = Global.SDL.My.Resources.Resources.Excel_logo
+        Me.Button2.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.Button2.Location = New System.Drawing.Point(140, 209)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(130, 71)
+        Me.Button2.TabIndex = 1
+        Me.Button2.Text = "MEYLE" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "importieren"
+        Me.Button2.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.Button2.UseVisualStyleBackColor = True
+        '
+        'Button3
+        '
+        Me.Button3.Image = Global.SDL.My.Resources.Resources.Excel_logo
+        Me.Button3.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.Button3.Location = New System.Drawing.Point(4, 209)
+        Me.Button3.Name = "Button3"
+        Me.Button3.Size = New System.Drawing.Size(130, 71)
+        Me.Button3.TabIndex = 2
+        Me.Button3.Text = "GEZE" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "importieren"
+        Me.Button3.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.Button3.UseVisualStyleBackColor = True
+        '
+        'Button4
+        '
+        Me.Button4.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.Button4.Image = Global.SDL.My.Resources.Resources.Excel_logo
+        Me.Button4.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.Button4.Location = New System.Drawing.Point(276, 35)
+        Me.Button4.Name = "Button4"
+        Me.Button4.Size = New System.Drawing.Size(130, 71)
+        Me.Button4.TabIndex = 3
+        Me.Button4.Text = "VERAG Template V1 " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Vorlage öffnen"
+        Me.Button4.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.Button4.UseVisualStyleBackColor = False
+        '
+        'Button5
+        '
+        Me.Button5.Image = Global.SDL.My.Resources.Resources.Excel_logo
+        Me.Button5.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.Button5.Location = New System.Drawing.Point(276, 209)
+        Me.Button5.Name = "Button5"
+        Me.Button5.Size = New System.Drawing.Size(130, 71)
+        Me.Button5.TabIndex = 4
+        Me.Button5.Text = "Fressnapf " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "importieren"
+        Me.Button5.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.Button5.UseVisualStyleBackColor = True
+        '
+        'Button6
+        '
+        Me.Button6.Image = Global.SDL.My.Resources.Resources.Excel_logo
+        Me.Button6.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.Button6.Location = New System.Drawing.Point(412, 209)
+        Me.Button6.Name = "Button6"
+        Me.Button6.Size = New System.Drawing.Size(130, 71)
+        Me.Button6.TabIndex = 5
+        Me.Button6.Text = "Dynamic Automotiv importieren"
+        Me.Button6.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.Button6.UseVisualStyleBackColor = True
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label1.Location = New System.Drawing.Point(12, 16)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(89, 13)
+        Me.Label1.TabIndex = 6
+        Me.Label1.Text = "VERAG Vorlagen"
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label2.Location = New System.Drawing.Point(12, 193)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(98, 13)
+        Me.Label2.TabIndex = 7
+        Me.Label2.Text = "KUNDEN Vorlagen"
+        '
+        'cbxGezeKN8
+        '
+        Me.cbxGezeKN8.AutoSize = True
+        Me.cbxGezeKN8.Checked = True
+        Me.cbxGezeKN8.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxGezeKN8.Location = New System.Drawing.Point(12, 287)
+        Me.cbxGezeKN8.Name = "cbxGezeKN8"
+        Me.cbxGezeKN8.Size = New System.Drawing.Size(118, 17)
+        Me.cbxGezeKN8.TabIndex = 8
+        Me.cbxGezeKN8.Text = "KN8 Text ergänzen"
+        Me.cbxGezeKN8.UseVisualStyleBackColor = True
+        '
+        'cbxGezeTranslate
+        '
+        Me.cbxGezeTranslate.AutoSize = True
+        Me.cbxGezeTranslate.Location = New System.Drawing.Point(12, 305)
+        Me.cbxGezeTranslate.Name = "cbxGezeTranslate"
+        Me.cbxGezeTranslate.Size = New System.Drawing.Size(78, 17)
+        Me.cbxGezeTranslate.TabIndex = 9
+        Me.cbxGezeTranslate.Text = "übersetzen"
+        Me.cbxGezeTranslate.UseVisualStyleBackColor = True
+        '
+        'cbxVERAG_V1_translate
+        '
+        Me.cbxVERAG_V1_translate.AutoSize = True
+        Me.cbxVERAG_V1_translate.Location = New System.Drawing.Point(12, 130)
+        Me.cbxVERAG_V1_translate.Name = "cbxVERAG_V1_translate"
+        Me.cbxVERAG_V1_translate.Size = New System.Drawing.Size(78, 17)
+        Me.cbxVERAG_V1_translate.TabIndex = 11
+        Me.cbxVERAG_V1_translate.Text = "übersetzen"
+        Me.cbxVERAG_V1_translate.UseVisualStyleBackColor = True
+        '
+        'cbxVERAG_V1_Kn8
+        '
+        Me.cbxVERAG_V1_Kn8.AutoSize = True
+        Me.cbxVERAG_V1_Kn8.Checked = True
+        Me.cbxVERAG_V1_Kn8.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxVERAG_V1_Kn8.Location = New System.Drawing.Point(12, 112)
+        Me.cbxVERAG_V1_Kn8.Name = "cbxVERAG_V1_Kn8"
+        Me.cbxVERAG_V1_Kn8.Size = New System.Drawing.Size(118, 17)
+        Me.cbxVERAG_V1_Kn8.TabIndex = 10
+        Me.cbxVERAG_V1_Kn8.Text = "KN8 Text ergänzen"
+        Me.cbxVERAG_V1_Kn8.UseVisualStyleBackColor = True
+        '
+        'cbxGezeTNR8to11
+        '
+        Me.cbxGezeTNR8to11.AutoSize = True
+        Me.cbxGezeTNR8to11.Location = New System.Drawing.Point(12, 323)
+        Me.cbxGezeTNR8to11.Name = "cbxGezeTNR8to11"
+        Me.cbxGezeTNR8to11.Size = New System.Drawing.Size(126, 17)
+        Me.cbxGezeTNR8to11.TabIndex = 12
+        Me.cbxGezeTNR8to11.Text = "unvollst.TNR ergänz."
+        Me.cbxGezeTNR8to11.UseVisualStyleBackColor = True
+        '
+        'cbxVERAG_V1_TNR8to11
+        '
+        Me.cbxVERAG_V1_TNR8to11.AutoSize = True
+        Me.cbxVERAG_V1_TNR8to11.Location = New System.Drawing.Point(12, 149)
+        Me.cbxVERAG_V1_TNR8to11.Name = "cbxVERAG_V1_TNR8to11"
+        Me.cbxVERAG_V1_TNR8to11.Size = New System.Drawing.Size(126, 17)
+        Me.cbxVERAG_V1_TNR8to11.TabIndex = 13
+        Me.cbxVERAG_V1_TNR8to11.Text = "unvollst.TNR ergänz."
+        Me.cbxVERAG_V1_TNR8to11.UseVisualStyleBackColor = True
+        '
+        'Button7
+        '
+        Me.Button7.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.Button7.Image = Global.SDL.My.Resources.Resources.Excel_logo
+        Me.Button7.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.Button7.Location = New System.Drawing.Point(412, 35)
+        Me.Button7.Name = "Button7"
+        Me.Button7.Size = New System.Drawing.Size(130, 71)
+        Me.Button7.TabIndex = 14
+        Me.Button7.Text = "VERAG Template V1.1 " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Vorlage öffnen"
+        Me.Button7.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.Button7.UseVisualStyleBackColor = False
+        '
+        'cATLAS_EZA_IMPORT
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.BackColor = System.Drawing.Color.White
+        Me.ClientSize = New System.Drawing.Size(563, 355)
+        Me.Controls.Add(Me.Button7)
+        Me.Controls.Add(Me.cbxVERAG_V1_TNR8to11)
+        Me.Controls.Add(Me.cbxGezeTNR8to11)
+        Me.Controls.Add(Me.cbxVERAG_V1_translate)
+        Me.Controls.Add(Me.cbxVERAG_V1_Kn8)
+        Me.Controls.Add(Me.cbxGezeTranslate)
+        Me.Controls.Add(Me.cbxGezeKN8)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.Button6)
+        Me.Controls.Add(Me.Button5)
+        Me.Controls.Add(Me.Button4)
+        Me.Controls.Add(Me.Button3)
+        Me.Controls.Add(Me.Button2)
+        Me.Controls.Add(Me.Button1)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Name = "cATLAS_EZA_IMPORT"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "DATEN IMPORT"
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents Button1 As Button
+    Friend WithEvents Button2 As Button
+    Friend WithEvents Button3 As Button
+    Friend WithEvents Button4 As Button
+    Friend WithEvents Button5 As Button
+    Friend WithEvents Button6 As Button
+    Friend WithEvents Label1 As Label
+    Friend WithEvents Label2 As Label
+    Friend WithEvents cbxGezeKN8 As CheckBox
+    Friend WithEvents cbxGezeTranslate As CheckBox
+    Friend WithEvents cbxVERAG_V1_translate As CheckBox
+    Friend WithEvents cbxVERAG_V1_Kn8 As CheckBox
+    Friend WithEvents cbxGezeTNR8to11 As CheckBox
+    Friend WithEvents cbxVERAG_V1_TNR8to11 As CheckBox
+    Friend WithEvents Button7 As Button
+End Class
--- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/cATLAS_EZA_IMPORT.resx
+++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/cATLAS_EZA_IMPORT.resx
--- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/cATLAS_EZA_IMPORT.vb
+++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/cATLAS_EZA_IMPORT.vb
--- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.Designer.vb
+++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.Designer.vb
@@ -59,9 +59,9 @@ Partial Class usrCntlATLAS_EZA
        Me.MEYLEXLSXToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.FressnapToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.VERAGIMPORTFormatToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.VERAGFormatÖffnen2025V1ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
        Me.EZAIDToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.VERAGFormatÖffnen2025V1ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainer.Panel1.SuspendLayout()
        Me.SplitContainer.SuspendLayout()
@@ -483,6 +483,12 @@ Partial Class usrCntlATLAS_EZA
        Me.VERAGIMPORTFormatToolStripMenuItem.Size = New System.Drawing.Size(244, 22)
        Me.VERAGIMPORTFormatToolStripMenuItem.Text = "VERAG-IMPORT-Format (XLSX)"
        '
+        'VERAGFormatÖffnen2025V1ToolStripMenuItem
+        '
+        Me.VERAGFormatÖffnen2025V1ToolStripMenuItem.Name = "VERAGFormatÖffnen2025V1ToolStripMenuItem"
+        Me.VERAGFormatÖffnen2025V1ToolStripMenuItem.Size = New System.Drawing.Size(244, 22)
+        Me.VERAGFormatÖffnen2025V1ToolStripMenuItem.Text = "VERAG-Format öffnen (2025-V1)"
+        '
        'ToolStripMenuItem1
        '
        Me.ToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EZAIDToolStripMenuItem})
@@ -496,12 +502,6 @@ Partial Class usrCntlATLAS_EZA
        Me.EZAIDToolStripMenuItem.Size = New System.Drawing.Size(109, 22)
        Me.EZAIDToolStripMenuItem.Text = "EZA ID"
        '
-        'VERAGFormatÖffnen2025V1ToolStripMenuItem
-        '
-        Me.VERAGFormatÖffnen2025V1ToolStripMenuItem.Name = "VERAGFormatÖffnen2025V1ToolStripMenuItem"
-        Me.VERAGFormatÖffnen2025V1ToolStripMenuItem.Size = New System.Drawing.Size(244, 22)
-        Me.VERAGFormatÖffnen2025V1ToolStripMenuItem.Text = "VERAG-Format öffnen (2025-V1)"
-        '
        'usrCntlATLAS_EZA
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
--- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb
+++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb
--- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA_Position.Designer.vb
+++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA_Position.Designer.vb
@@ -85,6 +85,8 @@ Partial Class usrCntlATLAS_EZA_Position
        Me.Label2 = New System.Windows.Forms.Label()
        Me.Label29 = New System.Windows.Forms.Label()
        Me.Label11 = New System.Windows.Forms.Label()
+        Me.sbPraeferenzursprungsland = New VERAG_PROG_ALLGEMEIN.MySearchBox()
+        Me.Label13 = New System.Windows.Forms.Label()
        Me.pnl.SuspendLayout()
        CType(Me.dgvUnterlage, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
@@ -93,6 +95,8 @@ Partial Class usrCntlATLAS_EZA_Position
        '
        Me.pnl.AutoScroll = True
        Me.pnl.BackColor = System.Drawing.Color.FloralWhite
+        Me.pnl.Controls.Add(Me.sbPraeferenzursprungsland)
+        Me.pnl.Controls.Add(Me.Label13)
        Me.pnl.Controls.Add(Me.txtArtikelpreisWaehrung)
        Me.pnl.Controls.Add(Me.sbAHStatMasseinheit)
        Me.pnl.Controls.Add(Me.Label12)
@@ -1037,6 +1041,40 @@ Partial Class usrCntlATLAS_EZA_Position
        Me.Label11.Text = "Ursprungsland:"
        Me.Label11.TextAlign = System.Drawing.ContentAlignment.TopRight
        '
+        'sbPraeferenzursprungsland
+        '
+        Me.sbPraeferenzursprungsland._allowFreitext = False
+        Me.sbPraeferenzursprungsland._AllowSetValue = False
+        Me.sbPraeferenzursprungsland._allowSpaceAsSplitter = False
+        Me.sbPraeferenzursprungsland._autoSizeGross = False
+        Me.sbPraeferenzursprungsland._hideIfListEmpty = True
+        Me.sbPraeferenzursprungsland._value = ""
+        Me.sbPraeferenzursprungsland.conn_art = "FMZOLL"
+        Me.sbPraeferenzursprungsland.dgvpos = "LEFT"
+        Me.sbPraeferenzursprungsland.DISPLAY_PARAM = Nothing
+        Me.sbPraeferenzursprungsland.INVISIBLE_COLUMNS = Nothing
+        Me.sbPraeferenzursprungsland.key_visible = False
+        Me.sbPraeferenzursprungsland.KEYPARAM = Nothing
+        Me.sbPraeferenzursprungsland.Location = New System.Drawing.Point(628, 320)
+        Me.sbPraeferenzursprungsland.Name = "sbPraeferenzursprungsland"
+        Me.sbPraeferenzursprungsland.searchActive = True
+        Me.sbPraeferenzursprungsland.Size = New System.Drawing.Size(41, 20)
+        Me.sbPraeferenzursprungsland.SQL_ORDER_BY = Nothing
+        Me.sbPraeferenzursprungsland.SQL_SELECT = Nothing
+        Me.sbPraeferenzursprungsland.SQL_WHERE = Nothing
+        Me.sbPraeferenzursprungsland.SQL_WhereParamList = Nothing
+        Me.sbPraeferenzursprungsland.TabIndex = 62
+        Me.sbPraeferenzursprungsland.usrcntl = Nothing
+        '
+        'Label13
+        '
+        Me.Label13.Location = New System.Drawing.Point(483, 323)
+        Me.Label13.Name = "Label13"
+        Me.Label13.Size = New System.Drawing.Size(139, 13)
+        Me.Label13.TabIndex = 61
+        Me.Label13.Text = "Präferenz-Ursprungsland:"
+        Me.Label13.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
        'usrCntlATLAS_EZA_Position
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1113,4 +1151,6 @@ Partial Class usrCntlATLAS_EZA_Position
    Friend WithEvents txtAHStatMenge As VERAG_PROG_ALLGEMEIN.MyTextBox
    Friend WithEvents sbAHStatMasseinheit As VERAG_PROG_ALLGEMEIN.MySearchBox
    Friend WithEvents txtArtikelpreisWaehrung As VERAG_PROG_ALLGEMEIN.MySearchBox
+    Friend WithEvents sbPraeferenzursprungsland As VERAG_PROG_ALLGEMEIN.MySearchBox
+    Friend WithEvents Label13 As Label
 End Class
--- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA_Position.resx
+++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA_Position.resx
@@ -121,15 +121,15 @@
  <data name="Button3.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHaSURBVEhLvdW7SlhBFIVh701EGyGKpEjAywv4Aham
-        iIXaio1dELXwFVRs7ARBQbHSwi5lijTBWhAvfSKExJBKEEWP/8iM7JmzziWKFh/k7Fl7FhgZG7Ise1Vy
-        6JwPvG9S8+eSQ4fCTrxVZ88hhxQNYgvHdUvJNfq9bXUe5AYs9OEbMq9WKZkmbPidHZVxog+Cb7COa79Y
-        q5SzHizjD8KOLI0+CJ2ZhZQsZdaLXZ9J5UqjDwLhR1IkV8r3Ii79ufLF5h//ERBYSRZSD6VwvyB7uIXK
-        OXe4sPdHZQGhOqVryUz5iwl7d1RkEawqdZepefADs+iw90YlKcJVpUVO8VHdmRukWHxK6Qwa1X25gcLy
-        vrmszFd8QuE7LIcpLljwF1aZV/uWHAZc0I9N/PMXVvmJ0mdQDh0W2+DK1MVlSp9BOWShC0uwb+P/KCzN
-        DQi+g3tB1EXWoZhZsjT6cAit4sovlZlGnRep294flTnJgnKEKbT7fFXpub0/KnMITCYL1m+MiZ2iUvd3
-        9cBmo8WA0LhZCn5hDtHbaHZU6QmGbC5asgjaUvd/MaJyFplQegP36gyjxWaihRThUPpZnStkXel3fFDn
-        uUGKxTG0qrMi5EfRrM5yg5cmhy8na7gHtvbLF9T64qAAAAAASUVORK5CYII=
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
+        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
+        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
+        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
+        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
+        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
+        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
+        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
+        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
 </value>
  </data>
  <metadata name="UlCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
--- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA_Position.vb
+++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA_Position.vb
@@ -63,6 +63,7 @@

        sbAHStatMasseinheit.initSearchBox(Me.FindForm, " CodeQualifier ,[Description] as Art, CodeQualifier + ' ' +  Description as display FROM [tbl_DY_ZollDE_I0700_Masseinheiten]", {"CodeQualifier", "Description", "'%'+Code"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "CodeQualifier", "CodeQualifier", "display", "FMZOLL", , 400, 200)
        sbUrsprungsland.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "Code", "FMZOLL", , 400, 200)
+        sbPraeferenzursprungsland.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "Code", "FMZOLL", , 400, 200)

        cboZT.Items.Clear()
        cboZT.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Absender", "ABS"))
@@ -163,6 +164,7 @@

            Me.cboBeguenstigung.changeItem(If(WARE.ezaWP_BeguenstigungBenatragtCode, ""))
            Me.sbUrsprungsland.SET_VALUE(If(WARE.ezaWP_UrsprungslandCode, ""))
+            Me.sbPraeferenzursprungsland.SET_VALUE(If(WARE.ezaWP_Praeferenzursprungsland, ""))



--- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA_Positionen.vb
+++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA_Positionen.vb
@@ -272,6 +272,7 @@

            POSITION.ezaWP_BeguenstigungBenatragtCode = cProgramFunctions.isLeerNothing(P.cboBeguenstigung._value)
            POSITION.ezaWP_UrsprungslandCode = cProgramFunctions.isLeerNothing(P.sbUrsprungsland._value)
+            POSITION.ezaWP_Praeferenzursprungsland = cProgramFunctions.isLeerNothing(P.sbPraeferenzursprungsland._value)

            POSITION.ezaWP_UNTERLAGEN = New List(Of DAKOSY_Worker.cDakosy_EZA_WarenpositionVorgelegteUnterlagen)
            For Each r As DataGridViewRow In P.dgvUnterlage.Rows