Anhangsarten eigene Form für Adminstration

Aviso/Anhänge/frmSendungAnhangImport.vb

@@ -3,6 +3,7 @@
 'Imports iTextSharp.text
 Imports System.IO
 Imports Spire.Pdf
+Imports VERAG_PROG_ALLGEMEIN
 'Imports GrapeCity.Documents.Pdf
 
 'Imports Spire.Pdf
@@ -72,7 +73,7 @@ Public Class frmSendungAnhangImport
     Sub initElement(USRCNTL As usrCntlSendungAnhangElement)
         AddHandler USRCNTL.ME_CLICK, Sub(STRG_PRESSED)
                                          '  If BrowserLoaded Then
-                                 
+
 
                                          If Not STRG_PRESSED Then
 
@@ -637,11 +638,11 @@ Public Class frmSendungAnhangImport
 
     Public Function ExtractPdfPages_NEW(ByVal SourceFile As String, ByVal TargetFile As String, pagesToExtract As List(Of Integer)) As Boolean 'ITEXTSHARP
         Try
-            Dim impPage As iTextSharp.text.pdf.PdfImportedPage = Nothing
-            Dim Reader As New iTextSharp.text.pdf.PdfReader(SourceFile)
+            Dim impPage As itextsharp.text.pdf.PdfImportedPage = Nothing
+            Dim Reader As New itextsharp.text.pdf.PdfReader(SourceFile)
             If Not TargetFile.ToLower.EndsWith(".pdf") Then TargetFile = TargetFile & ".pdf"
-            Dim srcDoc As New iTextSharp.text.Document() 'Reader.GetPageSizeWithRotation(0))
-            Dim PdfCopyProvider As New iTextSharp.text.pdf.PdfCopy(srcDoc, New System.IO.FileStream(TargetFile, System.IO.FileMode.Create))
+            Dim srcDoc As New itextsharp.text.Document() 'Reader.GetPageSizeWithRotation(0))
+            Dim PdfCopyProvider As New itextsharp.text.pdf.PdfCopy(srcDoc, New System.IO.FileStream(TargetFile, System.IO.FileMode.Create))
             PdfCopyProvider.SetFullCompression()
             srcDoc.Open()
             For Each p In pagesToExtract
@@ -652,7 +653,7 @@ Public Class frmSendungAnhangImport
                 End If
                 impPage = PdfCopyProvider.GetImportedPage(Reader, p)
                 ' ----- Ermitteln der Seitenauflösung und setzen für die neue Seite
-                PdfCopyProvider.SetPageSize(New iTextSharp.text.Rectangle(0.0F, 0.0F, impPage.Width, impPage.Height, Reader.GetPageRotation(p)))
+                PdfCopyProvider.SetPageSize(New itextsharp.text.Rectangle(0.0F, 0.0F, impPage.Width, impPage.Height, Reader.GetPageRotation(p)))
                 ' ----- PDF Seite in das neue Dokument einfügen
                 PdfCopyProvider.AddPage(impPage)
 
@@ -888,7 +889,7 @@ Public Class frmSendungAnhangImport
 
         Try
             PagesLeft = 0
-            Dim r As iTextSharp.text.pdf.PdfReader = New iTextSharp.text.pdf.PdfReader(sourceFile)
+            Dim r As itextsharp.text.pdf.PdfReader = New itextsharp.text.pdf.PdfReader(sourceFile)
             Dim pagesToKeep As New List(Of Integer)
             For p = 1 To r.NumberOfPages
                 Dim del = False
@@ -910,9 +911,9 @@ Public Class frmSendungAnhangImport
 
                     Using fs As FileStream = New FileStream(destinationFile, FileMode.Create, FileAccess.Write, FileShare.None)
 
-                        Using doc As iTextSharp.text.Document = New iTextSharp.text.Document()
+                        Using doc As itextsharp.text.Document = New itextsharp.text.Document()
 
-                            Dim w As iTextSharp.text.pdf.PdfWriter = iTextSharp.text.pdf.PdfWriter.GetInstance(doc, fs)
+                            Dim w As itextsharp.text.pdf.PdfWriter = itextsharp.text.pdf.PdfWriter.GetInstance(doc, fs)
                             doc.Open()
                             For Each page As Integer In pagesToKeep
                                 doc.NewPage()
@@ -1060,12 +1061,13 @@ Public Class frmSendungAnhangImport
         flpnlAviso.Controls.Clear()
         flpnlSendungen.Controls.Clear()
 
+
         cboArt.Items.Clear()
-        Dim SQLString = "SELECT [aa_name],[aa_bezeichnung] FROM [tblAvisoAnhangsArten] WHERE aa_aktiv=1 and ((aa_firma is null and aa_filiale is null)"
-        SQLString &= IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "", " OR aa_firma = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'", "")
-        SQLString &= IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE <> "", " OR aa_filiale = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "'", "")
-        SQLString &= ")"
-        cboArt.fillWithSQL(SQLString, False, "AVISO", True)
+        Dim list As New cAvisoAnhangsarten_LIST(True, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE)
+        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
+        For Each r In list.LIST
+            cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(r.aa_name, r.aa_bezeichnung))
+        Next
 
         'cboArt.Items.Clear()
         'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
@@ -1074,8 +1076,7 @@ Public Class frmSendungAnhangImport
         'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Rechnung", "Rechnung"))
         'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("eFatura", "eFatura"))
         'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CMR", "CMR"))
-        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ausfuhr", "Ausfuhr"))
-        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vorpapier", "Vorpapier"))
+        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ausfuhr", "Ausfuhr"))++++++
         'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Packliste", "Packliste"))
         'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftrag", "Auftrag"))
         'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Dispoliste", "Dispoliste"))
@@ -1110,11 +1111,6 @@ Public Class frmSendungAnhangImport
 
         'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sonstiges", "Sonstiges"))
 
-
-
-
-
-
         cboArt._TRANSLATE()
 
         initSendungen()
@@ -1141,7 +1137,7 @@ Public Class frmSendungAnhangImport
         Dim cnt = 1
         For Each s In SENDUNG_LIST
             Dim abfertigungsArt = SQL.getValueTxtBySql("SELECT isnull([Abfertigungsbezeichnung],'') FROM [Abfertigungsarten] WHERE Abfertigungsart='" & s.tblSnd_Abfertigungsart_ID & "'", "FMZOLL")
-        Dim empfTmp = ""
+            Dim empfTmp = ""
             If s.tblSnd_Empfaenger IsNot Nothing Then
                 empfTmp = If(s.tblSnd_Empfaenger.Length > 15, s.tblSnd_Empfaenger.Substring(0, 15), s.tblSnd_Empfaenger)
             End If

Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.vb

@@ -1,4 +1,6 @@
-Public Class frmSendungAnhangUmbenennenUmkateg
+Imports VERAG_PROG_ALLGEMEIN
+
+Public Class frmSendungAnhangUmbenennenUmkateg
     Dim nameOLD = ""
     Dim artOLD = ""
     Sub New(nameOLD As String, artOLD As String)
@@ -13,11 +15,11 @@
     Private Sub frmSendungAnhangImport_Load(sender As Object, e As EventArgs) Handles Me.Load
 
         cboArt.Items.Clear()
-        Dim SQLString = "SELECT [aa_name],[aa_bezeichnung] FROM [tblAvisoAnhangsArten] WHERE aa_aktiv=1 and ((aa_firma is null and aa_filiale is null)"
-        SQLString &= IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA.ToString, " OR aa_firma = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'", "")
-        SQLString &= IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE, " OR filiale = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "'", "")
-        SQLString &= ")"
-        cboArt.fillWithSQL(SQLString, False, "AVISO", True)
+        Dim list As New cAvisoAnhangsarten_LIST(True, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE)
+        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
+        For Each r In list.LIST
+            cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(r.aa_name, r.aa_bezeichnung))
+        Next
 
         'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
         'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATR", "ATR-EUR1"))