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