Bugfix Emailverarbeitung

2024-08-07 09:49:13 +02:00
parent 3d914ffdc9
commit 7624bdb1f9
6 changed files with 77 additions and 15 deletions
--- a/VERAGAddIn/VERAGAddIn.vbproj
+++ b/VERAGAddIn/VERAGAddIn.vbproj
@@ -36,7 +36,7 @@
    <PublishUrl>\\ftps.verag.ag\g\ftp\programme\VERAGAddin\</PublishUrl>
    <InstallUrl>http://ftps.verag.ag/VERAGAddin/</InstallUrl>
    <TargetCulture>de</TargetCulture>
-    <ApplicationVersion>1.0.1.125</ApplicationVersion>
+    <ApplicationVersion>1.0.1.127</ApplicationVersion>
    <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
    <UpdateEnabled>true</UpdateEnabled>
    <UpdateInterval>0</UpdateInterval>
--- a/VERAGAddIn/frmAvisoAnfügen.Designer.vb
+++ b/VERAGAddIn/frmAvisoAnfügen.Designer.vb
@@ -22,7 +22,6 @@ Partial Class frmAvisoAnfuegen
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAvisoAnfuegen))
        Me.lbl = New System.Windows.Forms.Label()
        Me.Label14 = New System.Windows.Forms.Label()
@@ -40,17 +39,19 @@ Partial Class frmAvisoAnfuegen
        Me.btnVermerke = New System.Windows.Forms.Button()
        Me.bttnSaveMail = New System.Windows.Forms.Button()
        Me.btnSaveAttachments = New System.Windows.Forms.Button()
-        Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
        Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.Pfad = 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)
+        Me.dgvSendungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
        Me.txtBezeichnung = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.txtAbfertigungsnummer = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.txtLKWNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.dgvAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.dgvAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+        Me.CheckBox2 = New System.Windows.Forms.CheckBox()
+        Me.CheckBox3 = New System.Windows.Forms.CheckBox()
        Me.usrcntrVermerke = New AVISO.rCntrlVermerke()
        CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.dgvSendungen, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -451,6 +452,28 @@ Partial Class frmAvisoAnfuegen
        Me.dgvAviso.Size = New System.Drawing.Size(700, 245)
        Me.dgvAviso.TabIndex = 6
        '
+        'CheckBox2
+        '
+        Me.CheckBox2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.CheckBox2.AutoSize = True
+        Me.CheckBox2.Location = New System.Drawing.Point(15, 932)
+        Me.CheckBox2.Name = "CheckBox2"
+        Me.CheckBox2.Size = New System.Drawing.Size(41, 17)
+        Me.CheckBox2.TabIndex = 44
+        Me.CheckBox2.Text = "QS"
+        Me.CheckBox2.UseVisualStyleBackColor = True
+        '
+        'CheckBox3
+        '
+        Me.CheckBox3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.CheckBox3.AutoSize = True
+        Me.CheckBox3.Location = New System.Drawing.Point(74, 931)
+        Me.CheckBox3.Name = "CheckBox3"
+        Me.CheckBox3.Size = New System.Drawing.Size(41, 17)
+        Me.CheckBox3.TabIndex = 45
+        Me.CheckBox3.Text = "VG"
+        Me.CheckBox3.UseVisualStyleBackColor = True
+        '
        'usrcntrVermerke
        '
        Me.usrcntrVermerke.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
@@ -467,6 +490,8 @@ Partial Class frmAvisoAnfuegen
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.White
        Me.ClientSize = New System.Drawing.Size(727, 961)
+        Me.Controls.Add(Me.CheckBox3)
+        Me.Controls.Add(Me.CheckBox2)
        Me.Controls.Add(Me.usrcntrVermerke)
        Me.Controls.Add(Me.btnVermerke)
        Me.Controls.Add(Me.Label5)
@@ -534,4 +559,6 @@ Partial Class frmAvisoAnfuegen
    Friend WithEvents Label5 As Windows.Forms.Label
    Friend WithEvents btnVermerke As Windows.Forms.Button
    Friend WithEvents usrcntrVermerke As AVISO.rCntrlVermerke
+    Friend WithEvents CheckBox2 As Windows.Forms.CheckBox
+    Friend WithEvents CheckBox3 As Windows.Forms.CheckBox
 End Class
--- a/VERAGAddIn/frmAvisoAnfügen.vb
+++ b/VERAGAddIn/frmAvisoAnfügen.vb
@@ -1,5 +1,7 @@
 Imports System.Diagnostics
 Imports System.Windows.Forms
+Imports AVISO
+Imports VERAG_PROG_ALLGEMEIN
 Imports VERAG_PROG_ALLGEMEIN.VERAG_OUT_EZA

 Public Class frmAvisoAnfuegen
@@ -282,17 +284,48 @@ Public Class frmAvisoAnfuegen
        If dgvSendungen.SelectedRows.Count > 0 Then
            btnVermerke.Enabled = True
            Me.SendungsId = dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value
+            Dim SENDUNG_TMP = New VERAG_PROG_ALLGEMEIN.cSendungen(SendungsId)
            Dim AVISO = VERAG_PROG_ALLGEMEIN.cAviso.getAvisoById(dgvSendungen.SelectedRows(0).Cells("tblSnd_AvisoID").Value)
            If AVISO IsNot Nothing Then
                usrcntrVermerke.init(AVISO, SendungsId)
+
+                If SENDUNG_TMP IsNot Nothing Then
+
+                    CheckBox3.Checked = IIf(SENDUNG_TMP.tblSnd_Vorgeschrieben = Nothing, False, True)
+                    CheckBox2.Checked = IIf(SENDUNG_TMP.tblSnd_Vorbereitet = Nothing, False, True)
+                    CheckBox3.Enabled = True
+                    CheckBox2.Enabled = True
+                End If
+
+            Else
+                btnVermerke.Enabled = False
+                CheckBox3.Enabled = False
+                CheckBox2.Enabled = False
+                usrcntrVermerke.init(Nothing, -1)
            End If
-        Else
-            btnVermerke.Enabled = False
-            usrcntrVermerke.init(Nothing, -1)
        End If

+
    End Sub
    Private Sub dgvSendungen_SelectionChanged(sender As Object, e As EventArgs) Handles dgvSendungen.SelectionChanged
        initVermerke()
    End Sub
+
+    Private Sub CheckBox3_Click(sender As Object, e As EventArgs) Handles CheckBox3.Click, CheckBox2.Click
+        If dgvSendungen.SelectedRows.Count > 0 Then
+            Me.SendungsId = dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value
+            Dim AVISO = VERAG_PROG_ALLGEMEIN.cAviso.getAvisoById(dgvSendungen.SelectedRows(0).Cells("tblSnd_AvisoID").Value)
+            If AVISO IsNot Nothing Then
+                Dim FUNC As New AvisoStatusFunctions
+
+                Select Case sender.Name
+                    Case "CheckBox3" : FUNC.setSendungVorgeschrieben(SendungsId, AVISO.AvisoID) : initVermerke()
+                    Case "CheckBox2" : FUNC.setSendungVorbereitetQS(SendungsId, AVISO.AvisoID) : initVermerke()
+                End Select
+
+            End If
+        End If
+
+
+    End Sub
 End Class
--- a/VERAGAddIn/rbnMailItem.Designer.vb
+++ b/VERAGAddIn/rbnMailItem.Designer.vb
@@ -41,6 +41,7 @@
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
        Me.Tab1 = Me.Factory.CreateRibbonTab
        Me.Group1 = Me.Factory.CreateRibbonGroup
        Me.Button1 = Me.Factory.CreateRibbonButton
@@ -51,7 +52,7 @@
        Me.btnGestellungsgarantien = Me.Factory.CreateRibbonButton
        Me.btnInfo = Me.Factory.CreateRibbonButton
        Me.btnUnsichtbar = Me.Factory.CreateRibbonButton
-        Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon()
+        Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components)
        Me.Tab1.SuspendLayout()
        Me.Group1.SuspendLayout()
        Me.SuspendLayout()
--- a/VERAGAddIn/rbnVERAG.vb
+++ b/VERAGAddIn/rbnVERAG.vb
@@ -145,6 +145,7 @@ Public Class AVISO_Mail_Functions
                    strFileName = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(strFileName)
                    strFileName = strFileName.Replace("?", "")
                    strFileName = strFileName.Replace(".", "")
+                    strFileName = strFileName.Replace("<EFBFBD>", "")
                    strFileName &= ".msg"
                End If
                'Dim strFileName As String = "Mail.msg"