neu

2020-03-12 14:49:31 +01:00
parent f4c1a74870
commit cc28d5a6cf
197 changed files with 37402 additions and 4503 deletions
--- a/SDL/zoll/usrCntlBrgBuchungenFremd.Designer.vb
+++ b/SDL/zoll/usrCntlBrgBuchungenFremd.Designer.vb
@@ -120,8 +120,8 @@ Partial Class usrCntlBrgBuchungenFremd
        '
        'picDurmaz
        '
-        Me.picDurmaz.Image = Global.SDL.My.Resources.sicherheit11
-        Me.picDurmaz.InitialImage = Global.SDL.My.Resources.durmaz
+        Me.picDurmaz.Image = Global.SDL.My.Resources.Resources.sicherheit11
+        Me.picDurmaz.InitialImage = Global.SDL.My.Resources.Resources.durmaz
        Me.picDurmaz.Location = New System.Drawing.Point(470, 12)
        Me.picDurmaz.Name = "picDurmaz"
        Me.picDurmaz.Size = New System.Drawing.Size(221, 44)
--- a/SDL/zoll/usrCntlBrgBuchungenFremd.vb
+++ b/SDL/zoll/usrCntlBrgBuchungenFremd.vb
@@ -20,9 +20,12 @@ Public Class usrCntlBrgBuchungenFremd
        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
            Case "IMEX"
                MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
+            Case "UNISPED"
+                MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
            Case Else
                MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG/ATILLA", "VERAG/ATILLA"))
                MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
+                MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
        End Select
        MyComboBox1.SelectedIndex = 1

@@ -38,9 +41,10 @@ Public Class usrCntlBrgBuchungenFremd
            If cboBRG._value = "" Then Exit Sub

            Dim where = ""
-            Select MyComboBox1._value
+            Select Case MyComboBox1._value
                Case "IMEX" : where = " and ncts_firma = 'IMEX' "
-                Case "VERAG/ATILLA" : where = " and ncts_firma <> 'IMEX' "
+                Case "UNISPED" : where = " and ncts_firma = 'UNISPED' "
+                Case "VERAG/ATILLA" : where = " and (ncts_firma is null OR ncts_firma IN ('VERAG','ATILLA','DURMAZ','FRONTOFFICE')) "
            End Select


@@ -56,7 +60,7 @@ Public Class usrCntlBrgBuchungenFremd


            'Bei IMEX kein E-ZOLL
-            If MyComboBox1._value<> "IMEX"Then
+            If MyComboBox1._value = "VERAG/ATILLA" Then
                If cbxEZollDaten.Checked Then

                    'EZOLL:
@@ -94,5 +98,7 @@ Public Class usrCntlBrgBuchungenFremd
        End Try
    End Sub

-
+    Private Sub MyComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles MyComboBox1.SelectedIndexChanged
+        cbxEZollDaten.Enabled = (MyComboBox1._value = "VERAG/ATILLA")
+    End Sub
 End Class
--- a/SDL/zoll/usrCntlBrgBuchungenVERAG.vb
+++ b/SDL/zoll/usrCntlBrgBuchungenVERAG.vb
@@ -4,6 +4,15 @@ Public Class usrCntlBrgBuchungenVERAG

    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL

+    Public Sub New()
+
+        ' Dieser Aufruf ist für den Designer erforderlich.
+        InitializeComponent()
+
+        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
+
+    End Sub
+
    Private Sub usrCntlBrgBuchungenFremd_Load(sender As Object, e As EventArgs) Handles Me.Load
        cboBRG.Items.Clear()
        cboBRG.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
@@ -50,9 +59,8 @@ Public Class usrCntlBrgBuchungenVERAG
            End If


-            Dim sqlatr = " SELECT (SELECT TOP 1 CONVERT(varchar, [dySt_ergZeitpunkt] ,104 )  FROM [tblDakosy_Statusmeldungen] WHERE [dySt_dyId]=ncts_dyaAnmID AND  [dySt_status] = 50  ) as Datum, ncts_Befoerderungsmittel_KennzeichenAbgang as Kennzeichen, isnull(ncts_MRN,'') as MRN,  ncts_SumA_Befoerderer_Land as Land, nctsSA_AbgabenBetrag as GarantieBetrag, ncts_SumA_Befoerderer_Name as Firma " &
-                 " " & If(cboBRG.Text.Contains("TOBB"), ", isnull(ncts_BestimmungsstelleDienststellennummer,'') as Bestimmungsstelle ", "") & "  " &
-                 "FROM [tblDakosy_NCTSOut] INNER JOIN [tblDakosy_NCTSOut_Sicherheitsangaben] on ncts_Id=[nctsSA_NctsId] "
+            Dim sqlatr = " SELECT (SELECT TOP 1 CONVERT(varchar, [dySt_ergZeitpunkt] ,104 )  FROM [tblDakosy_Statusmeldungen] WHERE [dySt_dyId]=ncts_dyaAnmID AND  [dySt_status] = 50  ) as Datum, ncts_Befoerderungsmittel_KennzeichenAbgang as Kennzeichen, isnull(ncts_MRN,'') as MRN,  ncts_SumA_Befoerderer_Land as Land, nctsSA_AbgabenBetrag as GarantieBetrag, ncts_SumA_Befoerderer_Name as Firma,isnull(ncts_BestimmungsstelleDienststellennummer,'') as Bestimmungsstelle " &
+                  "FROM [tblDakosy_NCTSOut] INNER JOIN [tblDakosy_NCTSOut_Sicherheitsangaben] on ncts_Id=[nctsSA_NctsId] "

            sqlatr &= " WHERE nctsSA_GRN='" & cboBRG._value & "' and ncts_Status between 50 and 60  " ' CONVERT(date, ncts_Trans_DatumZeit ,104 )  BETWEEN '" & datVon.Value.ToShortDateString & "' AND '" & datBis.Value.ToShortDateString & "'"
            sqlatr &= where
@@ -64,8 +72,8 @@ Public Class usrCntlBrgBuchungenVERAG
            If cbxEZollDaten.Checked And (cboNL._value = "SUB" Or cboNL._value = "SBG" Or cboNL._value = "SUW" Or cboNL._value = "NKD") Then

                'EZOLL:
-                sqlatr = " SELECT TOP 100  AnmeldungsDatum as Datum , (select [CrossIdnt] FROM [zsAnmTransp] where [zsAnmTransp].AnmID=vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme.AnmID ) as Kennzeichen, isnull(CRN,'') as MRN, (select [CrossIdntNat] FROM [zsAnmTransp] where [zsAnmTransp].AnmID=vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme.AnmID ) as Land, cast(GarantieWert  as  Decimal(17,2))  as GarantieBetrag,(SELECT  [Na]  FROM [ezoll].[dbo].[zsAnmCarrTra]  where [zsAnmCarrTra].AnmID=vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme.AnmID) as Firma  "
-                sqlatr &= " " & If(cboBRG.Text.Contains("TOBB"), ", isnull(Bestimmungszollstelle,'') as Bestimmungsstelle ", "") & "  "
+                sqlatr = " SELECT TOP 100  AnmeldungsDatum as Datum , (select [CrossIdnt] FROM [zsAnmTransp] where [zsAnmTransp].AnmID=vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme.AnmID ) as Kennzeichen, isnull(CRN,'') as MRN, (select [CrossIdntNat] FROM [zsAnmTransp] where [zsAnmTransp].AnmID=vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme.AnmID ) as Land, cast(GarantieWert  as  Decimal(17,2))  as GarantieBetrag,(SELECT  [Na]  FROM [ezoll].[dbo].[zsAnmCarrTra]  where [zsAnmCarrTra].AnmID=vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme.AnmID) as Firma, isnull(Bestimmungszollstelle,'') as Bestimmungsstelle   "
+
                sqlatr &= "  FROM vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme "
                sqlatr &= " WHERE GRN IN (" & cboBRG._value & ") and AnmeldungsDatum BETWEEN '" & datVon.Value.ToShortDateString & "' AND '" & datBis.Value.ToShortDateString & "' "
                sqlatr &= whereEZOLL
--- a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb
+++ b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb
@@ -158,14 +158,14 @@ Partial Class usrCntlZOLLAuswertungen
        Me.datVonImex = New System.Windows.Forms.DateTimePicker()
        Me.Label43 = New System.Windows.Forms.Label()
        Me.TabPage2 = New System.Windows.Forms.TabPage()
+        Me.TabPage3 = New System.Windows.Forms.TabPage()
+        Me.TabPage4 = New System.Windows.Forms.TabPage()
+        Me.pnl = New System.Windows.Forms.Panel()
        Me.UsrCntlAuswertungenUIDPruefung1 = New SDL.usrCntlAuswertungenUIDPruefung()
        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1 = New SDL.usrCntlAuswertungenKunden_Auftragsrueckgang()
-        Me.TabPage3 = New System.Windows.Forms.TabPage()
        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1 = New SDL.usrCntlAuswertungenFiskal_IntrastatMeldung()
        Me.UsrCntlAuswertungenFiskalvertretung_42001 = New SDL.usrCntlAuswertungenFiskalvertretung_4200()
-        Me.TabPage4 = New System.Windows.Forms.TabPage()
        Me.UsrCntlAuswertungenAufschub_Abgabenliste1 = New SDL.usrCntlAuswertungenAufschub_Abgabenliste()
-        Me.pnl = New System.Windows.Forms.Panel()
        Me.GroupBox1.SuspendLayout()
        Me.GroupBox2.SuspendLayout()
        CType(Me.picDurmaz, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -1142,7 +1142,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.tbcntr.Location = New System.Drawing.Point(0, 57)
        Me.tbcntr.Name = "tbcntr"
        Me.tbcntr.SelectedIndex = 0
-        Me.tbcntr.Size = New System.Drawing.Size(898, 1270)
+        Me.tbcntr.Size = New System.Drawing.Size(847, 1270)
        Me.tbcntr.TabIndex = 22
        '
        'TabPage1
@@ -1175,7 +1175,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.TabPage1.Location = New System.Drawing.Point(4, 22)
        Me.TabPage1.Name = "TabPage1"
        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.Size = New System.Drawing.Size(890, 1244)
+        Me.TabPage1.Size = New System.Drawing.Size(839, 1244)
        Me.TabPage1.TabIndex = 0
        Me.TabPage1.Text = "Bürgschaften"
        Me.TabPage1.UseVisualStyleBackColor = True
@@ -1643,11 +1643,42 @@ Partial Class usrCntlZOLLAuswertungen
        Me.TabPage2.Location = New System.Drawing.Point(4, 22)
        Me.TabPage2.Name = "TabPage2"
        Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage2.Size = New System.Drawing.Size(907, 1244)
+        Me.TabPage2.Size = New System.Drawing.Size(856, 1244)
        Me.TabPage2.TabIndex = 1
        Me.TabPage2.Text = "Kunden"
        Me.TabPage2.UseVisualStyleBackColor = True
        '
+        'TabPage3
+        '
+        Me.TabPage3.Controls.Add(Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1)
+        Me.TabPage3.Controls.Add(Me.UsrCntlAuswertungenFiskalvertretung_42001)
+        Me.TabPage3.Location = New System.Drawing.Point(4, 22)
+        Me.TabPage3.Name = "TabPage3"
+        Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)
+        Me.TabPage3.Size = New System.Drawing.Size(856, 1244)
+        Me.TabPage3.TabIndex = 2
+        Me.TabPage3.Text = "Fiskalvertretung"
+        Me.TabPage3.UseVisualStyleBackColor = True
+        '
+        'TabPage4
+        '
+        Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_Abgabenliste1)
+        Me.TabPage4.Location = New System.Drawing.Point(4, 22)
+        Me.TabPage4.Name = "TabPage4"
+        Me.TabPage4.Size = New System.Drawing.Size(856, 1244)
+        Me.TabPage4.TabIndex = 3
+        Me.TabPage4.Text = "Aufschubdaten"
+        Me.TabPage4.UseVisualStyleBackColor = True
+        '
+        'pnl
+        '
+        Me.pnl.Controls.Add(Me.Label2)
+        Me.pnl.Dock = System.Windows.Forms.DockStyle.Top
+        Me.pnl.Location = New System.Drawing.Point(0, 0)
+        Me.pnl.Name = "pnl"
+        Me.pnl.Size = New System.Drawing.Size(847, 57)
+        Me.pnl.TabIndex = 23
+        '
        'UsrCntlAuswertungenUIDPruefung1
        '
        Me.UsrCntlAuswertungenUIDPruefung1.BackColor = System.Drawing.Color.White
@@ -1666,18 +1697,6 @@ Partial Class usrCntlZOLLAuswertungen
        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(0, 235)
        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0
        '
-        'TabPage3
-        '
-        Me.TabPage3.Controls.Add(Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1)
-        Me.TabPage3.Controls.Add(Me.UsrCntlAuswertungenFiskalvertretung_42001)
-        Me.TabPage3.Location = New System.Drawing.Point(4, 22)
-        Me.TabPage3.Name = "TabPage3"
-        Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage3.Size = New System.Drawing.Size(890, 1244)
-        Me.TabPage3.TabIndex = 2
-        Me.TabPage3.Text = "Fiskalvertretung"
-        Me.TabPage3.UseVisualStyleBackColor = True
-        '
        'UsrCntlAuswertungenFiskal_IntrastatMeldung1
        '
        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.BackColor = System.Drawing.Color.White
@@ -1694,16 +1713,6 @@ Partial Class usrCntlZOLLAuswertungen
        Me.UsrCntlAuswertungenFiskalvertretung_42001.Size = New System.Drawing.Size(708, 234)
        Me.UsrCntlAuswertungenFiskalvertretung_42001.TabIndex = 0
        '
-        'TabPage4
-        '
-        Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_Abgabenliste1)
-        Me.TabPage4.Location = New System.Drawing.Point(4, 22)
-        Me.TabPage4.Name = "TabPage4"
-        Me.TabPage4.Size = New System.Drawing.Size(907, 1244)
-        Me.TabPage4.TabIndex = 3
-        Me.TabPage4.Text = "Aufschubdaten"
-        Me.TabPage4.UseVisualStyleBackColor = True
-        '
        'UsrCntlAuswertungenAufschub_Abgabenliste1
        '
        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.BackColor = System.Drawing.Color.White
@@ -1712,15 +1721,6 @@ Partial Class usrCntlZOLLAuswertungen
        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Size = New System.Drawing.Size(708, 180)
        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.TabIndex = 0
        '
-        'pnl
-        '
-        Me.pnl.Controls.Add(Me.Label2)
-        Me.pnl.Dock = System.Windows.Forms.DockStyle.Top
-        Me.pnl.Location = New System.Drawing.Point(0, 0)
-        Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(898, 57)
-        Me.pnl.TabIndex = 23
-        '
        'usrCntlZOLLAuswertungen
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1730,7 +1730,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.Controls.Add(Me.tbcntr)
        Me.Controls.Add(Me.pnl)
        Me.Name = "usrCntlZOLLAuswertungen"
-        Me.Size = New System.Drawing.Size(898, 926)
+        Me.Size = New System.Drawing.Size(847, 926)
        Me.GroupBox1.ResumeLayout(False)
        Me.GroupBox1.PerformLayout()
        Me.GroupBox2.ResumeLayout(False)