diff --git a/VERAGAddIn/VERAGAddIn.vbproj b/VERAGAddIn/VERAGAddIn.vbproj
index f2046e0..ac35e44 100644
--- a/VERAGAddIn/VERAGAddIn.vbproj
+++ b/VERAGAddIn/VERAGAddIn.vbproj
@@ -36,7 +36,7 @@
\\ftps.verag.ag\g\ftp\programme\VERAGAddin\
http://ftps.verag.ag/VERAGAddin/
de
- 1.0.1.108
+ 1.0.1.109
true
true
0
diff --git a/VERAGAddIn/frmAvisoAnfügen.Designer.vb b/VERAGAddIn/frmAvisoAnfügen.Designer.vb
index 0fcd84d..9dfdb98 100644
--- a/VERAGAddIn/frmAvisoAnfügen.Designer.vb
+++ b/VERAGAddIn/frmAvisoAnfügen.Designer.vb
@@ -36,7 +36,6 @@ Partial Class frmAvisoAnfuegen
Me.cbx = New System.Windows.Forms.CheckBox()
Me.CheckBox1 = New System.Windows.Forms.CheckBox()
Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
- Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.cboArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.txtSrchDat = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.dgvSendungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
@@ -48,6 +47,8 @@ Partial Class frmAvisoAnfuegen
Me.bttnSaveMail = New System.Windows.Forms.Button()
Me.btnSaveAttachments = New System.Windows.Forms.Button()
Me.Label4 = New System.Windows.Forms.Label()
+ Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
+ Me.Pfad = New System.Windows.Forms.DataGridViewTextBoxColumn()
CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.dgvSendungen, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.dgvAviso, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -191,7 +192,7 @@ Partial Class frmAvisoAnfuegen
Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White
Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvAnhaenge.ColumnHeadersVisible = False
- Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.columnName})
+ Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.columnName, Me.Pfad})
Me.dgvAnhaenge.Location = New System.Drawing.Point(15, 665)
Me.dgvAnhaenge.Name = "dgvAnhaenge"
Me.dgvAnhaenge.ReadOnly = True
@@ -200,13 +201,6 @@ Partial Class frmAvisoAnfuegen
Me.dgvAnhaenge.Size = New System.Drawing.Size(615, 129)
Me.dgvAnhaenge.TabIndex = 21
'
- 'columnName
- '
- Me.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
- Me.columnName.HeaderText = "Name"
- Me.columnName.Name = "columnName"
- Me.columnName.ReadOnly = True
- '
'cboArt
'
Me.cboArt._allowedValuesFreiText = Nothing
@@ -409,6 +403,20 @@ Partial Class frmAvisoAnfuegen
Me.Label4.TabIndex = 39
Me.Label4.Text = "Testsystem"
'
+ 'columnName
+ '
+ Me.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+ Me.columnName.HeaderText = "Name"
+ Me.columnName.Name = "columnName"
+ Me.columnName.ReadOnly = True
+ '
+ 'Pfad
+ '
+ Me.Pfad.HeaderText = "Pfad"
+ Me.Pfad.Name = "Pfad"
+ Me.Pfad.ReadOnly = True
+ Me.Pfad.Visible = False
+ '
'frmAvisoAnfuegen
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -471,8 +479,9 @@ Partial Class frmAvisoAnfuegen
Friend WithEvents Label3 As Windows.Forms.Label
Friend WithEvents cboArt As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents dgvAnhaenge As VERAG_PROG_ALLGEMEIN.MyDatagridview
- Friend WithEvents columnName As Windows.Forms.DataGridViewTextBoxColumn
Friend WithEvents cbx As Windows.Forms.CheckBox
Friend WithEvents CheckBox1 As Windows.Forms.CheckBox
Friend WithEvents Label4 As Windows.Forms.Label
+ Friend WithEvents columnName As Windows.Forms.DataGridViewTextBoxColumn
+ Friend WithEvents Pfad As Windows.Forms.DataGridViewTextBoxColumn
End Class
diff --git a/VERAGAddIn/frmAvisoAnfügen.resx b/VERAGAddIn/frmAvisoAnfügen.resx
index 6ec366f..ca21d07 100644
--- a/VERAGAddIn/frmAvisoAnfügen.resx
+++ b/VERAGAddIn/frmAvisoAnfügen.resx
@@ -120,6 +120,9 @@
True
+
+ True
+
diff --git a/VERAGAddIn/frmAvisoAnfügen.vb b/VERAGAddIn/frmAvisoAnfügen.vb
index 1153803..484d0bb 100644
--- a/VERAGAddIn/frmAvisoAnfügen.vb
+++ b/VERAGAddIn/frmAvisoAnfügen.vb
@@ -63,10 +63,11 @@ Public Class frmAvisoAnfuegen
Dim sp = a.Split("\")
display = sp(sp.Count - 1)
End If
- dgvAnhaenge.Rows.Add({display})
+ dgvAnhaenge.Rows.Add({display, a})
Next
End If
dgvAnhaenge.ClearSelection()
+
End Sub
Private Sub txtLKWNr_TextChanged(sender As Object, e As KeyEventArgs) Handles txtLKWNr.KeyDown, txtAbfertigungsnummer.KeyDown, cboFiliale.KeyDown
@@ -92,7 +93,7 @@ Public Class frmAvisoAnfuegen
Dim sql = "SELECT TOP 10 AvisoID, Grenzstelle as Grenze, Datum, LKW_Nr,Auftraggeber,Frächter,Firma FROM Aviso left join tblSendungen on tblSnd_AvisoID=AvisoID WHERE status <>2 " & firma & " "
If IsDate(txtSrchDat.Text) Then sql &= " AND Datum > '" & CDate(txtSrchDat.Text).ToShortDateString & "'"
- If txtLKWNr.Text <> "" Then sql &= " AND LKW_Nr LIKE '%" & txtLKWNr.Text & "%'"
+ If txtLKWNr.Text <> "" Then sql &= " AND (LKW_Nr LIKE '%" & txtLKWNr.Text & "%' OR AvisoID ='" & txtLKWNr.Text & "')"
If cboFiliale._value <> "" Then sql &= " AND FilialenNr LIKE '%" & cboFiliale._value & "%'"
@@ -102,7 +103,9 @@ Public Class frmAvisoAnfuegen
.SET_SQL(sql, "AVISO")
.LOAD()
- .Columns("AvisoId").Visible = False
+ '.Columns("AvisoId").Visible = False
+ .Columns("AvisoId").HeaderText = "LKW-ID"
+ .Columns("AvisoId").Width = 60
.AutoSizeColumnsMode = Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
.Columns("Grenze").Width = 40
.Columns("Datum").Width = 80
@@ -242,10 +245,9 @@ Public Class frmAvisoAnfuegen
Try
If dgvAnhaenge.SelectedRows.Count > 0 Then
- If dgvAnhaenge.SelectedRows(0).Cells(0).Value <> "" Then
+ If dgvAnhaenge.SelectedRows(0).Cells(1).Value <> "" Then
- Dim strTmpPath As String = System.IO.Path.GetTempPath()
- Process.Start(strTmpPath & dgvAnhaenge.SelectedRows(0).Cells(0).Value)
+ Process.Start(dgvAnhaenge.SelectedRows(0).Cells(1).Value)
End If
End If
diff --git a/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb b/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb
index 72da95d..3787c78 100644
--- a/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb
+++ b/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb
@@ -38,10 +38,11 @@ Partial Class frmAvisoFormularAnfuegen
Me.pbAnhaenge = New System.Windows.Forms.PictureBox()
Me.lblMultiAttachements = New System.Windows.Forms.Label()
Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
- Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
Me.btnOK = New System.Windows.Forms.Button()
Me.btnCancel = New System.Windows.Forms.Button()
+ Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
+ Me.Pfad = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.panelKunden.SuspendLayout()
Me.pnlBottom.SuspendLayout()
CType(Me.pbAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -202,7 +203,7 @@ Partial Class frmAvisoFormularAnfuegen
Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White
Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvAnhaenge.ColumnHeadersVisible = False
- Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.columnName})
+ Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.columnName, Me.Pfad})
Me.dgvAnhaenge.Location = New System.Drawing.Point(12, 19)
Me.dgvAnhaenge.Name = "dgvAnhaenge"
Me.dgvAnhaenge.ReadOnly = True
@@ -212,13 +213,6 @@ Partial Class frmAvisoFormularAnfuegen
Me.dgvAnhaenge.TabIndex = 39
Me.dgvAnhaenge.Visible = False
'
- 'columnName
- '
- Me.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
- Me.columnName.HeaderText = "Name"
- Me.columnName.Name = "columnName"
- Me.columnName.ReadOnly = True
- '
'MyPanel1
'
Me.MyPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
@@ -251,6 +245,20 @@ Partial Class frmAvisoFormularAnfuegen
Me.btnCancel.Text = "Abbrechen"
Me.btnCancel.UseVisualStyleBackColor = True
'
+ 'columnName
+ '
+ Me.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+ Me.columnName.HeaderText = "Name"
+ Me.columnName.Name = "columnName"
+ Me.columnName.ReadOnly = True
+ '
+ 'Pfad
+ '
+ Me.Pfad.HeaderText = "Pfad"
+ Me.Pfad.Name = "Pfad"
+ Me.Pfad.ReadOnly = True
+ Me.Pfad.Visible = False
+ '
'frmAvisoFormularAnfuegen
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -287,8 +295,9 @@ Partial Class frmAvisoFormularAnfuegen
Friend WithEvents pbAnhaenge As Windows.Forms.PictureBox
Friend WithEvents lblMultiAttachements As Windows.Forms.Label
Friend WithEvents dgvAnhaenge As MyDatagridview
- Friend WithEvents columnName As Windows.Forms.DataGridViewTextBoxColumn
Friend WithEvents MyPanel1 As MyPanel
Friend WithEvents btnOK As Windows.Forms.Button
Friend WithEvents btnCancel As Windows.Forms.Button
+ Friend WithEvents columnName As Windows.Forms.DataGridViewTextBoxColumn
+ Friend WithEvents Pfad As Windows.Forms.DataGridViewTextBoxColumn
End Class
diff --git a/VERAGAddIn/frmAvisoFormularAnfügen.resx b/VERAGAddIn/frmAvisoFormularAnfügen.resx
index 6ec366f..ca21d07 100644
--- a/VERAGAddIn/frmAvisoFormularAnfügen.resx
+++ b/VERAGAddIn/frmAvisoFormularAnfügen.resx
@@ -120,6 +120,9 @@
True
+
+ True
+
diff --git a/VERAGAddIn/frmAvisoFormularAnfügen.vb b/VERAGAddIn/frmAvisoFormularAnfügen.vb
index feef333..d21da76 100644
--- a/VERAGAddIn/frmAvisoFormularAnfügen.vb
+++ b/VERAGAddIn/frmAvisoFormularAnfügen.vb
@@ -355,7 +355,7 @@ Public Class frmAvisoFormularAnfuegen
Dim sp = a.Split("\")
display = sp(sp.Count - 1)
End If
- dgvAnhaenge.Rows.Add({display})
+ dgvAnhaenge.Rows.Add({display, a})
Next
ATTTemp = ATT
End If
@@ -471,10 +471,9 @@ Public Class frmAvisoFormularAnfuegen
Private Sub dgvAnhaenge_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvAnhaenge.CellDoubleClick, dgvAnhaenge.CellContentDoubleClick
Try
If dgvAnhaenge.SelectedRows.Count > 0 Then
- If dgvAnhaenge.SelectedRows(0).Cells(0).Value <> "" Then
+ If dgvAnhaenge.SelectedRows(0).Cells(1).Value <> "" Then
- Dim strTmpPath As String = System.IO.Path.GetTempPath()
- Process.Start(strTmpPath & dgvAnhaenge.SelectedRows(0).Cells(0).Value)
+ Process.Start(dgvAnhaenge.SelectedRows(0).Cells(1).Value)
End If
End If
diff --git a/VERAGAddIn/rbnVERAG.vb b/VERAGAddIn/rbnVERAG.vb
index 2399fb3..097fab6 100644
--- a/VERAGAddIn/rbnVERAG.vb
+++ b/VERAGAddIn/rbnVERAG.vb
@@ -20,6 +20,9 @@ Imports System.Diagnostics
Imports VERAG_PROG_ALLGEMEIN.Kleinma.Controls
Imports System.Data.Odbc
Imports System.Reflection
+Imports System.Diagnostics.Eventing
+Imports System.Net.WebRequestMethods
+Imports System.Xml
Public Class VERAGRibbon
Dim LOGIN_OK = False
@@ -44,7 +47,7 @@ Public Class VERAGRibbon
Private Sub Ribbon1_Load(ByVal sender As System.Object, ByVal e As RibbonUIEventArgs) Handles MyBase.Load
cAllgemein.TESTSYSTEM = False
- 'cAllgemein.TESTSYSTEM = True
+ cAllgemein.TESTSYSTEM = True
LOGIN_OK = AVISO_Mail_Functions.initFirmaUser()
End Sub
@@ -123,6 +126,7 @@ Public Class AVISO_Mail_Functions
addMailToAviso(mailItem, sender)
Else
+
MsgBox("Die markierte Email kann nicht verarbeitet werden!" & vbNewLine & "Bitte andere Email verwenden.")
End If
End If
@@ -612,7 +616,7 @@ Public Class AVISO_Mail_Functions
Dim cnt = 0
For Each l In sp
If cnt > 0 AndAlso l.Contains(""">") Then ' ENDE
- Dim link = ("https://web01.ekol.com/documentservice/download/" & l.ToString.Substring(0, l.ToString.IndexOf(""">") - 1))
+ Dim link = ("https://web01.ekol.com/documentservice/download/" & l.ToString.Substring(0, l.ToString.IndexOf(""">")))
'Ansonten stüzt der Webservice-Aufruf ab! ABER -> For .NET 4.7 or later, the System.Net.ServicePointManager.SecurityProtocol should not be set manualy!
System.Net.ServicePointManager.SecurityProtocol = System.Net.ServicePointManager.SecurityProtocol Or SecurityProtocolType.Tls11 Or SecurityProtocolType.Tls12
@@ -622,7 +626,7 @@ Public Class AVISO_Mail_Functions
My.Computer.Network.DownloadFile(link, TMP_PATH)
- If IO.File.Exists(TMP_PATH) Then
+ If IO.File.Exists(TMP_PATH) AndAlso TMP_PATH.Contains(".pdf") Then
ATT.Add(TMP_PATH)
End If