Typo ausgebessert, Sendungsvermerke limit Anzahl Zeichen.

2023-07-24 17:18:44 +02:00
parent 0d7a9fd476
commit 23d09774c0
7 changed files with 65 additions and 31 deletions
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -263,17 +263,17 @@
    <Reference Include="NumericBox">
      <HintPath>..\..\..\dll\NumericBox.dll</HintPath>
    </Reference>
-    <Reference Include="Spire.License, Version=1.3.15.46, Culture=neutral, PublicKeyToken=b1144360237c8b3f, processorArchitecture=MSIL">
+    <Reference Include="Spire.License, Version=1.4.0.46, Culture=neutral, PublicKeyToken=b1144360237c8b3f, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\Spire.PDF\2022\Spire.License.dll</HintPath>
+      <HintPath>..\..\..\dll\Spire.PDF\2023\Spire.License.dll</HintPath>
    </Reference>
-    <Reference Include="Spire.Pdf, Version=7.6.0.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
+    <Reference Include="Spire.Pdf, Version=8.1.4.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\Spire.PDF\2022\Spire.Pdf.dll</HintPath>
+      <HintPath>..\..\..\dll\Spire.PDF\2023\Spire.Pdf.dll</HintPath>
    </Reference>
-    <Reference Include="Spire.PdfViewer.Forms, Version=6.6.0.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
+    <Reference Include="Spire.PdfViewer.Forms, Version=7.1.4.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\Spire.PDF\2022\Spire.PdfViewer.Forms.dll</HintPath>
+      <HintPath>..\..\..\dll\Spire.PDF\2023\Spire.PdfViewer.Forms.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("3.8.9.8")>
-<Assembly: AssemblyFileVersion("3.8.9.8")>
+<Assembly: AssemblyVersion("3.8.9.9")>
+<Assembly: AssemblyFileVersion("3.8.9.9")>
--- a/Aviso/frmATEZ_NCTS.vb
+++ b/Aviso/frmATEZ_NCTS.vb
@@ -70,8 +70,8 @@ Public Class frmATEZ_NCTS
            .VERAG_LRN = lblBezugsnummer.Text
            .LicensePlateContainerNo = txtLKWId.Text
            .DAKOSY_TemplateCode = cboStammreferenz._value
-            .DAKOSY_IOPartner = txtDyNiederlassung.Text & txtDyNiederlassung.Text
-            .DAKOSY_Division1 = ""
+            .DAKOSY_IOPartner = txtDyMandant.Text
+            .DAKOSY_Division3 = txtDyNiederlassung.Text
            .DepartureCustomsOffice = sbAbgangZollstelle._value
            .DestinationCustomsOffice = sbBestimmungsZollstelle._value
            .DatDeterminationLimit = txtDat.Text
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -592,9 +592,9 @@ Public Class frmHauptfenster
        End If


-        If False Then 'Bei Produktivstart bedingung auf True!!!!!

-            If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then
+
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then
                Dim timas As New cTimasAPI
                Dim infoMessage As String = ""
                Dim timeEntryExisting As Boolean = False
@@ -608,7 +608,6 @@ Public Class frmHauptfenster
                    Else

                    End If
-                End If

            End If
        End If
--- a/Aviso/frmSendungsDetailsAbrechnungLeistungen.vb
+++ b/Aviso/frmSendungsDetailsAbrechnungLeistungen.vb
@@ -3,6 +3,7 @@

    Public Property _beteiligter As String = ""
    Dim SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen
+    Dim maxInputLenght As Integer = 30


    Sub New(SENDUNG, _beteiligter)
@@ -32,7 +33,9 @@
            Dim preis As Object = Nothing
            If IsNumeric(r.Cells("Preis").Value) Then preis = CDbl(r.Cells("Preis").Value)
            If leistung <> "" Then
+
                SENDUNG.ABRECHNUNG.Add(New VERAG_PROG_ALLGEMEIN.cSendungAbrechnung(SENDUNG.tblSnd_SendungID, _beteiligter, "", "", leistung, 1, preis, preis))
+
            End If
        Next

@@ -58,7 +61,11 @@
        For Each a In SENDUNG.ABRECHNUNG
            If a.sndabr_beteiligter = _beteiligter Then
                If a.sndabr_abrArt = "" Then
-                    dgv.Rows.Add(a.sndabr_bezeichnung, If(a.sndabr_preis, ""))
+                    If a.sndabr_bezeichnung.Length > maxInputLenght Then
+                        dgv.Rows.Add(a.sndabr_bezeichnung.Substring(0, maxInputLenght), If(a.sndabr_preis, ""))
+                    Else
+                        dgv.Rows.Add(a.sndabr_bezeichnung, If(a.sndabr_preis, ""))
+                    End If
                End If
            End If
        Next
@@ -68,6 +75,9 @@
        For cnt = dgv.RowCount To 2
            dgv.Rows.Add("", "")
        Next
+
+        CType(dgv.Columns("Leistung"), DataGridViewTextBoxColumn).MaxInputLength = maxInputLenght
+
    End Sub
 End Class

--- a/Aviso/frmSendungsdetailsNEU.Designer.vb
+++ b/Aviso/frmSendungsdetailsNEU.Designer.vb
@@ -76,6 +76,7 @@ Partial Class frmSendungsdetailsNEU
        Me.ToolStripMenuItem22 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem23 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem24 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem31 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem12 = New System.Windows.Forms.ToolStripMenuItem()
        Me.TabPage1 = New System.Windows.Forms.TabPage()
        Me.pnlKundenZolltarif = New System.Windows.Forms.Panel()
@@ -383,6 +384,7 @@ Partial Class frmSendungsdetailsNEU
        Me.ExportT1ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.AMBARZollbeschauToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.AMBARZollbeschauNEUToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.AntragQualitätskontrolleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ToolStripMenuItem15 = New System.Windows.Forms.ToolStripMenuItem()
        Me.T1BestätigungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -412,7 +414,6 @@ Partial Class frmSendungsdetailsNEU
        Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ToolStripMenuItem14 = New System.Windows.Forms.ToolStripMenuItem()
        Me.NurÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.AntragQualitätskontrolleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.pnl.SuspendLayout()
        Me.Panel4.SuspendLayout()
        Me.TabControl1.SuspendLayout()
@@ -890,7 +891,7 @@ Partial Class frmSendungsdetailsNEU
        'MenuStrip
        '
        Me.MenuStrip.ImageScalingSize = New System.Drawing.Size(24, 24)
-        Me.MenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem13, Me.ToolStripMenuItem7, Me.ToolStripMenuItem6, Me.ToolStripMenuItem11, Me.ToolStripMenuItem17, Me.ToolStripMenuItem21, Me.ToolStripMenuItem12})
+        Me.MenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem13, Me.ToolStripMenuItem7, Me.ToolStripMenuItem6, Me.ToolStripMenuItem11, Me.ToolStripMenuItem17, Me.ToolStripMenuItem21, Me.ToolStripMenuItem31, Me.ToolStripMenuItem12})
        Me.MenuStrip.Location = New System.Drawing.Point(0, 0)
        Me.MenuStrip.Name = "MenuStrip"
        Me.MenuStrip.Size = New System.Drawing.Size(1206, 32)
@@ -974,7 +975,7 @@ Partial Class frmSendungsdetailsNEU
        '
        Me.ToolStripMenuItem20.Image = Global.AVISO.My.Resources.Resources.plus
        Me.ToolStripMenuItem20.Name = "ToolStripMenuItem20"
-        Me.ToolStripMenuItem20.Size = New System.Drawing.Size(103, 30)
+        Me.ToolStripMenuItem20.Size = New System.Drawing.Size(188, 30)
        Me.ToolStripMenuItem20.Text = "EZA"
        '
        'ToolStripMenuItem18
@@ -983,7 +984,7 @@ Partial Class frmSendungsdetailsNEU
        Me.ToolStripMenuItem18.Font = New System.Drawing.Font("Segoe UI", 9.0!)
        Me.ToolStripMenuItem18.Image = Global.AVISO.My.Resources.Resources.plus
        Me.ToolStripMenuItem18.Name = "ToolStripMenuItem18"
-        Me.ToolStripMenuItem18.Size = New System.Drawing.Size(103, 30)
+        Me.ToolStripMenuItem18.Size = New System.Drawing.Size(188, 30)
        Me.ToolStripMenuItem18.Text = "T1"
        '
        'ToolStripMenuItem19
@@ -992,7 +993,7 @@ Partial Class frmSendungsdetailsNEU
        Me.ToolStripMenuItem19.Font = New System.Drawing.Font("Segoe UI", 9.0!)
        Me.ToolStripMenuItem19.Image = Global.AVISO.My.Resources.Resources.plus
        Me.ToolStripMenuItem19.Name = "ToolStripMenuItem19"
-        Me.ToolStripMenuItem19.Size = New System.Drawing.Size(103, 30)
+        Me.ToolStripMenuItem19.Size = New System.Drawing.Size(188, 30)
        Me.ToolStripMenuItem19.Text = "T2"
        '
        'ToolStripMenuItem21
@@ -1029,6 +1030,15 @@ Partial Class frmSendungsdetailsNEU
        Me.ToolStripMenuItem24.Size = New System.Drawing.Size(184, 30)
        Me.ToolStripMenuItem24.Text = "MIC Export senden"
        '
+        'ToolStripMenuItem31
+        '
+        Me.ToolStripMenuItem31.Image = Global.AVISO.My.Resources.Resources.plus
+        Me.ToolStripMenuItem31.Name = "ToolStripMenuItem31"
+        Me.ToolStripMenuItem31.Padding = New System.Windows.Forms.Padding(8, 0, 8, 0)
+        Me.ToolStripMenuItem31.Size = New System.Drawing.Size(117, 28)
+        Me.ToolStripMenuItem31.Text = "  Modaltrans"
+        Me.ToolStripMenuItem31.ToolTipText = "Neue Zollanmeldung"
+        '
        'ToolStripMenuItem12
        '
        Me.ToolStripMenuItem12.Image = Global.AVISO.My.Resources.Resources.android_note
@@ -5039,7 +5049,7 @@ Partial Class frmSendungsdetailsNEU
        Me.ctxtWeitereFormulare.ImageScalingSize = New System.Drawing.Size(24, 24)
        Me.ctxtWeitereFormulare.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolGelangensbestätigung, Me.toolOriginalSendungsunterlagen, Me.LaufzettelDruckenToolStripMenuItem, Me.ZollstoppAMBARToolStripMenuItem, Me.ATANAKToolStripMenuItem, Me.AMBARZollbeschauToolStripMenuItem, Me.AMBARZollbeschauNEUToolStripMenuItem, Me.AntragQualitätskontrolleToolStripMenuItem})
        Me.ctxtWeitereFormulare.Name = "cntxt"
-        Me.ctxtWeitereFormulare.Size = New System.Drawing.Size(263, 202)
+        Me.ctxtWeitereFormulare.Size = New System.Drawing.Size(263, 180)
        '
        'toolGelangensbestätigung
        '
@@ -5088,19 +5098,19 @@ Partial Class frmSendungsdetailsNEU
        'ImportToolStripMenuItem
        '
        Me.ImportToolStripMenuItem.Name = "ImportToolStripMenuItem"
-        Me.ImportToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ImportToolStripMenuItem.Size = New System.Drawing.Size(123, 22)
        Me.ImportToolStripMenuItem.Text = "Import"
        '
        'ExportToolStripMenuItem
        '
        Me.ExportToolStripMenuItem.Name = "ExportToolStripMenuItem"
-        Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(123, 22)
        Me.ExportToolStripMenuItem.Text = "Export"
        '
        'ExportT1ToolStripMenuItem
        '
        Me.ExportT1ToolStripMenuItem.Name = "ExportT1ToolStripMenuItem"
-        Me.ExportT1ToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ExportT1ToolStripMenuItem.Size = New System.Drawing.Size(123, 22)
        Me.ExportT1ToolStripMenuItem.Text = "Export T1"
        '
        'AMBARZollbeschauToolStripMenuItem
@@ -5117,6 +5127,12 @@ Partial Class frmSendungsdetailsNEU
        Me.AMBARZollbeschauNEUToolStripMenuItem.Text = "AMBAR - Zollbeschau NEU"
        Me.AMBARZollbeschauNEUToolStripMenuItem.Visible = False
        '
+        'AntragQualitätskontrolleToolStripMenuItem
+        '
+        Me.AntragQualitätskontrolleToolStripMenuItem.Name = "AntragQualitätskontrolleToolStripMenuItem"
+        Me.AntragQualitätskontrolleToolStripMenuItem.Size = New System.Drawing.Size(262, 22)
+        Me.AntragQualitätskontrolleToolStripMenuItem.Text = "Antrag Qualitätskontrolle"
+        '
        'ContextMenuStrip1
        '
        Me.ContextMenuStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
@@ -5322,12 +5338,6 @@ Partial Class frmSendungsdetailsNEU
        Me.NurÖffnenToolStripMenuItem.Size = New System.Drawing.Size(255, 30)
        Me.NurÖffnenToolStripMenuItem.Text = "nur öffnen"
        '
-        'AntragQualitätskontrolleToolStripMenuItem
-        '
-        Me.AntragQualitätskontrolleToolStripMenuItem.Name = "AntragQualitätskontrolleToolStripMenuItem"
-        Me.AntragQualitätskontrolleToolStripMenuItem.Size = New System.Drawing.Size(262, 22)
-        Me.AntragQualitätskontrolleToolStripMenuItem.Text = "Antrag Qualitätskontrolle"
-        '
        'frmSendungsdetailsNEU
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
@@ -5811,4 +5821,5 @@ Partial Class frmSendungsdetailsNEU
    Friend WithEvents ToolStripMenuItem30 As ToolStripMenuItem
    Friend WithEvents Button19 As Button
    Friend WithEvents AntragQualitätskontrolleToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem31 As ToolStripMenuItem
 End Class
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -1877,7 +1877,7 @@ Public Class frmSendungsdetailsNEU

    Function CheckAusfuellen() As Boolean
        If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenbezeichnung = "" Or SENDUNG_LIST(CURRENT_INDEX).tblSnd_Colli = "" Or SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht = "" Then
-            Return (MsgBox("Möhten Sie den Aktendeckel wirklich ohne Warenbezeichnung, Colli bzw. Gewicht drucken?", vbYesNoCancel) = vbYes)
+            Return (MsgBox("Möchten Sie den Aktendeckel wirklich ohne Warenbezeichnung, Colli bzw. Gewicht drucken?", vbYesNoCancel) = vbYes)
        End If
        Return True
    End Function
@@ -6264,6 +6264,9 @@ Public Class frmSendungsdetailsNEU

    Private Sub Button19_Click(sender As Object, e As EventArgs) Handles Button19.Click

+        MsgBox("Funktion noch nicht implementiert!")
+        Exit Sub
+
        Dim failreDesc As String = ""

        If dgvAnhang.SelectedRows.Count = 0 Then
@@ -6308,7 +6311,18 @@ Public Class frmSendungsdetailsNEU

    End Sub

-    Private Sub AntragQualitätskontrolleToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AntragQualitätskontrolleToolStripMenuItem.Click
+    Private Sub ToolStripMenuItem31_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem31.Click
+        'MsgBox("Funktion noch nicht implementiert!")
+        'Exit Sub

+        SAVE_ME()
+        If Not IsNumeric(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) OrElse CInt(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
+        Dim frMZA As New SDL.frmZollanmeldung("T1", Nothing, AVISO, SENDUNG_LIST(CURRENT_INDEX), Now.ToString("yy"), "MODALTRANS")
+        frMZA.Show()
+        AddHandler frMZA.FormClosed, Sub()
+                                         initdgvZollAnmeldungen()
+                                     End Sub
    End Sub
+
+
 End Class