CMR AnhangCMR Anhang

This commit is contained in:
2024-08-12 10:39:14 +02:00
parent f096b224b2
commit 2a8c779333
4 changed files with 496 additions and 403 deletions

View File

@@ -504,29 +504,11 @@ Public Class usrcntlAktDetailsATILLANeu
End Sub
Sub initAnhaenge()
Dim hSQL As String = " SELECT [anh_id],anh_Datum,[anh_Name],[anh_docId],[anh_Art],[anh_Typ] FROM [tblAvisoAnhaenge]
Dim hSQL As String = "SELECT [anh_id],[anh_Name],anh_Datum,[anh_docId], [anh_Art],[anh_Typ], anh_cmrId
FROM [tblAvisoAnhaenge]
left join tblAvisoAnhangsArten on aa_bezeichnung = anh_Art
WHERE [anh_AvisoId]='" & AvisoID & "' AND isnull(anh_SendungsId,0) <=0
ORDER BY
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_Datum desc, [anh_id]"
ORDER BY anh_SendungsId desc, case when aa_sort = NULL THEN 15 else aa_sort END, [anh_Reihenfolge],[anh_id]"
' order by [anh_Reihenfolge],[anh_id]
dgvanhaenge.DataSource = VermerkeDAL.Anzeigen_Vermerke(hSQL)
@@ -539,7 +521,8 @@ Public Class usrcntlAktDetailsATILLANeu
.RowTemplate.MinimumHeight = 30
.AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.AllCells
.Columns("anh_id").Visible = False 'VermerkID nicht anzeigenconMenuVermerke
.Columns("anh_docId").Visible = False 'AvisoID nicht anzeigen
.Columns("anh_docId").Visible = False
.Columns("anh_cmrId").Visible = False 'AvisoID nicht anzeigen
.Columns("anh_Datum").MinimumWidth = 50
.Columns("anh_Datum").HeaderText = "Datum"
@@ -558,6 +541,27 @@ Public Class usrcntlAktDetailsATILLANeu
.Columns("anh_Typ").HeaderText = "Typ"
.Columns("anh_Art").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
If .Columns("isCMR") Is Nothing Then
Dim c As New DataGridViewImageColumn
c.Name = "isCMR" : c.HeaderText = "CMR"
c.Image = New Bitmap(1, 1)
c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White
.Columns.Add(c)
End If
For Each row As DataGridViewRow In dgvanhaenge.Rows
If Not IsDBNull(row.Cells("anh_cmrId").Value) Then
If row.Cells("anh_cmrId").Value > 0 Then DirectCast(row.Cells("isCMR"), DataGridViewImageCell).Value = My.Resources.stift
End If
Next
.ClearSelection()
End With
End Sub
@@ -565,21 +569,56 @@ Public Class usrcntlAktDetailsATILLANeu
Try
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()
File.Copy(docPath, docPathTMP)
Process.Start(docPathTMP)
Else
Process.Start(docPath)
If dgvanhaenge.Columns(e.ColumnIndex).Name = "isCMR" Then
If Not IsDBNull(dgvanhaenge.SelectedRows(0).Cells("anh_cmrId").Value) AndAlso dgvanhaenge.SelectedRows(0).Cells("anh_cmrId").Value > 0 Then
Dim cmrId As Integer = dgvanhaenge.SelectedRows(0).Cells("anh_cmrId").Value
Dim f As New SDL.frmCMR(cmrId, dgvanhaenge.SelectedRows(0).Cells("anh_docId").Value, dgvanhaenge.SelectedRows(0).Cells("anh_id").Value)
f.btnCMRtoAkt.Visible = True
f.txtCMRName.Visible = True
f.btnSaveVorlage.Visible = False 'aus dieser Ansicht keine Vorlagen speichern!
If f.ShowDialog(Me) = DialogResult.OK Then
If f.ueberschreiben Then
Dim da_id = -1
Dim anhId = -1
Dim destPath = ""
Dim Typ = ""
If f.PDF_Path <> "" Then
Dim CMRName = If(f.txtCMRName.Text <> "", f.txtCMRName.Text, "CMR")
frmSendungAnhangImport.saveToDS(AvisoID, CMRName, f.PDF_Path, "CMR", "PDF", da_id, anhId, destPath,, f.CMR.CMR_ID)
initAnhaenge()
End If
End If
End If
End If
Else
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()
File.Copy(docPath, docPathTMP)
Process.Start(docPathTMP)
Else
Process.Start(docPath)
End If
End If
End If
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
End Try
@@ -1611,7 +1650,7 @@ Public Class usrcntlAktDetailsATILLANeu
If f.PDF_Path <> "" Then
Dim CMRName = If(f.txtCMRName.Text <> "", f.txtCMRName.Text, "CMR")
frmSendungAnhangImport.saveToDS(AvisoID, CMRName, f.PDF_Path, "CMR", "PDF", da_id, anhId, destPath)
frmSendungAnhangImport.saveToDS(AvisoID, CMRName, f.PDF_Path, "CMR", "PDF", da_id, anhId, destPath,, f.CMR.CMR_ID)
initAnhaenge()
End If