This commit is contained in:
2023-10-17 11:08:47 +02:00
parent e22d1298cd
commit 13b726a3a0
2 changed files with 142 additions and 98 deletions

View File

@@ -96,10 +96,10 @@ Public Class frmATEZ_NCTS
Exit Sub
End If
If Not checkAttachment() Then
Exit Sub
End If
'auskommentiert, weil Sendungen ohne ANhang auch geschickt werden sollen: M.Akceylan
'If Not checkAttachment() Then
' Exit Sub
'End If
If Not checkMandatoryField() Then
@@ -445,8 +445,28 @@ Public Class frmATEZ_NCTS
when [anh_Art] = 'Sonstiges' then 'OTHER'
when [anh_Art] ='' then 'OTHER' End
[anh_Art],[anh_Typ] FROM [tblAvisoAnhaenge]
WHERE [anh_AvisoId]='" & AVISO.AvisoID & "' AND isnull(anh_SendungsId,0) <= 0 And anh_Typ = 'PDF'
Order BY [anh_Reihenfolge], anh_Datum desc, [anh_id]"
WHERE [anh_AvisoId]=" & AVISO.AvisoID & "AND (anh_SendungsId is null OR anh_SendungsId <=0 OR anh_SendungsId=733587) And anh_Typ = 'PDF'
ORDER BY anh_SendungsId desc,
case
when [anh_Art] = 'ATR-EUR1' then 0
when [anh_Art] = 'Rechnung' then 1
when [anh_Art] = 'eFatura' then 1.1
when [anh_Art] = 'CMR' then 2
when [anh_Art] = 'Ausfuhr' then 3
when [anh_Art] = 'Vorpapier' then 4
when [anh_Art] = 'Packliste' then 5
when [anh_Art] = 'Auftrag' then 6
when [anh_Art] = 'Auftrag' then 7
when [anh_Art] = 'Dispoliste' then 8
when [anh_Art] = 'Vorkasse' then 9
when [anh_Art] = 'Überweisungsbeleg' then 10
when [anh_Art] = 'Vollmacht' then 11
when [anh_Art] = 'ATB' then 12
when [anh_Art] = 'ATA' then 13
when [anh_Art] = 'Sonstiges' then 99
when [anh_Art] ='' then 15
END, [anh_Reihenfolge],[anh_id]"
Dim dt = VermerkeDAL.Anzeigen_Vermerke(hSQL)
@@ -455,7 +475,6 @@ Public Class frmATEZ_NCTS
col.SetOrdinal(0)
dgvAnhaenge.Columns.Clear()
dgvAnhaenge.DataSource = dt
If dgvAnhaenge.RowCount = 0 Then dgvAnhaenge.Columns.Clear() : Exit Sub
With dgvAnhaenge
@@ -468,30 +487,35 @@ Public Class frmATEZ_NCTS
.Columns("anh_id").Visible = False 'VermerkID nicht anzeigenconMenuVermerke
.Columns("anh_docId").Visible = False 'AvisoID nicht anzeigen
.Columns("anh_selekt").MinimumWidth = 10
.Columns("anh_selekt").HeaderText = "ausgewählt"
.Columns("anh_selekt").Width = 25
.Columns("anh_selekt").HeaderText = ""
.Columns("anh_selekt").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
.Columns("anh_Datum").MinimumWidth = 50
.Columns("anh_Datum").HeaderText = "Datum"
.Columns("anh_Datum").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
.Columns("anh_Datum").ReadOnly = True
.Columns("anh_Name").MinimumWidth = 150
.Columns("anh_Name").HeaderText = "Name"
.Columns("anh_Name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns("anh_Name").ReadOnly = True
.Columns("anh_Art").MinimumWidth = 50
.Columns("anh_Art").HeaderText = "Art"
.Columns("anh_Art").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
.Columns("anh_Art").ReadOnly = True
.Columns("anh_Typ").Width = 60
.Columns("anh_Typ").Width = 50
.Columns("anh_Typ").HeaderText = "Typ"
.Columns("anh_Typ").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
.Columns("anh_Typ").ReadOnly = True
.Columns("anh_size").Width = 60
.Columns("anh_size").Width = 50
.Columns("anh_size").HeaderText = "Größe in MB"
.Columns("anh_size").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
.Columns("anh_size").ReadOnly = True
End With
@@ -591,12 +615,12 @@ Public Class frmATEZ_NCTS
If selectedDocuments Then Exit For
Next
'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
If Not selectedDocuments Then
lblInfo.Text = "kein Anhang selektiert"
Cursor = Cursors.Default
Return selectedDocuments
End If
Return selectedDocuments
@@ -688,21 +712,55 @@ Public Class frmATEZ_NCTS
If sbRoute9._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute9._value)
End Sub
Private Sub dgvAnhaenge_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvAnhaenge.CellDoubleClick
Try
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
If dgvAnhaenge.SelectedRows.Count > 0 Then
Dim docPath = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(dgvAnhaenge.SelectedRows(0).Cells("anh_docId").Value)
If Not IO.File.Exists(docPath) Then
MsgBox("Die Datei existiert nicht!")
Else
If docPath.ToString.ToLower.EndsWith(".msg") Then ' MSG - Mails --> lokale Kopie, sonst Fehler (bereits von Benutzer soUndSo geöffnet)
Dim docPathTMP = VERAG_PROG_ALLGEMEIN.cFormularManager.getTMPPath_MSG()
System.IO.File.Copy(docPath, docPathTMP)
Process.Start(docPathTMP)
Else
Process.Start(docPath)
End If
End If
End If
Next
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
Private Sub dgvAnhaenge_CellClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvAnhaenge.CellClick
Dim countAnh As Double = 0
If dgvAnhaenge.RowCount > 0 Then
If dgvAnhaenge.Columns(e.ColumnIndex).Name = "anh_selekt" Then
If Not IsDBNull(dgvAnhaenge.CurrentRow.Cells("anh_selekt").Value) AndAlso dgvAnhaenge.CurrentRow.Cells("anh_selekt").Value = True Then
countAnh += dgvAnhaenge.CurrentRow.Cells("anh_size").Value
End If
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 = "Anhang in MB: " & countAnh.ToString
End If
End If
lblAnh.Text = countAnh.ToString
End Sub
End Class