Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO

2023-10-17 10:32:13 +02:00
parent ac51434fa1 e22d1298cd
commit 96c919d669
2 changed files with 96 additions and 34 deletions
--- a/Aviso/frmATEZ_NCTS.Designer.vb
+++ b/Aviso/frmATEZ_NCTS.Designer.vb
@@ -64,14 +64,16 @@ Partial Class frmATEZ_NCTS
        Me.Label4 = New System.Windows.Forms.Label()
        Me.sbBestimmungsZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox()
        Me.Label3 = New System.Windows.Forms.Label()
-        Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.Label9 = New System.Windows.Forms.Label()
        Me.sbAbgangZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox()
        Me.txtDyMandant = New System.Windows.Forms.Label()
        Me.Label1 = New System.Windows.Forms.Label()
        Me.txtDyNiederlassung = New System.Windows.Forms.Label()
        Me.lblBezugsnummer = New System.Windows.Forms.Label()
+        Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.Label10 = New System.Windows.Forms.Label()
+        Me.lblAnh = New System.Windows.Forms.Label()
        Me.pnlHead.SuspendLayout()
        CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
@@ -852,29 +854,6 @@ Partial Class frmATEZ_NCTS
        Me.Label3.TabIndex = 113
        Me.Label3.Text = "LKW-KZ:"
        '
-        'dgvAnhaenge
-        '
-        Me.dgvAnhaenge.AKTUALISIERUNGS_INTERVALL = -1
-        Me.dgvAnhaenge.AllowUserToAddRows = False
-        Me.dgvAnhaenge.AllowUserToDeleteRows = False
-        Me.dgvAnhaenge.AllowUserToResizeColumns = False
-        Me.dgvAnhaenge.AllowUserToResizeRows = False
-        Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White
-        Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.columnName})
-        Me.dgvAnhaenge.Location = New System.Drawing.Point(3, 609)
-        Me.dgvAnhaenge.Name = "dgvAnhaenge"
-        Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvAnhaenge.Size = New System.Drawing.Size(478, 158)
-        Me.dgvAnhaenge.TabIndex = 112
-        '
-        'columnName
-        '
-        Me.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        Me.columnName.HeaderText = "Name"
-        Me.columnName.Name = "columnName"
-        Me.columnName.ReadOnly = True
-        '
        'Label9
        '
        Me.Label9.Location = New System.Drawing.Point(10, 103)
@@ -950,12 +929,56 @@ Partial Class frmATEZ_NCTS
        Me.lblBezugsnummer.Text = "4800/000000/17 AAA"
        Me.lblBezugsnummer.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        '
+        'dgvAnhaenge
+        '
+        Me.dgvAnhaenge.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvAnhaenge.AllowUserToAddRows = False
+        Me.dgvAnhaenge.AllowUserToDeleteRows = False
+        Me.dgvAnhaenge.AllowUserToResizeColumns = False
+        Me.dgvAnhaenge.AllowUserToResizeRows = False
+        Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White
+        Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.columnName})
+        Me.dgvAnhaenge.Location = New System.Drawing.Point(3, 609)
+        Me.dgvAnhaenge.Name = "dgvAnhaenge"
+        Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.dgvAnhaenge.Size = New System.Drawing.Size(478, 158)
+        Me.dgvAnhaenge.TabIndex = 112
+        '
+        'columnName
+        '
+        Me.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.columnName.HeaderText = "Name"
+        Me.columnName.Name = "columnName"
+        Me.columnName.ReadOnly = True
+        '
+        'Label10
+        '
+        Me.Label10.BackColor = System.Drawing.Color.Transparent
+        Me.Label10.Location = New System.Drawing.Point(340, 772)
+        Me.Label10.Name = "Label10"
+        Me.Label10.Size = New System.Drawing.Size(84, 14)
+        Me.Label10.TabIndex = 115
+        Me.Label10.Text = "mark. Anhänge"
+        Me.Label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        '
+        'lblAnh
+        '
+        Me.lblAnh.BackColor = System.Drawing.Color.Transparent
+        Me.lblAnh.Location = New System.Drawing.Point(438, 772)
+        Me.lblAnh.Name = "lblAnh"
+        Me.lblAnh.Size = New System.Drawing.Size(38, 20)
+        Me.lblAnh.TabIndex = 116
+        Me.lblAnh.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        '
        'frmATEZ_NCTS
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
        Me.ClientSize = New System.Drawing.Size(484, 819)
+        Me.Controls.Add(Me.lblAnh)
+        Me.Controls.Add(Me.Label10)
        Me.Controls.Add(Me.pnlHead)
        Me.Controls.Add(Me.Button1)
        Me.Controls.Add(Me.dgvAnhaenge)
@@ -1017,4 +1040,6 @@ Partial Class frmATEZ_NCTS
    Friend WithEvents lblBezugsnummer As Label
    Friend WithEvents Label2 As Label
    Friend WithEvents cboProzedur As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label10 As Label
+    Friend WithEvents lblAnh As Label
 End Class
--- a/Aviso/frmATEZ_NCTS.vb
+++ b/Aviso/frmATEZ_NCTS.vb
@@ -425,6 +425,8 @@ Public Class frmATEZ_NCTS
    Sub initAttachment()
        Dim hSQL As String = " SELECT [anh_id],anh_Datum,[anh_Name],[anh_docId],

+                                                case WHEN [anh_size] > 0 Then ROUND([anh_size] / 1000000,2) End as anh_size,
+
                                                CASE WHEN  [anh_Art] = 'ATR-EUR1' then 'EUR'
                                                when [anh_Art] = 'Rechnung' then 'INVOICE'
                                                when [anh_Art] = 'eFatura' then 'INVOICE'
@@ -487,15 +489,31 @@ Public Class frmATEZ_NCTS
            .Columns("anh_Typ").HeaderText = "Typ"
            .Columns("anh_Typ").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter

+            .Columns("anh_size").Width = 60
+            .Columns("anh_size").HeaderText = "Größe in MB"
+            .Columns("anh_size").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+
        End With

+        For Each doc As DataGridViewRow In dgvAnhaenge.Rows
+
+            If Not IsDBNull(doc.Cells("anh_size").Value) AndAlso doc.Cells("anh_size").Value > 0 Then
+                Dim size = (doc.Cells("anh_size").Value)
+                If size < 1 Then
+                    doc.DefaultCellStyle.BackColor = Color.LightGreen
+                ElseIf size > 1 AndAlso size < 5 Then
+                    doc.DefaultCellStyle.BackColor = Color.LightYellow
+                Else
+                    doc.DefaultCellStyle.BackColor = Color.IndianRed
+                End If
+            End If
+
+        Next
+
        If atez_data IsNot Nothing AndAlso atez_data.selectedDocuments <> "" Then

            For Each doc As DataGridViewRow In dgvAnhaenge.Rows
-
-                If atez_data.selectedDocuments.Contains(doc.Cells("anh_docId").Value) Then
-                    doc.Cells("anh_selekt").Value = True
-                End If
+                If atez_data.selectedDocuments.Contains(doc.Cells("anh_docId").Value) Then doc.Cells("anh_selekt").Value = True

            Next
        End If
@@ -573,11 +591,12 @@ Public Class frmATEZ_NCTS
            If selectedDocuments Then Exit For
        Next

-        If Not selectedDocuments Then
-            lblInfo.Text = "kein Anhang selektiert"
-            Cursor = Cursors.Default
-            Return selectedDocuments
-        End If
+        'auskommentiert, weil Sendungen ohne ANhang auch geschickt werden sollen: M.Akceylan
+        'If Not selectedDocuments Then
+        '    lblInfo.Text = "kein Anhang selektiert"
+        '    Cursor = Cursors.Default
+        '    Return selectedDocuments
+        'End If

        Return selectedDocuments

@@ -668,4 +687,22 @@ Public Class frmATEZ_NCTS
        If sbRoute8._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute8._value)
        If sbRoute9._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute9._value)
    End Sub
+
+
+
+    Private Sub dgvAnhaenge_CurrentCellChanged(sender As Object, e As EventArgs) Handles dgvAnhaenge.CurrentCellDirtyStateChanged
+        Dim countAnh As Double = 0
+
+
+        If dgvAnhaenge.CurrentRow.Cells("anh_size").Value > 0 Then countAnh += dgvAnhaenge.CurrentRow.Cells("anh_size").Value
+
+        For Each Row As DataGridViewRow In dgvAnhaenge.Rows
+            If Row.Cells("anh_selekt").Value IsNot DBNull.Value AndAlso Row.Cells("anh_selekt").Value = True AndAlso Row.Cells("anh_size").Value IsNot DBNull.Value Then
+                countAnh += Row.Cells("anh_size").Value
+            End If
+
+        Next
+
+        lblAnh.Text = countAnh.ToString
+    End Sub
 End Class