diff --git a/SDL/My Project/Resources.Designer.vb b/SDL/My Project/Resources.Designer.vb
index c77695a0..2f036aab 100644
--- a/SDL/My Project/Resources.Designer.vb
+++ b/SDL/My Project/Resources.Designer.vb
@@ -449,6 +449,16 @@ Namespace My.Resources
End Get
End Property
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ System.Byte[].
+ '''
+ Friend ReadOnly Property CBAM_GP() As Byte()
+ Get
+ Dim obj As Object = ResourceManager.GetObject("CBAM_GP", resourceCulture)
+ Return CType(obj,Byte())
+ End Get
+ End Property
+
'''
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''
diff --git a/SDL/My Project/Resources.resx b/SDL/My Project/Resources.resx
index b6fe8715..cf383368 100644
--- a/SDL/My Project/Resources.resx
+++ b/SDL/My Project/Resources.resx
@@ -958,4 +958,7 @@
..\Resources\Detailauswertung_divers.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ ..\Resources\CBAM_GP.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
\ No newline at end of file
diff --git a/SDL/Resources/CBAM_GP.xlsx b/SDL/Resources/CBAM_GP.xlsx
new file mode 100644
index 00000000..2d1249c6
Binary files /dev/null and b/SDL/Resources/CBAM_GP.xlsx differ
diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj
index d5cc36e3..9929f38f 100644
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -4652,6 +4652,7 @@
+
Always
diff --git a/SDL/kunden/usrCntlCBAM.Designer.vb b/SDL/kunden/usrCntlCBAM.Designer.vb
index 579dd3af..c9a6c6ab 100644
--- a/SDL/kunden/usrCntlCBAM.Designer.vb
+++ b/SDL/kunden/usrCntlCBAM.Designer.vb
@@ -44,12 +44,12 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DHF_VERAG = New System.Windows.Forms.Button()
Me.btnCBAM_DS_DAKOSY = New System.Windows.Forms.Button()
Me.Label3 = New System.Windows.Forms.Label()
- Me.btnCBAM_DS_DAKOSY_Deteil = New System.Windows.Forms.Button()
+ Me.btnCBAM_DS_DAKOSY_Detail = New System.Windows.Forms.Button()
Me.btnCBAM_DS_DAKOSY_Summe = New System.Windows.Forms.Button()
Me.btnCBAM_DS_DHF_VERAG_Summe = New System.Windows.Forms.Button()
- Me.btnCBAM_DS_DHF_VERAG_Deteil = New System.Windows.Forms.Button()
+ Me.btnCBAM_DS_DHF_VERAG_Detail = New System.Windows.Forms.Button()
Me.btnCBAM_DS_DHF_UNISPED_Summe = New System.Windows.Forms.Button()
- Me.btnCBAM_DS_DHF_UNISPED_Deteil = New System.Windows.Forms.Button()
+ Me.btnCBAM_DS_DHF_UNISPED_Detail = New System.Windows.Forms.Button()
Me.btnCBAM_DS_TELOTEC_Summe = New System.Windows.Forms.Button()
Me.btnCBAM_DS_TELOTEC_Detail = New System.Windows.Forms.Button()
Me.Label6 = New System.Windows.Forms.Label()
@@ -70,6 +70,10 @@ Partial Class usrCntlCBAM
Me.txtEori = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Button1 = New System.Windows.Forms.Button()
Me.btnCBAM_DS_DAKOSY_Spedb = New System.Windows.Forms.Button()
+ Me.btnCBAM_DS_DAKOSY_GP = New System.Windows.Forms.Button()
+ Me.btnCBAM_DS_DHF_VERAG_GP = New System.Windows.Forms.Button()
+ Me.btnCBAM_DS_DHF_UNISPED_GP = New System.Windows.Forms.Button()
+ Me.btnCBAM_DS_TELOTEC_GP = New System.Windows.Forms.Button()
Me.cntxtAddSdl.SuspendLayout()
Me.MyPanel1.SuspendLayout()
Me.SuspendLayout()
@@ -244,7 +248,7 @@ Partial Class usrCntlCBAM
'btnCBAM_DS_DHF_UNISPED
'
Me.btnCBAM_DS_DHF_UNISPED.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btnCBAM_DS_DHF_UNISPED.Location = New System.Drawing.Point(454, 168)
+ Me.btnCBAM_DS_DHF_UNISPED.Location = New System.Drawing.Point(454, 167)
Me.btnCBAM_DS_DHF_UNISPED.Name = "btnCBAM_DS_DHF_UNISPED"
Me.btnCBAM_DS_DHF_UNISPED.Size = New System.Drawing.Size(168, 42)
Me.btnCBAM_DS_DHF_UNISPED.TabIndex = 24
@@ -254,7 +258,7 @@ Partial Class usrCntlCBAM
'btnCBAM_DS_TELOTEC
'
Me.btnCBAM_DS_TELOTEC.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btnCBAM_DS_TELOTEC.Location = New System.Drawing.Point(628, 168)
+ Me.btnCBAM_DS_TELOTEC.Location = New System.Drawing.Point(628, 167)
Me.btnCBAM_DS_TELOTEC.Name = "btnCBAM_DS_TELOTEC"
Me.btnCBAM_DS_TELOTEC.Size = New System.Drawing.Size(168, 42)
Me.btnCBAM_DS_TELOTEC.TabIndex = 23
@@ -264,7 +268,7 @@ Partial Class usrCntlCBAM
'btnCBAM_DS_DHF_VERAG
'
Me.btnCBAM_DS_DHF_VERAG.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btnCBAM_DS_DHF_VERAG.Location = New System.Drawing.Point(280, 168)
+ Me.btnCBAM_DS_DHF_VERAG.Location = New System.Drawing.Point(280, 167)
Me.btnCBAM_DS_DHF_VERAG.Name = "btnCBAM_DS_DHF_VERAG"
Me.btnCBAM_DS_DHF_VERAG.Size = New System.Drawing.Size(168, 42)
Me.btnCBAM_DS_DHF_VERAG.TabIndex = 22
@@ -274,7 +278,7 @@ Partial Class usrCntlCBAM
'btnCBAM_DS_DAKOSY
'
Me.btnCBAM_DS_DAKOSY.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btnCBAM_DS_DAKOSY.Location = New System.Drawing.Point(106, 168)
+ Me.btnCBAM_DS_DAKOSY.Location = New System.Drawing.Point(106, 167)
Me.btnCBAM_DS_DAKOSY.Name = "btnCBAM_DS_DAKOSY"
Me.btnCBAM_DS_DAKOSY.Size = New System.Drawing.Size(168, 42)
Me.btnCBAM_DS_DAKOSY.TabIndex = 21
@@ -284,25 +288,25 @@ Partial Class usrCntlCBAM
'Label3
'
Me.Label3.AutoSize = True
- Me.Label3.Location = New System.Drawing.Point(5, 183)
+ Me.Label3.Location = New System.Drawing.Point(5, 182)
Me.Label3.Name = "Label3"
Me.Label3.Size = New System.Drawing.Size(64, 13)
Me.Label3.TabIndex = 25
Me.Label3.Text = "Datensätze:"
'
- 'btnCBAM_DS_DAKOSY_Deteil
+ 'btnCBAM_DS_DAKOSY_Detail
'
- Me.btnCBAM_DS_DAKOSY_Deteil.Enabled = False
- Me.btnCBAM_DS_DAKOSY_Deteil.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btnCBAM_DS_DAKOSY_Deteil.Image = Global.SDL.My.Resources.Resources.Excel_logo
- Me.btnCBAM_DS_DAKOSY_Deteil.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btnCBAM_DS_DAKOSY_Deteil.Location = New System.Drawing.Point(144, 216)
- Me.btnCBAM_DS_DAKOSY_Deteil.Name = "btnCBAM_DS_DAKOSY_Deteil"
- Me.btnCBAM_DS_DAKOSY_Deteil.Size = New System.Drawing.Size(130, 42)
- Me.btnCBAM_DS_DAKOSY_Deteil.TabIndex = 26
- Me.btnCBAM_DS_DAKOSY_Deteil.Text = "Detailbericht"
- Me.btnCBAM_DS_DAKOSY_Deteil.TextAlign = System.Drawing.ContentAlignment.MiddleRight
- Me.btnCBAM_DS_DAKOSY_Deteil.UseVisualStyleBackColor = True
+ Me.btnCBAM_DS_DAKOSY_Detail.Enabled = False
+ Me.btnCBAM_DS_DAKOSY_Detail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnCBAM_DS_DAKOSY_Detail.Image = Global.SDL.My.Resources.Resources.Excel_logo
+ Me.btnCBAM_DS_DAKOSY_Detail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+ Me.btnCBAM_DS_DAKOSY_Detail.Location = New System.Drawing.Point(144, 215)
+ Me.btnCBAM_DS_DAKOSY_Detail.Name = "btnCBAM_DS_DAKOSY_Detail"
+ Me.btnCBAM_DS_DAKOSY_Detail.Size = New System.Drawing.Size(130, 42)
+ Me.btnCBAM_DS_DAKOSY_Detail.TabIndex = 26
+ Me.btnCBAM_DS_DAKOSY_Detail.Text = "Detailbericht"
+ Me.btnCBAM_DS_DAKOSY_Detail.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+ Me.btnCBAM_DS_DAKOSY_Detail.UseVisualStyleBackColor = True
'
'btnCBAM_DS_DAKOSY_Summe
'
@@ -310,7 +314,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DAKOSY_Summe.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DAKOSY_Summe.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_DAKOSY_Summe.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btnCBAM_DS_DAKOSY_Summe.Location = New System.Drawing.Point(144, 264)
+ Me.btnCBAM_DS_DAKOSY_Summe.Location = New System.Drawing.Point(144, 301)
Me.btnCBAM_DS_DAKOSY_Summe.Name = "btnCBAM_DS_DAKOSY_Summe"
Me.btnCBAM_DS_DAKOSY_Summe.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DAKOSY_Summe.TabIndex = 27
@@ -324,7 +328,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DHF_VERAG_Summe.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DHF_VERAG_Summe.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_DHF_VERAG_Summe.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btnCBAM_DS_DHF_VERAG_Summe.Location = New System.Drawing.Point(318, 264)
+ Me.btnCBAM_DS_DHF_VERAG_Summe.Location = New System.Drawing.Point(318, 301)
Me.btnCBAM_DS_DHF_VERAG_Summe.Name = "btnCBAM_DS_DHF_VERAG_Summe"
Me.btnCBAM_DS_DHF_VERAG_Summe.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DHF_VERAG_Summe.TabIndex = 29
@@ -332,19 +336,19 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DHF_VERAG_Summe.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnCBAM_DS_DHF_VERAG_Summe.UseVisualStyleBackColor = True
'
- 'btnCBAM_DS_DHF_VERAG_Deteil
+ 'btnCBAM_DS_DHF_VERAG_Detail
'
- Me.btnCBAM_DS_DHF_VERAG_Deteil.Enabled = False
- Me.btnCBAM_DS_DHF_VERAG_Deteil.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btnCBAM_DS_DHF_VERAG_Deteil.Image = Global.SDL.My.Resources.Resources.Excel_logo
- Me.btnCBAM_DS_DHF_VERAG_Deteil.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btnCBAM_DS_DHF_VERAG_Deteil.Location = New System.Drawing.Point(318, 216)
- Me.btnCBAM_DS_DHF_VERAG_Deteil.Name = "btnCBAM_DS_DHF_VERAG_Deteil"
- Me.btnCBAM_DS_DHF_VERAG_Deteil.Size = New System.Drawing.Size(130, 42)
- Me.btnCBAM_DS_DHF_VERAG_Deteil.TabIndex = 28
- Me.btnCBAM_DS_DHF_VERAG_Deteil.Text = "Detailbericht"
- Me.btnCBAM_DS_DHF_VERAG_Deteil.TextAlign = System.Drawing.ContentAlignment.MiddleRight
- Me.btnCBAM_DS_DHF_VERAG_Deteil.UseVisualStyleBackColor = True
+ Me.btnCBAM_DS_DHF_VERAG_Detail.Enabled = False
+ Me.btnCBAM_DS_DHF_VERAG_Detail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnCBAM_DS_DHF_VERAG_Detail.Image = Global.SDL.My.Resources.Resources.Excel_logo
+ Me.btnCBAM_DS_DHF_VERAG_Detail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+ Me.btnCBAM_DS_DHF_VERAG_Detail.Location = New System.Drawing.Point(318, 215)
+ Me.btnCBAM_DS_DHF_VERAG_Detail.Name = "btnCBAM_DS_DHF_VERAG_Detail"
+ Me.btnCBAM_DS_DHF_VERAG_Detail.Size = New System.Drawing.Size(130, 42)
+ Me.btnCBAM_DS_DHF_VERAG_Detail.TabIndex = 28
+ Me.btnCBAM_DS_DHF_VERAG_Detail.Text = "Detailbericht"
+ Me.btnCBAM_DS_DHF_VERAG_Detail.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+ Me.btnCBAM_DS_DHF_VERAG_Detail.UseVisualStyleBackColor = True
'
'btnCBAM_DS_DHF_UNISPED_Summe
'
@@ -352,7 +356,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DHF_UNISPED_Summe.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DHF_UNISPED_Summe.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_DHF_UNISPED_Summe.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btnCBAM_DS_DHF_UNISPED_Summe.Location = New System.Drawing.Point(492, 264)
+ Me.btnCBAM_DS_DHF_UNISPED_Summe.Location = New System.Drawing.Point(492, 301)
Me.btnCBAM_DS_DHF_UNISPED_Summe.Name = "btnCBAM_DS_DHF_UNISPED_Summe"
Me.btnCBAM_DS_DHF_UNISPED_Summe.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DHF_UNISPED_Summe.TabIndex = 31
@@ -360,19 +364,19 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DHF_UNISPED_Summe.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnCBAM_DS_DHF_UNISPED_Summe.UseVisualStyleBackColor = True
'
- 'btnCBAM_DS_DHF_UNISPED_Deteil
+ 'btnCBAM_DS_DHF_UNISPED_Detail
'
- Me.btnCBAM_DS_DHF_UNISPED_Deteil.Enabled = False
- Me.btnCBAM_DS_DHF_UNISPED_Deteil.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btnCBAM_DS_DHF_UNISPED_Deteil.Image = Global.SDL.My.Resources.Resources.Excel_logo
- Me.btnCBAM_DS_DHF_UNISPED_Deteil.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btnCBAM_DS_DHF_UNISPED_Deteil.Location = New System.Drawing.Point(492, 216)
- Me.btnCBAM_DS_DHF_UNISPED_Deteil.Name = "btnCBAM_DS_DHF_UNISPED_Deteil"
- Me.btnCBAM_DS_DHF_UNISPED_Deteil.Size = New System.Drawing.Size(130, 42)
- Me.btnCBAM_DS_DHF_UNISPED_Deteil.TabIndex = 30
- Me.btnCBAM_DS_DHF_UNISPED_Deteil.Text = "Detailbericht"
- Me.btnCBAM_DS_DHF_UNISPED_Deteil.TextAlign = System.Drawing.ContentAlignment.MiddleRight
- Me.btnCBAM_DS_DHF_UNISPED_Deteil.UseVisualStyleBackColor = True
+ Me.btnCBAM_DS_DHF_UNISPED_Detail.Enabled = False
+ Me.btnCBAM_DS_DHF_UNISPED_Detail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnCBAM_DS_DHF_UNISPED_Detail.Image = Global.SDL.My.Resources.Resources.Excel_logo
+ Me.btnCBAM_DS_DHF_UNISPED_Detail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+ Me.btnCBAM_DS_DHF_UNISPED_Detail.Location = New System.Drawing.Point(492, 215)
+ Me.btnCBAM_DS_DHF_UNISPED_Detail.Name = "btnCBAM_DS_DHF_UNISPED_Detail"
+ Me.btnCBAM_DS_DHF_UNISPED_Detail.Size = New System.Drawing.Size(130, 42)
+ Me.btnCBAM_DS_DHF_UNISPED_Detail.TabIndex = 30
+ Me.btnCBAM_DS_DHF_UNISPED_Detail.Text = "Detailbericht"
+ Me.btnCBAM_DS_DHF_UNISPED_Detail.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+ Me.btnCBAM_DS_DHF_UNISPED_Detail.UseVisualStyleBackColor = True
'
'btnCBAM_DS_TELOTEC_Summe
'
@@ -380,7 +384,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_TELOTEC_Summe.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_TELOTEC_Summe.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_TELOTEC_Summe.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btnCBAM_DS_TELOTEC_Summe.Location = New System.Drawing.Point(666, 264)
+ Me.btnCBAM_DS_TELOTEC_Summe.Location = New System.Drawing.Point(666, 301)
Me.btnCBAM_DS_TELOTEC_Summe.Name = "btnCBAM_DS_TELOTEC_Summe"
Me.btnCBAM_DS_TELOTEC_Summe.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_TELOTEC_Summe.TabIndex = 33
@@ -394,7 +398,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_TELOTEC_Detail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_TELOTEC_Detail.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_TELOTEC_Detail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btnCBAM_DS_TELOTEC_Detail.Location = New System.Drawing.Point(666, 216)
+ Me.btnCBAM_DS_TELOTEC_Detail.Location = New System.Drawing.Point(666, 215)
Me.btnCBAM_DS_TELOTEC_Detail.Name = "btnCBAM_DS_TELOTEC_Detail"
Me.btnCBAM_DS_TELOTEC_Detail.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_TELOTEC_Detail.TabIndex = 32
@@ -416,7 +420,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DAKOSY_Copy.Enabled = False
Me.btnCBAM_DS_DAKOSY_Copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DAKOSY_Copy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btnCBAM_DS_DAKOSY_Copy.Location = New System.Drawing.Point(144, 360)
+ Me.btnCBAM_DS_DAKOSY_Copy.Location = New System.Drawing.Point(144, 394)
Me.btnCBAM_DS_DAKOSY_Copy.Name = "btnCBAM_DS_DAKOSY_Copy"
Me.btnCBAM_DS_DAKOSY_Copy.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DAKOSY_Copy.TabIndex = 35
@@ -428,7 +432,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DHF_VERAG_Copy.Enabled = False
Me.btnCBAM_DS_DHF_VERAG_Copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DHF_VERAG_Copy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btnCBAM_DS_DHF_VERAG_Copy.Location = New System.Drawing.Point(318, 312)
+ Me.btnCBAM_DS_DHF_VERAG_Copy.Location = New System.Drawing.Point(318, 347)
Me.btnCBAM_DS_DHF_VERAG_Copy.Name = "btnCBAM_DS_DHF_VERAG_Copy"
Me.btnCBAM_DS_DHF_VERAG_Copy.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DHF_VERAG_Copy.TabIndex = 36
@@ -440,7 +444,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DHF_UNISPED_Copy.Enabled = False
Me.btnCBAM_DS_DHF_UNISPED_Copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DHF_UNISPED_Copy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btnCBAM_DS_DHF_UNISPED_Copy.Location = New System.Drawing.Point(492, 312)
+ Me.btnCBAM_DS_DHF_UNISPED_Copy.Location = New System.Drawing.Point(492, 347)
Me.btnCBAM_DS_DHF_UNISPED_Copy.Name = "btnCBAM_DS_DHF_UNISPED_Copy"
Me.btnCBAM_DS_DHF_UNISPED_Copy.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DHF_UNISPED_Copy.TabIndex = 37
@@ -452,7 +456,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_TELOTEC_Copy.Enabled = False
Me.btnCBAM_DS_TELOTEC_Copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_TELOTEC_Copy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btnCBAM_DS_TELOTEC_Copy.Location = New System.Drawing.Point(666, 312)
+ Me.btnCBAM_DS_TELOTEC_Copy.Location = New System.Drawing.Point(666, 347)
Me.btnCBAM_DS_TELOTEC_Copy.Name = "btnCBAM_DS_TELOTEC_Copy"
Me.btnCBAM_DS_TELOTEC_Copy.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_TELOTEC_Copy.TabIndex = 38
@@ -465,7 +469,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DAKOSY_XML.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DAKOSY_XML.Image = Global.SDL.My.Resources.Resources.xml
Me.btnCBAM_DS_DAKOSY_XML.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btnCBAM_DS_DAKOSY_XML.Location = New System.Drawing.Point(144, 477)
+ Me.btnCBAM_DS_DAKOSY_XML.Location = New System.Drawing.Point(144, 485)
Me.btnCBAM_DS_DAKOSY_XML.Name = "btnCBAM_DS_DAKOSY_XML"
Me.btnCBAM_DS_DAKOSY_XML.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DAKOSY_XML.TabIndex = 40
@@ -477,7 +481,7 @@ Partial Class usrCntlCBAM
Me.Button2.Enabled = False
Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.Button2.Location = New System.Drawing.Point(144, 525)
+ Me.Button2.Location = New System.Drawing.Point(144, 532)
Me.Button2.Name = "Button2"
Me.Button2.Size = New System.Drawing.Size(130, 42)
Me.Button2.TabIndex = 42
@@ -631,7 +635,7 @@ Partial Class usrCntlCBAM
'Button1
'
Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.Button1.Location = New System.Drawing.Point(106, 429)
+ Me.Button1.Location = New System.Drawing.Point(106, 438)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(168, 42)
Me.Button1.TabIndex = 44
@@ -644,7 +648,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DAKOSY_Spedb.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DAKOSY_Spedb.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_DAKOSY_Spedb.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btnCBAM_DS_DAKOSY_Spedb.Location = New System.Drawing.Point(144, 312)
+ Me.btnCBAM_DS_DAKOSY_Spedb.Location = New System.Drawing.Point(144, 347)
Me.btnCBAM_DS_DAKOSY_Spedb.Name = "btnCBAM_DS_DAKOSY_Spedb"
Me.btnCBAM_DS_DAKOSY_Spedb.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DAKOSY_Spedb.TabIndex = 45
@@ -652,11 +656,71 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DAKOSY_Spedb.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnCBAM_DS_DAKOSY_Spedb.UseVisualStyleBackColor = True
'
+ 'btnCBAM_DS_DAKOSY_GP
+ '
+ Me.btnCBAM_DS_DAKOSY_GP.Enabled = False
+ Me.btnCBAM_DS_DAKOSY_GP.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnCBAM_DS_DAKOSY_GP.Image = Global.SDL.My.Resources.Resources.Excel_logo
+ Me.btnCBAM_DS_DAKOSY_GP.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+ Me.btnCBAM_DS_DAKOSY_GP.Location = New System.Drawing.Point(144, 258)
+ Me.btnCBAM_DS_DAKOSY_GP.Name = "btnCBAM_DS_DAKOSY_GP"
+ Me.btnCBAM_DS_DAKOSY_GP.Size = New System.Drawing.Size(130, 42)
+ Me.btnCBAM_DS_DAKOSY_GP.TabIndex = 46
+ Me.btnCBAM_DS_DAKOSY_GP.Text = "GP Detailbericht"
+ Me.btnCBAM_DS_DAKOSY_GP.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+ Me.btnCBAM_DS_DAKOSY_GP.UseVisualStyleBackColor = True
+ '
+ 'btnCBAM_DS_DHF_VERAG_GP
+ '
+ Me.btnCBAM_DS_DHF_VERAG_GP.Enabled = False
+ Me.btnCBAM_DS_DHF_VERAG_GP.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnCBAM_DS_DHF_VERAG_GP.Image = Global.SDL.My.Resources.Resources.Excel_logo
+ Me.btnCBAM_DS_DHF_VERAG_GP.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+ Me.btnCBAM_DS_DHF_VERAG_GP.Location = New System.Drawing.Point(318, 258)
+ Me.btnCBAM_DS_DHF_VERAG_GP.Name = "btnCBAM_DS_DHF_VERAG_GP"
+ Me.btnCBAM_DS_DHF_VERAG_GP.Size = New System.Drawing.Size(130, 42)
+ Me.btnCBAM_DS_DHF_VERAG_GP.TabIndex = 47
+ Me.btnCBAM_DS_DHF_VERAG_GP.Text = "GP Detailbericht"
+ Me.btnCBAM_DS_DHF_VERAG_GP.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+ Me.btnCBAM_DS_DHF_VERAG_GP.UseVisualStyleBackColor = True
+ '
+ 'btnCBAM_DS_DHF_UNISPED_GP
+ '
+ Me.btnCBAM_DS_DHF_UNISPED_GP.Enabled = False
+ Me.btnCBAM_DS_DHF_UNISPED_GP.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnCBAM_DS_DHF_UNISPED_GP.Image = Global.SDL.My.Resources.Resources.Excel_logo
+ Me.btnCBAM_DS_DHF_UNISPED_GP.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+ Me.btnCBAM_DS_DHF_UNISPED_GP.Location = New System.Drawing.Point(492, 258)
+ Me.btnCBAM_DS_DHF_UNISPED_GP.Name = "btnCBAM_DS_DHF_UNISPED_GP"
+ Me.btnCBAM_DS_DHF_UNISPED_GP.Size = New System.Drawing.Size(130, 42)
+ Me.btnCBAM_DS_DHF_UNISPED_GP.TabIndex = 48
+ Me.btnCBAM_DS_DHF_UNISPED_GP.Text = "GP Detailbericht"
+ Me.btnCBAM_DS_DHF_UNISPED_GP.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+ Me.btnCBAM_DS_DHF_UNISPED_GP.UseVisualStyleBackColor = True
+ '
+ 'btnCBAM_DS_TELOTEC_GP
+ '
+ Me.btnCBAM_DS_TELOTEC_GP.Enabled = False
+ Me.btnCBAM_DS_TELOTEC_GP.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnCBAM_DS_TELOTEC_GP.Image = Global.SDL.My.Resources.Resources.Excel_logo
+ Me.btnCBAM_DS_TELOTEC_GP.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+ Me.btnCBAM_DS_TELOTEC_GP.Location = New System.Drawing.Point(666, 258)
+ Me.btnCBAM_DS_TELOTEC_GP.Name = "btnCBAM_DS_TELOTEC_GP"
+ Me.btnCBAM_DS_TELOTEC_GP.Size = New System.Drawing.Size(130, 42)
+ Me.btnCBAM_DS_TELOTEC_GP.TabIndex = 49
+ Me.btnCBAM_DS_TELOTEC_GP.Text = "GP Detailbericht"
+ Me.btnCBAM_DS_TELOTEC_GP.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+ Me.btnCBAM_DS_TELOTEC_GP.UseVisualStyleBackColor = True
+ '
'usrCntlCBAM
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.White
+ Me.Controls.Add(Me.btnCBAM_DS_TELOTEC_GP)
+ Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_GP)
+ Me.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_GP)
+ Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_GP)
Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_Spedb)
Me.Controls.Add(Me.Button1)
Me.Controls.Add(Me.Button2)
@@ -670,11 +734,11 @@ Partial Class usrCntlCBAM
Me.Controls.Add(Me.btnCBAM_DS_TELOTEC_Summe)
Me.Controls.Add(Me.btnCBAM_DS_TELOTEC_Detail)
Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_Summe)
- Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_Deteil)
+ Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_Detail)
Me.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_Summe)
- Me.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_Deteil)
+ Me.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_Detail)
Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_Summe)
- Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_Deteil)
+ Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_Detail)
Me.Controls.Add(Me.Label3)
Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED)
Me.Controls.Add(Me.btnCBAM_DS_TELOTEC)
@@ -735,12 +799,12 @@ Partial Class usrCntlCBAM
Friend WithEvents btnCBAM_DS_DHF_VERAG As Button
Friend WithEvents btnCBAM_DS_DAKOSY As Button
Friend WithEvents Label3 As Label
- Friend WithEvents btnCBAM_DS_DAKOSY_Deteil As Button
+ Friend WithEvents btnCBAM_DS_DAKOSY_Detail As Button
Friend WithEvents btnCBAM_DS_DAKOSY_Summe As Button
Friend WithEvents btnCBAM_DS_DHF_VERAG_Summe As Button
- Friend WithEvents btnCBAM_DS_DHF_VERAG_Deteil As Button
+ Friend WithEvents btnCBAM_DS_DHF_VERAG_Detail As Button
Friend WithEvents btnCBAM_DS_DHF_UNISPED_Summe As Button
- Friend WithEvents btnCBAM_DS_DHF_UNISPED_Deteil As Button
+ Friend WithEvents btnCBAM_DS_DHF_UNISPED_Detail As Button
Friend WithEvents btnCBAM_DS_TELOTEC_Summe As Button
Friend WithEvents btnCBAM_DS_TELOTEC_Detail As Button
Friend WithEvents Label6 As Label
@@ -756,4 +820,8 @@ Partial Class usrCntlCBAM
Friend WithEvents cbxIMEX As CheckBox
Friend WithEvents cbxUNISPED As CheckBox
Friend WithEvents btnCBAM_DS_DAKOSY_Spedb As Button
+ Friend WithEvents btnCBAM_DS_DAKOSY_GP As Button
+ Friend WithEvents btnCBAM_DS_DHF_VERAG_GP As Button
+ Friend WithEvents btnCBAM_DS_DHF_UNISPED_GP As Button
+ Friend WithEvents btnCBAM_DS_TELOTEC_GP As Button
End Class
diff --git a/SDL/kunden/usrCntlCBAM.vb b/SDL/kunden/usrCntlCBAM.vb
index e6d0072b..bfeca966 100644
--- a/SDL/kunden/usrCntlCBAM.vb
+++ b/SDL/kunden/usrCntlCBAM.vb
@@ -1,7 +1,7 @@
Public Class usrCntlCBAM
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
- Public kdnr = -1
+ Public kdnr As Integer = -1
Dim AD As VERAG_PROG_ALLGEMEIN.cAdressen = Nothing
Dim KD As VERAG_PROG_ALLGEMEIN.cKunde = Nothing
@@ -396,11 +396,13 @@
End Sub
Private Sub btnCBAM_DS_DAKOSY_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DAKOSY.Click
- btnCBAM_DS_DAKOSY_Deteil.Enabled = False
+ btnCBAM_DS_DAKOSY_Detail.Enabled = False
btnCBAM_DS_DAKOSY_Copy.Enabled = False
btnCBAM_DS_DAKOSY_Spedb.Enabled = False
- btnCBAM_DS_DAKOSY_Deteil.Tag = ""
+ btnCBAM_DS_DAKOSY_GP.Enabled = False
+ btnCBAM_DS_DAKOSY_Detail.Tag = ""
btnCBAM_DS_DAKOSY_Spedb.Tag = ""
+ btnCBAM_DS_DAKOSY_GP.Tag = ""
Dim SQLSTR_WHERE_FIRMEN = ""
@@ -416,9 +418,40 @@
If txtBis._value = "" Then MsgBox("Datum bis eingeben!") : Exit Sub
Me.Cursor = Cursors.WaitCursor
-
- Dim SQLSTR = "
- SELECT
+ Dim SQL_GP As String = "SELECT [Registriernummer_MRN] as 'declaration no'
+ ,max(Überlassungsdatum) as 'declaration date'
+ ,isnull(max(Empfänger_CN_EORI),'') as 'importer identification number'
+ ,'' as 'exporter identification number'
+ , max(Warentarifnummer) as 'commodity code'
+ ,max([VersendungsLand]) as 'origin country code'
+ ,Left(max(Verfahren2),2) as 'requested procedure'
+ ,'' as 'previous procedure'
+ ,(max(Eigenmasse) / 1000) as 'net mass'
+ ,'TONNES' as 'type of measurement unit'
+ ,'' as 'invoice numbers'
+ ,'' as 'invoice date'
+ ,'' as 'member state auth'
+ ,'' as 'discharge bill waiver'
+ ,'' as 'authorisation'
+ ,'' as 'start time'
+ ,'' as 'end time'
+ ,'' as 'deadline'
+ ,isnull(max(Empfänger_CN_EORI),'') as 'reporting declarant EORI number'
+ ,'' as 'type of representation'
+ ,isnull(max(CN_Name), '') as 'importer title'
+ ,'' as 'importer email'
+ ,'' as 'importer phone'
+ ,isnull(max(CN_Ländercode), '') as 'importer country code or member state'
+ ,'' as 'importer subdivision'
+ ,'' as 'importer city'
+ ,'' as 'importer street'
+ ,'' as 'importer street additional'
+ ,'' as 'importer address number'
+ ,'' as 'importer post code'
+ ,'' as 'importer po box'
+ ,'' as 'importer coordinate longitude (x)'
+ ,'' as 'importer coordinate latitude (y)'"
+ Dim SQL_DAKOSY As String = "SELECT
[Registriernummer_MRN] RegistriernummerATLAS
,PositionNo PositionsNummer
,max(Überlassungsdatum) Anmeldedatum
@@ -433,9 +466,9 @@
,isnull(max(Empfänger_CN_EORI),'') as EmpfängerEORI
,isnull(max(CN_Name), '') as Empfänger
,isnull(max(Versender_CZ_EORI),'') as AbsenderEORI
- ,isnull(max(CZ_Name), '') as Absender
-
- FROM [tbl_DY_Zollmeldungen_Import]
+ ,isnull(max(CZ_Name), '') as Absender"
+
+ Dim SQLSTR = " FROM [tbl_DY_Zollmeldungen_Import]
where
Überlassungsdatum between '" & txtVon._value & "' and '" & txtBis._value & "'
and
@@ -458,8 +491,6 @@
"
-
-
If SQLSTR_WHERE_FIRMEN <> "" Then
SQLSTR &= " and Teilnehmer in ( " & SQLSTR_WHERE_FIRMEN & ")"
SQLSTR &= "
@@ -479,10 +510,12 @@
SQLSTR &= " group by Registriernummer_MRN,PositionNo"
- SQLSTR &= " order by Absender,Registriernummer_MRN, PositionNo"
+ SQLSTR &= " order by isnull(max(CZ_Name), ''), Registriernummer_MRN, PositionNo"
- Dim dt = SQL.loadDgvBySql(SQLSTR, "AVISO", 600)
+ Dim dt = SQL.loadDgvBySql(SQL_DAKOSY & SQLSTR, "AVISO", 600)
+
+ Dim dtGP = SQL.loadDgvBySql(SQL_GP & SQLSTR, "AVISO", 600)
@@ -510,13 +543,21 @@
' MsgBox(SQLSTR)
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value)
- btnCBAM_DS_DAKOSY_Deteil.Tag = path
- btnCBAM_DS_DAKOSY_Deteil.Enabled = True
+ btnCBAM_DS_DAKOSY_Detail.Tag = path
+ btnCBAM_DS_DAKOSY_Detail.Enabled = True
btnCBAM_DS_DAKOSY_Copy.Enabled = True
End If
- Dim dtNew = SQL.loadDgvBySql(sqlNew, "FMZOLL", 600)
+ If dtGP IsNot Nothing AndAlso dt.Rows.Count > 0 Then
+
+ btnCBAM_DS_DAKOSY_GP.Tag = createExcelForGreenPulse(dtGP, EORI, IIf(AD.Ort <> "", AD.Ort, ""))
+ btnCBAM_DS_DAKOSY_GP.Enabled = True
+
+ End If
+
+
+ Dim dtNew = SQL.loadDgvBySql(sqlNew, "FMZOLL", 600)
If dtNew IsNot Nothing AndAlso dtNew.Rows.Count > 0 Then
If dtNew.Columns.Contains("Packstücke") Then dtNew.Columns.Remove("Packstücke")
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtNew,,,,, False, EORI & "_Unterschiede zum Sped-Buch_" & txtVon._value & "-" & txtBis._value)
@@ -1057,9 +1098,9 @@
End Sub
- Private Sub btnCBAM_DS_DAKOSY_Deteil_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DAKOSY_Deteil.Click, btnCBAM_DS_DAKOSY_Summe.Click, btnCBAM_DS_DHF_VERAG_Deteil.Click,
- btnCBAM_DS_DHF_VERAG_Summe.Click, btnCBAM_DS_DHF_UNISPED_Deteil.Click, btnCBAM_DS_DHF_UNISPED_Summe.Click, btnCBAM_DS_TELOTEC_Detail.Click, btnCBAM_DS_TELOTEC_Summe.Click,
- btnCBAM_DS_DAKOSY_XML.Click, btnCBAM_DS_DAKOSY_Spedb.Click
+ Private Sub btnCBAM_DS_DAKOSY_Deteil_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DAKOSY_Detail.Click, btnCBAM_DS_DAKOSY_Summe.Click, btnCBAM_DS_DHF_VERAG_Detail.Click,
+ btnCBAM_DS_DHF_VERAG_Summe.Click, btnCBAM_DS_DHF_UNISPED_Detail.Click, btnCBAM_DS_DHF_UNISPED_Summe.Click, btnCBAM_DS_TELOTEC_Detail.Click, btnCBAM_DS_TELOTEC_Summe.Click,
+ btnCBAM_DS_DAKOSY_XML.Click, btnCBAM_DS_DAKOSY_Spedb.Click, btnCBAM_DS_DAKOSY_GP.Click, btnCBAM_DS_DHF_UNISPED_GP.Click, btnCBAM_DS_DHF_VERAG_GP.Click, btnCBAM_DS_TELOTEC_GP.Click
If sender.tag <> "" Then
Try : Process.Start(sender.tag) : Catch : End Try
@@ -1068,7 +1109,7 @@
Private Sub btnCBAM_DS_DAKOSY_Copy_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DAKOSY_Copy.Click
Dim f As New List(Of String)
- If btnCBAM_DS_DAKOSY_Deteil.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Deteil.Tag)
+ If btnCBAM_DS_DAKOSY_Detail.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Detail.Tag)
If btnCBAM_DS_DAKOSY_Summe.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Summe.Tag)
If f.Count > 0 Then
@@ -1081,7 +1122,7 @@
Private Sub btnCBAM_DS_DHF_VERAG_Copy_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DHF_VERAG_Copy.Click
Dim f As New List(Of String)
- If btnCBAM_DS_DHF_VERAG_Deteil.Tag <> "" Then f.Add(btnCBAM_DS_DHF_VERAG_Deteil.Tag)
+ If btnCBAM_DS_DHF_VERAG_Detail.Tag <> "" Then f.Add(btnCBAM_DS_DHF_VERAG_Detail.Tag)
If btnCBAM_DS_DHF_VERAG_Summe.Tag <> "" Then f.Add(btnCBAM_DS_DHF_VERAG_Summe.Tag)
If f.Count > 0 Then
@@ -1094,7 +1135,7 @@
Private Sub btnCBAM_DS_DHF_UNISPED_Copy_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DHF_UNISPED_Copy.Click
Dim f As New List(Of String)
- If btnCBAM_DS_DHF_UNISPED_Deteil.Tag <> "" Then f.Add(btnCBAM_DS_DHF_UNISPED_Deteil.Tag)
+ If btnCBAM_DS_DHF_UNISPED_Detail.Tag <> "" Then f.Add(btnCBAM_DS_DHF_UNISPED_Detail.Tag)
If btnCBAM_DS_DHF_UNISPED_Summe.Tag <> "" Then f.Add(btnCBAM_DS_DHF_UNISPED_Summe.Tag)
If f.Count > 0 Then
@@ -1121,14 +1162,14 @@
Private Sub btnCBAM_DS_DHF_VERAG_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DHF_VERAG.Click, btnCBAM_DS_DHF_UNISPED.Click
Dim EZOLL_SQL = "EZOLL"
If sender Is btnCBAM_DS_DHF_VERAG Then
- btnCBAM_DS_DHF_VERAG_Deteil.Enabled = False
+ btnCBAM_DS_DHF_VERAG_Detail.Enabled = False
btnCBAM_DS_DHF_VERAG_Copy.Enabled = False
- btnCBAM_DS_DHF_VERAG_Deteil.Tag = ""
+ btnCBAM_DS_DHF_VERAG_Detail.Tag = ""
End If
If sender Is btnCBAM_DS_DHF_UNISPED Then
- btnCBAM_DS_DHF_UNISPED_Deteil.Enabled = False
+ btnCBAM_DS_DHF_UNISPED_Detail.Enabled = False
btnCBAM_DS_DHF_UNISPED_Copy.Enabled = False
- btnCBAM_DS_DHF_UNISPED_Deteil.Tag = ""
+ btnCBAM_DS_DHF_UNISPED_Detail.Tag = ""
EZOLL_SQL = "EZOLL_UNISPED"
End If
@@ -1193,13 +1234,13 @@
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value)
If sender Is btnCBAM_DS_DHF_VERAG Then
- btnCBAM_DS_DHF_VERAG_Deteil.Tag = path
- btnCBAM_DS_DHF_VERAG_Deteil.Enabled = True
+ btnCBAM_DS_DHF_VERAG_Detail.Tag = path
+ btnCBAM_DS_DHF_VERAG_Detail.Enabled = True
btnCBAM_DS_DHF_VERAG_Copy.Enabled = True
End If
If sender Is btnCBAM_DS_DHF_UNISPED Then
- btnCBAM_DS_DHF_UNISPED_Deteil.Tag = path
- btnCBAM_DS_DHF_UNISPED_Deteil.Enabled = True
+ btnCBAM_DS_DHF_UNISPED_Detail.Tag = path
+ btnCBAM_DS_DHF_UNISPED_Detail.Enabled = True
btnCBAM_DS_DHF_UNISPED_Copy.Enabled = True
End If
Me.Cursor = Cursors.Default
@@ -1329,7 +1370,7 @@
Private Sub Button3_Click(sender As Object, e As EventArgs)
Dim f As New List(Of String)
- If btnCBAM_DS_DAKOSY_Deteil.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Deteil.Tag)
+ If btnCBAM_DS_DAKOSY_Detail.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Detail.Tag)
If btnCBAM_DS_DAKOSY_Summe.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Summe.Tag)
If btnCBAM_DS_DAKOSY_XML.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_XML.Tag)
@@ -1532,4 +1573,95 @@
End Sub
+ Public Function createExcelForGreenPulse(dt As DataTable, EORI As String, Importer_City As String)
+
+
+ Dim EORI_Ort As String = ""
+ If AD IsNot Nothing Then
+ EORI_Ort = AD.Ort
+ End If
+
+ Dim Path_GP = ""
+
+ Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\SR\"
+ If Not My.Computer.FileSystem.DirectoryExists(sPath) Then
+ My.Computer.FileSystem.CreateDirectory(sPath)
+ End If
+
+ Dim exclApp As Object 'as Application
+ Dim Datei As Object 'as WorkBook
+ Dim Blatt As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet
+ exclApp = CreateObject("Excel.Application")
+
+
+
+ With exclApp
+ .Visible = False
+
+ Try
+ Path_GP = sPath & EORI & "_Detailbericht_GP_" & txtVon._value & "-" & txtBis._value & " .xlsx"
+ While System.IO.File.Exists(Path_GP)
+ Path_GP = sPath & EORI & "_Detailbericht_GP_" & txtVon._value & "-" & txtBis._value & Now.ToString("ddMMyyyyHHmmss") & ".xlsx"
+ End While
+ My.Computer.FileSystem.WriteAllBytes(Path_GP, My.Resources.CBAM_GP, False)
+ Catch ex As System.Exception
+ ' MsgBox(ex.Message)
+ MsgBox("ERROR 01: " & ex.Message & vbNewLine & ex.StackTrace)
+ Me.Cursor = Cursors.Default
+
+ Return ""
+ End Try
+
+ Datei = .Workbooks.Open(Path_GP) 'Anpassen
+ Blatt = Datei.Worksheets(1) 'Anpassen
+
+ Dim cnt = 2
+
+ Dim rowcounter As Integer = 0
+
+ For Each row As DataRow In dt.Rows
+ Blatt.Range("A" & cnt).Value = row("declaration no")
+ Blatt.Range("B" & cnt).Value = row("declaration date")
+ Blatt.Range("C" & cnt).Value = row("importer identification number")
+ Blatt.Range("D" & cnt).Value = row("exporter identification number")
+ Blatt.Range("E" & cnt).Value = row("commodity code")
+ Blatt.Range("F" & cnt).Value = row("origin country code")
+ Blatt.Range("G" & cnt).Value = row("requested procedure")
+ Blatt.Range("H" & cnt).Value = row("previous procedure")
+ Blatt.Range("J" & cnt).Value = row("net mass")
+ Blatt.Range("J" & cnt).Value = row("type of measurement unit")
+ Blatt.Range("K" & cnt).Value = row("invoice numbers")
+ Blatt.Range("L" & cnt).Value = row("invoice date")
+ Blatt.Range("M" & cnt).Value = row("member state auth")
+ Blatt.Range("N" & cnt).Value = row("discharge bill waiver")
+ Blatt.Range("O" & cnt).Value = row("authorisation")
+ Blatt.Range("P" & cnt).Value = row("start time")
+ Blatt.Range("Q" & cnt).Value = row("end time")
+ Blatt.Range("R" & cnt).Value = row("deadline")
+ Blatt.Range("S" & cnt).Value = row("reporting declarant EORI number")
+ Blatt.Range("T" & cnt).Value = row("type of representation")
+ Blatt.Range("U" & cnt).Value = row("importer title")
+ Blatt.Range("V" & cnt).Value = row("importer email")
+ Blatt.Range("W" & cnt).Value = row("importer phone")
+ Blatt.Range("X" & cnt).Value = row("importer country code or member state")
+ Blatt.Range("Y" & cnt).Value = row("importer subdivision")
+ Blatt.Range("Z" & cnt).Value = IIf(Importer_City <> "", Importer_City, row("importer city"))
+
+ Blatt.Range("AA" & cnt).Value = row("importer street")
+ Blatt.Range("AB" & cnt).Value = row("importer street additional")
+ Blatt.Range("AC" & cnt).Value = row("importer address number")
+ Blatt.Range("AD" & cnt).Value = row("importer post code")
+ Blatt.Range("AE" & cnt).Value = row("importer po box")
+ Blatt.Range("AF" & cnt).Value = row("importer coordinate longitude (x)")
+ Blatt.Range("AG" & cnt).Value = row("importer coordinate latitude (y)")
+ cnt += 1
+ rowcounter += 1
+ Next
+
+ End With
+
+ Return Path_GP
+
+ End Function
+
End Class
diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb
index b0263b3f..fb79079e 100644
--- a/SDL/mdm/frmMDMDatenverarbetiung.vb
+++ b/SDL/mdm/frmMDMDatenverarbetiung.vb
@@ -2056,7 +2056,7 @@ Public Class frmMDMDatenverarbetiung
- Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
+ Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL", 60)