neu

2021-03-23 11:19:27 +01:00
parent b4612ab3e0
commit e625acc609
22 changed files with 2028 additions and 1763 deletions
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/subRptLaufzettelZollDE_Vorpapier.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/subRptLaufzettelZollDE_Vorpapier.vb
@@ -20,6 +20,7 @@ Public Class subRptLaufzettelZollDE_Vorpapier
            ATAMRN = ATAMRN.Replace(" ", "")
            ATAMRN = ATAMRN.Replace("/", "")
            ATAMRN = ATAMRN.Replace("-", "")
+            ATAMRN = ATAMRN.Replace("XXXX", "")

            picBarcodeMRN.Image = Nothing
            picBarcodeMRN.Visible = False
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.Designer.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.Designer.vb
@@ -268,6 +268,7 @@ Partial Class usrcntlVerzollungsunterlagen
        '
        'txtFirma
        '
+        Me.txtFirma._AlleFirmenCLUSTER = False
        Me.txtFirma._AllowSetValue = True
        Me.txtFirma._autoSizeGross = False
        Me.txtFirma._display_Name1 = True
@@ -276,6 +277,7 @@ Partial Class usrcntlVerzollungsunterlagen
        Me.txtFirma._displayWoelflKd = False
        Me.txtFirma._hideIfListEmpty = True
        Me.txtFirma._loadKdData = True
+        Me.txtFirma._UseFIRMA = ""
        Me.txtFirma._ValueKdAndName = False
        Me.txtFirma.dgvpos = "LEFT"
        Me.txtFirma.KdName = Nothing
@@ -288,6 +290,7 @@ Partial Class usrcntlVerzollungsunterlagen
        Me.txtFirma.searchActive = True
        Me.txtFirma.Size = New System.Drawing.Size(709, 20)
        Me.txtFirma.TabIndex = 11
+        Me.txtFirma.TIMER_SEARCH = True
        Me.txtFirma.usrcntl = Nothing
        '
        'Label1
@@ -428,7 +431,7 @@ Partial Class usrcntlVerzollungsunterlagen
        Me.txtAnlage1._ShortDateNew = False
        Me.txtAnlage1._ShortDateOnly = False
        Me.txtAnlage1._TimeOnly = False
-        Me.txtAnlage1._value = Nothing
+        Me.txtAnlage1._value = "Zollbeleg"
        Me.txtAnlage1._Waehrung = False
        Me.txtAnlage1._WaehrungZeichen = True
        Me.txtAnlage1.ForeColor = System.Drawing.Color.Black
@@ -439,6 +442,7 @@ Partial Class usrcntlVerzollungsunterlagen
        Me.txtAnlage1.Name = "txtAnlage1"
        Me.txtAnlage1.Size = New System.Drawing.Size(310, 20)
        Me.txtAnlage1.TabIndex = 23
+        Me.txtAnlage1.Text = "Zollbeleg"
        '
        'txtAnlage2
        '
@@ -449,7 +453,7 @@ Partial Class usrcntlVerzollungsunterlagen
        Me.txtAnlage2._ShortDateNew = False
        Me.txtAnlage2._ShortDateOnly = False
        Me.txtAnlage2._TimeOnly = False
-        Me.txtAnlage2._value = Nothing
+        Me.txtAnlage2._value = "Lieferanten-Rechnung"
        Me.txtAnlage2._Waehrung = False
        Me.txtAnlage2._WaehrungZeichen = True
        Me.txtAnlage2.ForeColor = System.Drawing.Color.Black
@@ -460,6 +464,7 @@ Partial Class usrcntlVerzollungsunterlagen
        Me.txtAnlage2.Name = "txtAnlage2"
        Me.txtAnlage2.Size = New System.Drawing.Size(310, 20)
        Me.txtAnlage2.TabIndex = 26
+        Me.txtAnlage2.Text = "Lieferanten-Rechnung"
        '
        'txtAnlage3
        '
@@ -470,7 +475,7 @@ Partial Class usrcntlVerzollungsunterlagen
        Me.txtAnlage3._ShortDateNew = False
        Me.txtAnlage3._ShortDateOnly = False
        Me.txtAnlage3._TimeOnly = False
-        Me.txtAnlage3._value = Nothing
+        Me.txtAnlage3._value = "Original Präferenz"
        Me.txtAnlage3._Waehrung = False
        Me.txtAnlage3._WaehrungZeichen = True
        Me.txtAnlage3.ForeColor = System.Drawing.Color.Black
@@ -481,6 +486,7 @@ Partial Class usrcntlVerzollungsunterlagen
        Me.txtAnlage3.Name = "txtAnlage3"
        Me.txtAnlage3.Size = New System.Drawing.Size(310, 20)
        Me.txtAnlage3.TabIndex = 29
+        Me.txtAnlage3.Text = "Original Präferenz"
        '
        'txtAnlage4
        '
@@ -631,6 +637,7 @@ Partial Class usrcntlVerzollungsunterlagen
        '
        'KdInAuftrag
        '
+        Me.KdInAuftrag._AlleFirmenCLUSTER = False
        Me.KdInAuftrag._AllowSetValue = True
        Me.KdInAuftrag._autoSizeGross = False
        Me.KdInAuftrag._display_Name1 = True
@@ -639,6 +646,7 @@ Partial Class usrcntlVerzollungsunterlagen
        Me.KdInAuftrag._displayWoelflKd = False
        Me.KdInAuftrag._hideIfListEmpty = True
        Me.KdInAuftrag._loadKdData = True
+        Me.KdInAuftrag._UseFIRMA = ""
        Me.KdInAuftrag._ValueKdAndName = False
        Me.KdInAuftrag.dgvpos = "LEFT"
        Me.KdInAuftrag.KdName = Nothing
@@ -651,6 +659,7 @@ Partial Class usrcntlVerzollungsunterlagen
        Me.KdInAuftrag.searchActive = True
        Me.KdInAuftrag.Size = New System.Drawing.Size(319, 20)
        Me.KdInAuftrag.TabIndex = 5
+        Me.KdInAuftrag.TIMER_SEARCH = True
        Me.KdInAuftrag.usrcntl = Nothing
        '
        'cboFiliale
@@ -707,6 +716,7 @@ Partial Class usrcntlVerzollungsunterlagen
        '
        'kdRgEmpfaenger
        '
+        Me.kdRgEmpfaenger._AlleFirmenCLUSTER = False
        Me.kdRgEmpfaenger._AllowSetValue = True
        Me.kdRgEmpfaenger._autoSizeGross = False
        Me.kdRgEmpfaenger._display_Name1 = True
@@ -715,6 +725,7 @@ Partial Class usrcntlVerzollungsunterlagen
        Me.kdRgEmpfaenger._displayWoelflKd = False
        Me.kdRgEmpfaenger._hideIfListEmpty = True
        Me.kdRgEmpfaenger._loadKdData = True
+        Me.kdRgEmpfaenger._UseFIRMA = ""
        Me.kdRgEmpfaenger._ValueKdAndName = False
        Me.kdRgEmpfaenger.dgvpos = "LEFT"
        Me.kdRgEmpfaenger.KdName = Nothing
@@ -727,6 +738,7 @@ Partial Class usrcntlVerzollungsunterlagen
        Me.kdRgEmpfaenger.searchActive = True
        Me.kdRgEmpfaenger.Size = New System.Drawing.Size(310, 20)
        Me.kdRgEmpfaenger.TabIndex = 39
+        Me.kdRgEmpfaenger.TIMER_SEARCH = True
        Me.kdRgEmpfaenger.usrcntl = Nothing
        '
        'txtEmpfänger
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.vb
@@ -114,6 +114,8 @@

        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG Spedition AG", "AG"))
        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG Customs Service GmbH", "CS"))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX Customs Service GmbH", "IMEX"))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED Speditions GmbH", "UNISPED"))
        cboFirma.changeItem("AG")
        '  cboFiliale.fillWithSQL(" SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", , "FMZOLL", True)

@@ -122,6 +124,7 @@

        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
            Case "IMEX" : cboFiliale._allowedValuesFreiText = {"5501"}
+            Case "UNISPED" : cboFiliale._allowedValuesFreiText = {"5601"}
            Case "ATILLA" : cboFiliale._allowedValuesFreiText = {"4801"}
        End Select

@@ -413,4 +416,12 @@
        setValues(New VERAG_PROG_ALLGEMEIN.cPostversand)
        btnNEU.Visible = False
    End Sub
+
+    Private Sub cboFirma_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboFirma.SelectedIndexChanged
+        Select Case cboFirma._value
+            Case "IMEX" : txtFirma._UseFIRMA = cboFirma._value : KdInAuftrag._UseFIRMA = cboFirma._value
+            Case "UNISPED" : txtFirma._UseFIRMA = cboFirma._value : KdInAuftrag._UseFIRMA = cboFirma._value
+            Case Else : txtFirma._UseFIRMA = "VERAG" : KdInAuftrag._UseFIRMA = "VERAG"
+        End Select
+    End Sub
 End Class
--- a/SDL/Formulare/KDFormulare/frmFormulare.vb
+++ b/SDL/Formulare/KDFormulare/frmFormulare.vb
@@ -1740,7 +1740,12 @@ Public Class FormularManagerNEU
        Dim AVISO = (New VERAG_PROG_ALLGEMEIN.cAvisoDAL).LesenAviso(AvisoId, "")
        If AVISO Is Nothing Then Return ""
        Dim SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen)
-        VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST_VP(SENDUNG_LIST, 0, AvisoId, Vorpapier) 'LÄDT alle SENDUNGSDATEN
+        If Vorpapier = "XXXX" Then
+            VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST_VP_EMPTY(SENDUNG_LIST, 0, AvisoId) 'LÄDT alle SENDUNGSDATEN
+        Else
+            VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST_VP(SENDUNG_LIST, 0, AvisoId, Vorpapier) 'LÄDT alle SENDUNGSDATEN
+        End If
+
        If SENDUNG_LIST Is Nothing OrElse SENDUNG_LIST.Count = 0 Then Return ""
        Return LaufzettelZollDE(AVISO, SENDUNG_LIST,,, Vorpapier)
    End Function
@@ -1862,6 +1867,7 @@ Public Class FormularManagerNEU
            Else
                Dim VORPAPIERE As New List(Of VERAG_PROG_ALLGEMEIN.cAvisoVorpapier)
                Dim VP As New VERAG_PROG_ALLGEMEIN.cAvisoVorpapier
+                '     VP.vp_Nr = Vorpapier.ToString.Replace("XXXX", "") : VORPAPIERE.Add(VP)
                VP.vp_Nr = Vorpapier : VORPAPIERE.Add(VP)

                Dim SubRptVP As New subRptLaufzettelZollDE_Vorpapier(VORPAPIERE)
@@ -1893,6 +1899,7 @@ Public Class FormularManagerNEU
                                                  rpt.txtPos.Text = If(SND.tblSnd_Vorpapier3_Pos, "").ToString.Trim
                                              End If

+
                                              If SND.tblSnd_Fremdspedition Then
                                                  rpt.txtAbfertigungsart.Text = "FREMD"
                                                  rpt.txtPosNr.Text = SND.tblSnd_FremdspeditionText
@@ -3191,10 +3198,15 @@ Public Class FormularManagerNEU
        Dim destPath = ""

        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-            Case "IMEX", "UNISPED", "AMBAR"
+            Case "IMEX", "AMBAR"
                destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Importaviso_VK", listTowrite)
-            Case Else
+            Case "UNISPED"

+                Select Case usrCntl.cboFirma._value
+                    Case "21", "23" : destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "VORAUSKASSE_AT", listTowrite)
+                    Case Else : destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Importaviso_VK", listTowrite)
+                End Select
+            Case Else
                Select Case usrCntl.cboFirma._value
                    Case "11" : destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Importaviso_CS_NEU2", listTowrite)
                    Case Else : destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Importaviso_AG_NEU2", listTowrite)
@@ -3633,16 +3645,19 @@ Public Class FormularManagerNEU
        Dim oWord As New Microsoft.Office.Interop.Word.Application
        Dim striList As New List(Of String)
        Try
+            Dim uOrdner2 = ""
            Dim nameDispo = ""
            nameDispo = "VerzollungsunterlagenAG2"
            Select Case usrCntl.cboFirma._value
+                Case "IMEX" : nameDispo = "Verzollungsunterlagen" : uOrdner2 = "IMEX"
+                Case "UNISPED" : nameDispo = "Verzollungsunterlagen" : uOrdner2 = "UNISPED"
                Case "CS" : nameDispo = "VerzollungsunterlagenCS"
                Case Else : nameDispo = "VerzollungsunterlagenAG2"
            End Select

-            Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", nameDispo)
+            Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", uOrdner2, "", nameDispo)
            Dim pfadWord = DS.GET_TOP1_PATH(False)
-            ' MsgBox(pfadWord)
+
            Dim cGenWord As New cGenWord

            odoc = cGenWord.openWord(pfadWord, False, oWord)
@@ -4249,6 +4264,55 @@ Public Class FormularManagerNEU

    End Function

+
+
+    Shared Function Finish_AVISO(AVISO As VERAG_PROG_ALLGEMEIN.cAviso) As String
+        Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager
+
+        Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
+        Dim top = 0
+        If AVISO.Grenzstelle = "SUB" Then
+
+            '  If AVISO.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben Then
+            'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            '    Case "FRONTOFFICE", "VERAG"
+            listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(AVISO.LKW_Nr, 37, 46, 120, 12, "bold", 20, , iTextSharp.text.Element.ALIGN_LEFT))
+            'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(AVISO.Freigabe.ToShortDateString & " " & AVISO.Freigabe.ToShortTimeString, 141, 47, 50, 8, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+            '    listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(Now.ToShortDateString & " " & Now.ToShortTimeString, 141, 47, 50, 12, "bold", 16, , iTextSharp.text.Element.ALIGN_LEFT))
+            listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(Now.ToShortDateString, 141, 47, 50, 12, "bold", 16, , iTextSharp.text.Element.ALIGN_LEFT))
+            Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "FRONTOFFICE", "", "Finish_AVISO", listTowrite)
+            'End Select
+            '    End If
+        End If
+        Return ""
+    End Function
+
+
+
+
+    Shared Function zumZOLL_AVISO(AVISO As VERAG_PROG_ALLGEMEIN.cAviso, Optional Zollamt As String = "") As String
+        Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager
+
+        Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
+        Dim top = 0
+
+        If AVISO.Grenzstelle = "SUB" Then
+            '  If AVISO.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben Then
+            'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            '    Case "FRONTOFFICE", "VERAG"
+            listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(AVISO.LKW_Nr, 37, 46, 120, 12, "bold", 20, , iTextSharp.text.Element.ALIGN_LEFT))
+            'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(AVISO.Freigabe.ToShortDateString & " " & AVISO.Freigabe.ToShortTimeString, 141, 47, 50, 8, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+            listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(Now.ToShortDateString & " " & Now.ToShortTimeString, 141, 47, 50, 12, "bold", 16, , iTextSharp.text.Element.ALIGN_LEFT))
+            If Zollamt = "DE" Then listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 64, 216, 6, 6, "bold", 16, , iTextSharp.text.Element.ALIGN_CENTER))
+            If Zollamt = "AT" Then listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 64, 265, 6, 6, "bold", 16, , iTextSharp.text.Element.ALIGN_CENTER))
+            Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "FRONTOFFICE", "", "zumZoll_Aviso", listTowrite)
+            'End Select
+            '         End If
+        End If
+        Return ""
+    End Function
+
+
    Shared Function QS_UeDok(usrCntl As usrcntlQS_UeDok) As String
        Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager