From a4a7eb33514bcb08e189ac9334ad0d7d37ee4683 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 28 Aug 2024 08:47:38 +0200 Subject: [PATCH] ANhangsarten, addsendeungen, Anhangsimport --- Aviso/Anhänge/frmAddSendnung.vb | 2 +- Aviso/Anhänge/frmSendungAnhangImport.vb | 2 +- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/frmAvisoAnhangsarten.Designer.vb | 13 ++++- Aviso/frmAvisoAnhangsarten.vb | 53 ++++++++++++++++++- Aviso/usrcntlAktDetails.vb | 68 ++++++++++++++----------- 6 files changed, 106 insertions(+), 36 deletions(-) diff --git a/Aviso/Anhänge/frmAddSendnung.vb b/Aviso/Anhänge/frmAddSendnung.vb index 4d16505..b0cf2ce 100644 --- a/Aviso/Anhänge/frmAddSendnung.vb +++ b/Aviso/Anhänge/frmAddSendnung.vb @@ -40,7 +40,7 @@ Private Sub frmAddSendnung_Load(sender As Object, e As EventArgs) Handles Me.Load - Me.Text = frmName + 'Me.Text = frmName cboAbfertigungsart.fillWithSQL("SELECT [Abfertigungsart],[Abfertigungsbezeichnung] FROM [Abfertigungsarten] ", True, "FMZOLL", True) txtEmpfaenger.initKdBox(Me) diff --git a/Aviso/Anhänge/frmSendungAnhangImport.vb b/Aviso/Anhänge/frmSendungAnhangImport.vb index 4623550..e45fe8b 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.vb @@ -1738,7 +1738,7 @@ Public Class frmSendungAnhangImport If cboSendungen._value <> "" Then Dim SND As New VERAG_PROG_ALLGEMEIN.cSendungen(cboSendungen._value) If SND IsNot Nothing Then - Dim f As New frmAddSendnung(AvisoId, SND, "Sendung bearbeiten") + Dim f As New frmAddSendnung(AvisoId, SND) If f.ShowDialog(Me) = DialogResult.OK Then initSendungen() cboSendungen.changeItem(f.SendungsId) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index ac3dad7..96e4046 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmAvisoAnhangsarten.Designer.vb b/Aviso/frmAvisoAnhangsarten.Designer.vb index fa613a0..3cfbe0f 100644 --- a/Aviso/frmAvisoAnhangsarten.Designer.vb +++ b/Aviso/frmAvisoAnhangsarten.Designer.vb @@ -26,6 +26,7 @@ Partial Class frmAvisoAnhangsarten Me.btnOK = New System.Windows.Forms.Button() Me.Label2 = New System.Windows.Forms.Label() Me.txtSuche = New System.Windows.Forms.TextBox() + Me.Button1 = New System.Windows.Forms.Button() CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -46,7 +47,6 @@ Partial Class frmAvisoAnhangsarten Me.btnOK.TabIndex = 16 Me.btnOK.Text = "Speichern" Me.btnOK.UseVisualStyleBackColor = True - Me.btnOK.Visible = False ' 'Label2 ' @@ -64,11 +64,21 @@ Partial Class frmAvisoAnhangsarten Me.txtSuche.Size = New System.Drawing.Size(150, 20) Me.txtSuche.TabIndex = 18 ' + 'Button1 + ' + Me.Button1.Location = New System.Drawing.Point(605, 12) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(193, 23) + Me.Button1.TabIndex = 19 + Me.Button1.Text = "fehlende Anhangsarten" + Me.Button1.UseVisualStyleBackColor = True + ' 'frmAvisoAnhangsarten ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(810, 481) + Me.Controls.Add(Me.Button1) Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.txtSuche) Me.Controls.Add(Me.btnOK) @@ -85,4 +95,5 @@ Partial Class frmAvisoAnhangsarten Friend WithEvents btnOK As Button Friend WithEvents Label2 As Label Friend WithEvents txtSuche As TextBox + Friend WithEvents Button1 As Button End Class diff --git a/Aviso/frmAvisoAnhangsarten.vb b/Aviso/frmAvisoAnhangsarten.vb index d6d0a94..a09cd24 100644 --- a/Aviso/frmAvisoAnhangsarten.vb +++ b/Aviso/frmAvisoAnhangsarten.vb @@ -1,5 +1,8 @@ -Imports iText.Forms.Xfdf + +Imports DocumentFormat.OpenXml.Wordprocessing +Imports iText.Forms.Xfdf Imports iText.Kernel.Pdf +Imports System.Runtime.Remoting Imports System.Web.UI Public Class frmAvisoAnhangsarten @@ -92,6 +95,7 @@ Public Class frmAvisoAnhangsarten Try e.Row.Cells("aa_aktiv").Value = True + e.Row.Cells("aa_isBrexti").Value = False Catch ex As Exception MsgBox(ex.Message) @@ -110,6 +114,7 @@ Public Class frmAvisoAnhangsarten SPRACHENBind.updateBinding() End If + End Sub @@ -126,5 +131,51 @@ Public Class frmAvisoAnhangsarten End If End Sub + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + Dim sql As New VERAG_PROG_ALLGEMEIN.SQL + Dim dtAnhaenge As DataTable = sql.loadDgvBySql("SELECT distinct([anh_Art]) as bezeichnung FROM [tblAvisoAnhaenge]", "AVISO") + Dim dtAnhangsarten As DataTable = sql.loadDgvBySql("SELECT distinct([aa_bezeichnung]) as bezeichnung FROM " & table, "AVISO") + + If dtAnhaenge.Rows.Count = 0 Or dtAnhangsarten.Rows.Count = 0 Then Exit Sub + + Dim resultsTable As New DataTable + resultsTable.Columns.Add("bezeichnung", GetType(String)) + + + For Each rowAnhang As DataRow In dtAnhaenge.Rows + If rowAnhang(0) <> "" Then + Dim isExisting As Boolean = False + For Each rowArt As DataRow In dtAnhangsarten.Rows + If rowArt(0) = rowAnhang(0) Then + isExisting = True + Exit For + End If + Next + If Not isExisting Then + Dim R As DataRow = resultsTable.NewRow + R(0) = rowAnhang(0) + resultsTable.Rows.Add(R) + + End If + End If + + Next + + + If resultsTable.Rows.Count > 0 Then + + Dim b = New System.Text.StringBuilder() + For Each resultRow In resultsTable.Rows + b.Append(resultRow(0) & vbNewLine) + Next + + MsgBox(resultsTable.Rows.Count & " fehlende Anhangsarten:" & vbNewLine & b.ToString) + + Else + MsgBox("keine fehlenden Anhangsarten") + + End If + + End Sub End Class \ No newline at end of file diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index c57850b..1f5d4f6 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -783,42 +783,50 @@ Public Class usrcntlAktDetails End If Button18.Visible = True - Dim hSQL As String = " Select [anh_id],[anh_Name],[anh_docId],CASE WHEN (anh_SendungsId is null OR anh_SendungsId <=0) AND anh_Art='' THEN '***' ELSE [anh_Art] END as [anh_Art],[anh_Typ], anh_markiert FROM [tblAvisoAnhaenge] - WHERE [anh_AvisoId]='" & AvisoID & "' " & AktSndAnhaenge & " " & WhereWO & " - ORDER BY anh_SendungsId desc, - case - when [anh_Art] = 'ATR' then 0 - when [anh_Art] = 'ATR-EUR1' then 0 - when [anh_Art] = 'EUR1' then 0.1 - 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 + Dim hSQL As String '= " Select [anh_id],[anh_Name],[anh_docId],CASE WHEN (anh_SendungsId is null OR anh_SendungsId <=0) AND anh_Art='' THEN '***' ELSE [anh_Art] END as [anh_Art],[anh_Typ], anh_markiert FROM [tblAvisoAnhaenge] + ' WHERE [anh_AvisoId]='" & AvisoID & "' " & AktSndAnhaenge & " " & WhereWO & " + ' ORDER BY anh_SendungsId desc, + ' case + ' when [anh_Art] = 'ATR' then 0 + ' when [anh_Art] = 'ATR-EUR1' then 0 + ' when [anh_Art] = 'EUR1' then 0.1 + ' 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] = 'GGED_D' then 40 - when [anh_Art] = 'GGED_PP' then 41 - when [anh_Art] = 'GGED_P' then 42 - when [anh_Art] = 'GGED_A' then 43 - when [anh_Art] = 'PHYTO' then 44 - when [anh_Art] = 'CONFORM' then 45 + ' when [anh_Art] = 'GGED_D' then 40 + ' when [anh_Art] = 'GGED_PP' then 41 + ' when [anh_Art] = 'GGED_P' then 42 + ' when [anh_Art] = 'GGED_A' then 43 + ' when [anh_Art] = 'PHYTO' then 44 + ' when [anh_Art] = 'CONFORM' then 45 - when [anh_Art] = 'Sonstiges' then 99 + ' when [anh_Art] = 'Sonstiges' then 99 - when [anh_Art] ='' then 15 + ' when [anh_Art] ='' then 15 + + 'END, [anh_Reihenfolge],[anh_id]" + + + hSQL = "SELECT [anh_id],[anh_Name],anh_Datum,[anh_docId],CASE WHEN (anh_SendungsId is null OR anh_SendungsId <=0) AND isnull(aa_name,'')='' THEN '***' ELSE [aa_name] END as [anh_Art],[anh_Typ],anh_LaufzettelDruck,anh_GestellungslisteAnfuegen, anh_markiert , anh_cmrId + FROM [tblAvisoAnhaenge] + left join tblAvisoAnhangsArten on aa_bezeichnung = anh_Art + WHERE anh_AvisoId='" & AvisoID & "'" & AktSndAnhaenge & " " & WhereWO & " + ORDER BY anh_SendungsId desc, case when aa_sort = NULL THEN 15 else aa_sort END, [anh_Reihenfolge],[anh_id]" - END, [anh_Reihenfolge],[anh_id]" ' order by [anh_Reihenfolge],[anh_id] gridVermerke.DataSource = VermerkeDAL.Anzeigen_Vermerke(hSQL)