Vermerke

2024-06-06 22:23:18 +02:00
parent f04d2a7d92
commit 58300fd00b
5 changed files with 93 additions and 89 deletions
--- a/VERAGAddIn/ThisAddIn.vb
+++ b/VERAGAddIn/ThisAddIn.vb
@@ -182,12 +182,12 @@ Public Class ThisAddIn

    Private Sub checkConnection()

-        Dim con = New SQL
+        Dim SQL = New VERAG_PROG_ALLGEMEIN.SQL

        For Each COMAddIn As COMAddIn In Me.Application.COMAddIns

            If COMAddIn.ProgId.Contains("VERAGAddIn") Then
-                If con.getValueTxtBySql("SELECT 1", "AVISO") <> 1 Then
+                If SQL.getValueTxtBySql("SELECT 1", "AVISO") <> 1 Then
                    MsgBox("ACHTUNG: Server nicht erreichbar!" & vbCrLf & "VERAG ADD In wird beendet")
                    COMAddIn.Connect = False
                End If
--- a/VERAGAddIn/VERAGAddIn.vbproj
+++ b/VERAGAddIn/VERAGAddIn.vbproj
@@ -159,10 +159,6 @@
  -->
  <ItemGroup>
    <Reference Include="Accessibility" />
-    <Reference Include="AVISO, Version=3.9.7.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Aviso\AVISO\Aviso\bin\Debug\AVISO.exe</HintPath>
-    </Reference>
    <Reference Include="Microsoft.Office.Tools.Outlook.v4.0.Utilities, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
    <Reference Include="System" />
    <Reference Include="System.Data" />
@@ -353,6 +349,10 @@
      <Project>{5b947a66-009a-4bb6-b925-f84a01045095}</Project>
      <Name>TELOTEC_Worker_lib</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\AVISO\Aviso\Aviso\Aviso.vbproj">
+      <Project>{7bdd8c2f-2c9e-49f1-a365-3b1da1c84991}</Project>
+      <Name>Aviso</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\AVISO\Aviso\Gemeinsames\Gemeinsames.vbproj">
      <Project>{110c923b-cb02-4fd0-af24-95e0f0eeeff5}</Project>
      <Name>Gemeinsames</Name>
--- a/VERAGAddIn/frmAvisoAnfügen.Designer.vb
+++ b/VERAGAddIn/frmAvisoAnfügen.Designer.vb
@@ -47,15 +47,14 @@ Partial Class frmAvisoAnfuegen
        Me.txtLKWNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.dgvAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Label4 = New System.Windows.Forms.Label()
-        Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Label5 = New System.Windows.Forms.Label()
        Me.Button2 = New System.Windows.Forms.Button()
        Me.bttnSaveMail = New System.Windows.Forms.Button()
        Me.btnSaveAttachments = New System.Windows.Forms.Button()
+        Me.usrcntrVermerke = New AVISO.rCntrlVermerke()
        CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.dgvSendungen, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.dgvAviso, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'lbl
@@ -63,7 +62,7 @@ Partial Class frmAvisoAnfuegen
        Me.lbl.AutoSize = True
        Me.lbl.Location = New System.Drawing.Point(12, 9)
        Me.lbl.Name = "lbl"
-        Me.lbl.Size = New System.Drawing.Size(36, 15)
+        Me.lbl.Size = New System.Drawing.Size(34, 13)
        Me.lbl.TabIndex = 0
        Me.lbl.Text = "LKW:"
        '
@@ -74,7 +73,7 @@ Partial Class frmAvisoAnfuegen
        Me.Label14.ForeColor = System.Drawing.Color.Black
        Me.Label14.Location = New System.Drawing.Point(12, 51)
        Me.Label14.Name = "Label14"
-        Me.Label14.Size = New System.Drawing.Size(44, 17)
+        Me.Label14.Size = New System.Drawing.Size(33, 13)
        Me.Label14.TabIndex = 2
        Me.Label14.Text = "Filiale"
        '
@@ -85,7 +84,7 @@ Partial Class frmAvisoAnfuegen
        Me.Label13.ForeColor = System.Drawing.Color.Black
        Me.Label13.Location = New System.Drawing.Point(97, 51)
        Me.Label13.Name = "Label13"
-        Me.Label13.Size = New System.Drawing.Size(139, 17)
+        Me.Label13.Size = New System.Drawing.Size(103, 13)
        Me.Label13.TabIndex = 3
        Me.Label13.Text = "Abfertigungsnummer"
        '
@@ -105,7 +104,7 @@ Partial Class frmAvisoAnfuegen
        Me.Label2.AutoSize = True
        Me.Label2.Location = New System.Drawing.Point(12, 545)
        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(128, 15)
+        Me.Label2.Size = New System.Drawing.Size(112, 13)
        Me.Label2.TabIndex = 12
        Me.Label2.Text = "Anhang-Bezeichnung:"
        '
@@ -117,7 +116,7 @@ Partial Class frmAvisoAnfuegen
        Me.lblErr_Bezeichnung.ForeColor = System.Drawing.Color.Red
        Me.lblErr_Bezeichnung.Location = New System.Drawing.Point(434, 524)
        Me.lblErr_Bezeichnung.Name = "lblErr_Bezeichnung"
-        Me.lblErr_Bezeichnung.Size = New System.Drawing.Size(134, 15)
+        Me.lblErr_Bezeichnung.Size = New System.Drawing.Size(117, 13)
        Me.lblErr_Bezeichnung.TabIndex = 14
        Me.lblErr_Bezeichnung.Text = "Bezeichnung angeben!"
        Me.lblErr_Bezeichnung.Visible = False
@@ -130,7 +129,7 @@ Partial Class frmAvisoAnfuegen
        Me.lblErr_Aviso.ForeColor = System.Drawing.Color.Red
        Me.lblErr_Aviso.Location = New System.Drawing.Point(222, 524)
        Me.lblErr_Aviso.Name = "lblErr_Aviso"
-        Me.lblErr_Aviso.Size = New System.Drawing.Size(101, 15)
+        Me.lblErr_Aviso.Size = New System.Drawing.Size(90, 13)
        Me.lblErr_Aviso.TabIndex = 15
        Me.lblErr_Aviso.Text = "Aviso auswählen!"
        Me.lblErr_Aviso.Visible = False
@@ -143,7 +142,7 @@ Partial Class frmAvisoAnfuegen
        Me.Label1.ForeColor = System.Drawing.Color.Black
        Me.Label1.Location = New System.Drawing.Point(12, 597)
        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(110, 17)
+        Me.Label1.Size = New System.Drawing.Size(84, 13)
        Me.Label1.TabIndex = 17
        Me.Label1.Text = "Such-Datum ab:"
        '
@@ -153,7 +152,7 @@ Partial Class frmAvisoAnfuegen
        Me.Label3.AutoSize = True
        Me.Label3.Location = New System.Drawing.Point(12, 570)
        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(63, 15)
+        Me.Label3.Size = New System.Drawing.Size(55, 13)
        Me.Label3.TabIndex = 19
        Me.Label3.Text = "Kategorie:"
        '
@@ -163,9 +162,9 @@ Partial Class frmAvisoAnfuegen
        Me.cbx.AutoSize = True
        Me.cbx.Checked = True
        Me.cbx.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.cbx.Location = New System.Drawing.Point(451, 648)
+        Me.cbx.Location = New System.Drawing.Point(451, 650)
        Me.cbx.Name = "cbx"
-        Me.cbx.Size = New System.Drawing.Size(206, 19)
+        Me.cbx.Size = New System.Drawing.Size(179, 17)
        Me.cbx.TabIndex = 22
        Me.cbx.Text = "Anhänge zusätzlich abspeichern"
        Me.cbx.UseVisualStyleBackColor = True
@@ -176,9 +175,9 @@ Partial Class frmAvisoAnfuegen
        Me.CheckBox1.AutoSize = True
        Me.CheckBox1.Checked = True
        Me.CheckBox1.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.CheckBox1.Location = New System.Drawing.Point(15, 648)
+        Me.CheckBox1.Location = New System.Drawing.Point(15, 650)
        Me.CheckBox1.Name = "CheckBox1"
-        Me.CheckBox1.Size = New System.Drawing.Size(135, 19)
+        Me.CheckBox1.Size = New System.Drawing.Size(118, 17)
        Me.CheckBox1.TabIndex = 23
        Me.CheckBox1.Text = "Anhänge speichern"
        Me.CheckBox1.UseVisualStyleBackColor = True
@@ -233,7 +232,7 @@ Partial Class frmAvisoAnfuegen
        Me.cboArt.FormattingEnabled = True
        Me.cboArt.Location = New System.Drawing.Point(133, 562)
        Me.cboArt.Name = "cboArt"
-        Me.cboArt.Size = New System.Drawing.Size(497, 33)
+        Me.cboArt.Size = New System.Drawing.Size(497, 28)
        Me.cboArt.TabIndex = 20
        '
        'txtSrchDat
@@ -258,7 +257,7 @@ Partial Class frmAvisoAnfuegen
        Me.txtSrchDat.MaxLines_Warning = ""
        Me.txtSrchDat.MaxLines_Warning_Label = Nothing
        Me.txtSrchDat.Name = "txtSrchDat"
-        Me.txtSrchDat.Size = New System.Drawing.Size(100, 29)
+        Me.txtSrchDat.Size = New System.Drawing.Size(100, 24)
        Me.txtSrchDat.TabIndex = 18
        '
        'dgvSendungen
@@ -272,13 +271,13 @@ Partial Class frmAvisoAnfuegen
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.dgvSendungen.BackgroundColor = System.Drawing.Color.White
        Me.dgvSendungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvSendungen.Location = New System.Drawing.Point(15, 408)
+        Me.dgvSendungen.Location = New System.Drawing.Point(15, 341)
        Me.dgvSendungen.Name = "dgvSendungen"
        Me.dgvSendungen.ReadOnly = True
        Me.dgvSendungen.RowHeadersVisible = False
        Me.dgvSendungen.RowHeadersWidth = 51
        Me.dgvSendungen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvSendungen.Size = New System.Drawing.Size(615, 107)
+        Me.dgvSendungen.Size = New System.Drawing.Size(615, 180)
        Me.dgvSendungen.TabIndex = 16
        '
        'txtBezeichnung
@@ -303,7 +302,7 @@ Partial Class frmAvisoAnfuegen
        Me.txtBezeichnung.MaxLines_Warning = ""
        Me.txtBezeichnung.MaxLines_Warning_Label = Nothing
        Me.txtBezeichnung.Name = "txtBezeichnung"
-        Me.txtBezeichnung.Size = New System.Drawing.Size(497, 26)
+        Me.txtBezeichnung.Size = New System.Drawing.Size(497, 23)
        Me.txtBezeichnung.TabIndex = 13
        '
        'txtAbfertigungsnummer
@@ -326,7 +325,7 @@ Partial Class frmAvisoAnfuegen
        Me.txtAbfertigungsnummer.MaxLines_Warning = ""
        Me.txtAbfertigungsnummer.MaxLines_Warning_Label = Nothing
        Me.txtAbfertigungsnummer.Name = "txtAbfertigungsnummer"
-        Me.txtAbfertigungsnummer.Size = New System.Drawing.Size(400, 29)
+        Me.txtAbfertigungsnummer.Size = New System.Drawing.Size(400, 24)
        Me.txtAbfertigungsnummer.TabIndex = 5
        '
        'cboFiliale
@@ -339,7 +338,7 @@ Partial Class frmAvisoAnfuegen
        Me.cboFiliale.FormattingEnabled = True
        Me.cboFiliale.Location = New System.Drawing.Point(15, 67)
        Me.cboFiliale.Name = "cboFiliale"
-        Me.cboFiliale.Size = New System.Drawing.Size(80, 30)
+        Me.cboFiliale.Size = New System.Drawing.Size(80, 24)
        Me.cboFiliale.TabIndex = 4
        '
        'txtLKWNr
@@ -363,7 +362,7 @@ Partial Class frmAvisoAnfuegen
        Me.txtLKWNr.MaxLines_Warning = ""
        Me.txtLKWNr.MaxLines_Warning_Label = Nothing
        Me.txtLKWNr.Name = "txtLKWNr"
-        Me.txtLKWNr.Size = New System.Drawing.Size(486, 26)
+        Me.txtLKWNr.Size = New System.Drawing.Size(486, 23)
        Me.txtLKWNr.TabIndex = 1
        '
        'dgvAviso
@@ -383,7 +382,7 @@ Partial Class frmAvisoAnfuegen
        Me.dgvAviso.RowHeadersVisible = False
        Me.dgvAviso.RowHeadersWidth = 51
        Me.dgvAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvAviso.Size = New System.Drawing.Size(615, 314)
+        Me.dgvAviso.Size = New System.Drawing.Size(615, 245)
        Me.dgvAviso.TabIndex = 6
        '
        'Label4
@@ -393,30 +392,10 @@ Partial Class frmAvisoAnfuegen
        Me.Label4.ForeColor = System.Drawing.Color.Red
        Me.Label4.Location = New System.Drawing.Point(530, 4)
        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(123, 25)
+        Me.Label4.Size = New System.Drawing.Size(100, 20)
        Me.Label4.TabIndex = 39
        Me.Label4.Text = "Testsystem"
        '
-        'MyDatagridview1
-        '
-        Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1
-        Me.MyDatagridview1.AllowUserToAddRows = False
-        Me.MyDatagridview1.AllowUserToDeleteRows = False
-        Me.MyDatagridview1.AllowUserToResizeColumns = False
-        Me.MyDatagridview1.AllowUserToResizeRows = False
-        Me.MyDatagridview1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.MyDatagridview1.BackgroundColor = System.Drawing.Color.White
-        Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.MyDatagridview1.Location = New System.Drawing.Point(133, 817)
-        Me.MyDatagridview1.Name = "MyDatagridview1"
-        Me.MyDatagridview1.ReadOnly = True
-        Me.MyDatagridview1.RowHeadersVisible = False
-        Me.MyDatagridview1.RowHeadersWidth = 51
-        Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.MyDatagridview1.Size = New System.Drawing.Size(497, 107)
-        Me.MyDatagridview1.TabIndex = 40
-        '
        'Label5
        '
        Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
@@ -425,7 +404,7 @@ Partial Class frmAvisoAnfuegen
        Me.Label5.ForeColor = System.Drawing.Color.Black
        Me.Label5.Location = New System.Drawing.Point(12, 817)
        Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(73, 17)
+        Me.Label5.Size = New System.Drawing.Size(55, 13)
        Me.Label5.TabIndex = 41
        Me.Label5.Text = "Vermerke:"
        '
@@ -471,15 +450,23 @@ Partial Class frmAvisoAnfuegen
        Me.btnSaveAttachments.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.btnSaveAttachments.UseVisualStyleBackColor = True
        '
+        'usrcntrVermerke
+        '
+        Me.usrcntrVermerke.BackColor = System.Drawing.Color.White
+        Me.usrcntrVermerke.Location = New System.Drawing.Point(133, 817)
+        Me.usrcntrVermerke.Name = "usrcntrVermerke"
+        Me.usrcntrVermerke.Size = New System.Drawing.Size(497, 107)
+        Me.usrcntrVermerke.TabIndex = 43
+        '
        'frmAvisoAnfuegen
        '
        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(642, 936)
+        Me.Controls.Add(Me.usrcntrVermerke)
        Me.Controls.Add(Me.Button2)
        Me.Controls.Add(Me.Label5)
-        Me.Controls.Add(Me.MyDatagridview1)
        Me.Controls.Add(Me.Label4)
        Me.Controls.Add(Me.dgvAnhaenge)
        Me.Controls.Add(Me.cboArt)
@@ -511,7 +498,6 @@ Partial Class frmAvisoAnfuegen
        CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.dgvSendungen, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.dgvAviso, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -542,7 +528,7 @@ Partial Class frmAvisoAnfuegen
    Friend WithEvents Label4 As Windows.Forms.Label
    Friend WithEvents columnName As Windows.Forms.DataGridViewTextBoxColumn
    Friend WithEvents Pfad As Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents MyDatagridview1 As VERAG_PROG_ALLGEMEIN.MyDatagridview
    Friend WithEvents Label5 As Windows.Forms.Label
    Friend WithEvents Button2 As Windows.Forms.Button
+    Friend WithEvents usrcntrVermerke As AVISO.rCntrlVermerke
 End Class
--- a/VERAGAddIn/frmAvisoAnfügen.vb
+++ b/VERAGAddIn/frmAvisoAnfügen.vb
@@ -1,5 +1,6 @@
 Imports System.Diagnostics
 Imports System.Windows.Forms
+Imports VERAG_PROG_ALLGEMEIN.VERAG_OUT_EZA

 Public Class frmAvisoAnfuegen

@@ -8,6 +9,7 @@ Public Class frmAvisoAnfuegen
    Public Bezeichnung = ""
    Public PDF_MAIL = ""
    Public Art = ""
+    Dim VSQL As New VERAG_PROG_ALLGEMEIN.SQL

    Public ATT As List(Of String)

@@ -133,12 +135,13 @@ Public Class frmAvisoAnfuegen
                If AvisoId <= 0 Then Exit Sub
                Dim firma = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
                If firma = "" Then firma = "VERAG"
-                Dim sql = "SELECT [tblSnd_SendungID],[FilialenNr],[AbfertigungsNr],[tblSnd_Absender] as Absender,[tblSnd_Empfaenger] as Empfänger,[tblSnd_Auftraggeber] as Auftraggeber,[tblSnd_Colli] as Colli,[tblSnd_Gewicht] as Gewicht,[tblSnd_FremdspeditionText] as Fremd "
+                Dim sql = "SELECT [tblSnd_SendungID],[FilialenNr],[AbfertigungsNr],[tblSnd_Absender] as Absender,[tblSnd_Empfaenger] as Empfänger,[tblSnd_Auftraggeber] as Auftraggeber,[tblSnd_Colli] as Colli,[tblSnd_Gewicht] as Gewicht,[tblSnd_FremdspeditionText] as Fremd,tblSnd_AvisoID "
                sql &= " FROM [tblSendungen] where tblSnd_AvisoID=" & AvisoId

                .SET_SQL(sql, "AVISO")
                .LOAD()

+                .Columns("tblSnd_AvisoID").Visible = False
                .Columns("tblSnd_SendungID").Visible = False
                .AutoSizeColumnsMode = Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill

@@ -257,4 +260,35 @@ Public Class frmAvisoAnfuegen
        End Try

    End Sub
+
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+        If Me.SendungsId >= 0 Then
+
+            Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
+            Dim sv As New AVISO.frmAddSendungsvermerkShort(AvisoId, Me.SendungsId) ', dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value)
+            sv.Location = Me.PointToClient(Cursor.Position)
+            sv.ShowDialog(frmGrayOut)
+            frmGrayOut.Close()
+            sv.Close()
+
+            initVermerke()
+
+        End If
+    End Sub
+
+    Sub initVermerke()
+        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
+                usrcntrVermerke.init(AVISO, SendungsId)
+            End If
+        Else
+            usrcntrVermerke.init(Nothing, -1)
+        End If
+
+    End Sub
+    Private Sub dgvSendungen_SelectionChanged(sender As Object, e As EventArgs) Handles dgvSendungen.SelectionChanged
+        initVermerke()
+    End Sub
 End Class