Merge branch 'master' of https://git.it.verag.ag/edv/AVISO

2026-08-18 09:07:04 +02:00
parent 90d965e064 a139545ba3
commit dbc0826321
10 changed files with 659 additions and 512 deletions
--- a/Aviso/App.config
+++ b/Aviso/App.config
@@ -6,8 +6,7 @@
    </sectionGroup>
  </configSections>
  <connectionStrings>
-    <add name="AVISO.My.MySettings.AVISO_ConnectionString_TEST" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;"
-      providerName="System.Data.SqlClient" />
+    <add name="AVISO.My.MySettings.AVISO_ConnectionString_TEST" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;" providerName="System.Data.SqlClient" />
  </connectionStrings>
  <appSettings>
    <add key="CustomerPortalApiBaseUrl" value="https://login.server.verag.ag" />
--- a/Aviso/Classes/cSendungsoptions.vb
+++ b/Aviso/Classes/cSendungsoptions.vb
@@ -156,12 +156,19 @@ Public Class SendungOptions
        End If
        'Dim DATENSERVER As New VERAG_PROG_ALLGEMEIN.cDATENSERVER

+
+
        Dim abfertArt = ""
        If SENDUNG.tblSnd_Abfertigungsart_ID > 0 Then abfertArt = "" & SENDUNG.tblSnd_Abfertigungsart_ID & " - " & ADMIN.getValueTxtBySql("SELECT isnull([Abfertigungsbezeichnung],'') FROM [Abfertigungsarten] WHERE  [Abfertigungsart]=" & SENDUNG.tblSnd_Abfertigungsart_ID, "FMZOLL")

        Dim VALUES As New Gemeinsames.rptSendungenValues
        If barcodeLKW IsNot Nothing Then VALUES.barcodeLKW = barcodeLKW
        If barcode IsNot Nothing Then VALUES.barcodeSendung = barcode
+        If AVISO IsNot Nothing AndAlso AVISO.AvisoID >= 0 Then
+            VALUES.LKW_ID = AVISO.AvisoID
+        End If
+
+

        Dim imgQR As Image = Nothing
        If SENDUNG.tblSnd_Abfertigungsart_ID.ToString = "44" Then
--- 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("4.3.0.3")>
-<Assembly: AssemblyFileVersion("4.3.0.3")>
+<Assembly: AssemblyVersion("4.3.1.3")>
+<Assembly: AssemblyFileVersion("4.3.1.3")>
--- a/Aviso/frmHauptfenster.Designer.vb
+++ b/Aviso/frmHauptfenster.Designer.vb
@@ -134,6 +134,7 @@ Partial Class frmHauptfenster
        Me.ATUnispedGmbHToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.DEAmbarToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ATAtillaToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.DEZollernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ReferenzwerteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem10 = New System.Windows.Forms.ToolStripMenuItem()
        Me.TICKETWaidhausToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -312,7 +313,6 @@ Partial Class frmHauptfenster
        Me.picAVISOMessenger = New System.Windows.Forms.PictureBox()
        Me.pic = New System.Windows.Forms.PictureBox()
        Me.SplitContainer3 = New System.Windows.Forms.SplitContainer()
-        Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
        Me.pnl = New System.Windows.Forms.Panel()
        Me.Button10 = New System.Windows.Forms.Button()
        Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
@@ -425,10 +425,11 @@ Partial Class frmHauptfenster
        Me.ZertifikateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.HomepageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.pnlLeft = New System.Windows.Forms.Panel()
-        Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen()
        Me.Panel5 = New System.Windows.Forms.Panel()
        Me.Panel7 = New System.Windows.Forms.Panel()
-        Me.DEZollernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
+        Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen()
+        Me.BerechtigungenNeuLadenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
        Me.conMenuAviso.SuspendLayout()
        Me.MenuStrip1.SuspendLayout()
        Me.pnlDetailsRechts.SuspendLayout()
@@ -662,7 +663,7 @@ Partial Class frmHauptfenster
        '
        'AdministrationToolStripMenuItem
        '
-        Me.AdministrationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KdNrZuordnenToolStripMenuItem, Me.OptionenToolStripMenuItem1, Me.VorlagenUploadToolStripMenuItem, Me.BarcodeTestToolStripMenuItem, Me.TabellenToolStripMenuItem, Me.SMSTestToolStripMenuItem, Me.QSTeamsToolStripMenuItem, Me.LeereRechnungToolStripMenuItem, Me.EMAILTESTToolStripMenuItem, Me.FreigabeMailTestToolStripMenuItem, Me.SDLProgrammStartenToolStripMenuItem, Me.TESTToolStripMenuItem, Me.AlleStatusMailsSchickenToolStripMenuItem, Me.RoutenverwaltungToolStripMenuItem, Me.AnhangsartenToolStripMenuItem, Me.SpireLizenzPrüfenToolStripMenuItem, Me.UNBescheinigungAusTFEinlesenToolStripMenuItem, Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem, Me.PrüfeBilderAufBase64ToolStripMenuItem})
+        Me.AdministrationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KdNrZuordnenToolStripMenuItem, Me.OptionenToolStripMenuItem1, Me.VorlagenUploadToolStripMenuItem, Me.BarcodeTestToolStripMenuItem, Me.TabellenToolStripMenuItem, Me.SMSTestToolStripMenuItem, Me.QSTeamsToolStripMenuItem, Me.LeereRechnungToolStripMenuItem, Me.EMAILTESTToolStripMenuItem, Me.FreigabeMailTestToolStripMenuItem, Me.SDLProgrammStartenToolStripMenuItem, Me.TESTToolStripMenuItem, Me.AlleStatusMailsSchickenToolStripMenuItem, Me.RoutenverwaltungToolStripMenuItem, Me.AnhangsartenToolStripMenuItem, Me.SpireLizenzPrüfenToolStripMenuItem, Me.UNBescheinigungAusTFEinlesenToolStripMenuItem, Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem, Me.PrüfeBilderAufBase64ToolStripMenuItem, Me.BerechtigungenNeuLadenToolStripMenuItem1})
        Me.AdministrationToolStripMenuItem.Name = "AdministrationToolStripMenuItem"
        Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(213, 22)
        Me.AdministrationToolStripMenuItem.Text = "Administration"
@@ -1070,50 +1071,56 @@ Partial Class frmHauptfenster
        'ATVeragAGToolStripMenuItem
        '
        Me.ATVeragAGToolStripMenuItem.Name = "ATVeragAGToolStripMenuItem"
-        Me.ATVeragAGToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ATVeragAGToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
        Me.ATVeragAGToolStripMenuItem.Text = "AT | Verag AG"
        '
        'ATImexCSToolStripMenuItem
        '
        Me.ATImexCSToolStripMenuItem.Name = "ATImexCSToolStripMenuItem"
-        Me.ATImexCSToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ATImexCSToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
        Me.ATImexCSToolStripMenuItem.Text = "AT | IMEX CS GmbH"
        '
        'ATVeragCSToolStripMenuItem
        '
        Me.ATVeragCSToolStripMenuItem.Name = "ATVeragCSToolStripMenuItem"
-        Me.ATVeragCSToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ATVeragCSToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
        Me.ATVeragCSToolStripMenuItem.Text = "AT | Verag CS"
        '
        'DEVeragGmbHToolStripMenuItem
        '
        Me.DEVeragGmbHToolStripMenuItem.Name = "DEVeragGmbHToolStripMenuItem"
-        Me.DEVeragGmbHToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.DEVeragGmbHToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
        Me.DEVeragGmbHToolStripMenuItem.Text = "DE | Verag GmbH"
        '
        'ATUnispedGmbHToolStripMenuItem
        '
        Me.ATUnispedGmbHToolStripMenuItem.Name = "ATUnispedGmbHToolStripMenuItem"
-        Me.ATUnispedGmbHToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ATUnispedGmbHToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
        Me.ATUnispedGmbHToolStripMenuItem.Text = "AT | Unisped GmbH"
        '
        'DEAmbarToolStripMenuItem
        '
        Me.DEAmbarToolStripMenuItem.Name = "DEAmbarToolStripMenuItem"
-        Me.DEAmbarToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.DEAmbarToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
        Me.DEAmbarToolStripMenuItem.Text = "DE | Ambar GmbH"
        Me.DEAmbarToolStripMenuItem.Visible = False
        '
        'ATAtillaToolStripMenuItem
        '
        Me.ATAtillaToolStripMenuItem.Name = "ATAtillaToolStripMenuItem"
-        Me.ATAtillaToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ATAtillaToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
        Me.ATAtillaToolStripMenuItem.Text = "AT | Atilla GmbH"
        '
+        'DEZollernToolStripMenuItem
+        '
+        Me.DEZollernToolStripMenuItem.Name = "DEZollernToolStripMenuItem"
+        Me.DEZollernToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
+        Me.DEZollernToolStripMenuItem.Text = "DE | Zollern"
+        '
        'ReferenzwerteToolStripMenuItem
        '
        Me.ReferenzwerteToolStripMenuItem.Name = "ReferenzwerteToolStripMenuItem"
-        Me.ReferenzwerteToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ReferenzwerteToolStripMenuItem.Size = New System.Drawing.Size(179, 22)
        Me.ReferenzwerteToolStripMenuItem.Text = "Referenzwerte"
        '
        'ToolStripMenuItem10
@@ -2702,15 +2709,6 @@ Partial Class frmHauptfenster
        Me.SplitContainer3.SplitterDistance = 99
        Me.SplitContainer3.TabIndex = 3
        '
-        'UsrCntlBenachrichtigungen1
-        '
-        Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0)
-        Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1"
-        Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(99, 300)
-        Me.UsrCntlBenachrichtigungen1.TabIndex = 0
-        '
        'pnl
        '
        Me.pnl.Controls.Add(Me.Button10)
@@ -4066,15 +4064,6 @@ Partial Class frmHauptfenster
        Me.pnlLeft.TabIndex = 88
        Me.pnlLeft.Visible = False
        '
-        'UsrCntlBenachrichtigungen2
-        '
-        Me.UsrCntlBenachrichtigungen2.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 51)
-        Me.UsrCntlBenachrichtigungen2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.UsrCntlBenachrichtigungen2.Name = "UsrCntlBenachrichtigungen2"
-        Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(252, 243)
-        Me.UsrCntlBenachrichtigungen2.TabIndex = 1
-        '
        'Panel5
        '
        Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom
@@ -4092,11 +4081,29 @@ Partial Class frmHauptfenster
        Me.Panel7.Size = New System.Drawing.Size(252, 51)
        Me.Panel7.TabIndex = 4
        '
-        'DEZollernToolStripMenuItem
+        'UsrCntlBenachrichtigungen1
        '
-        Me.DEZollernToolStripMenuItem.Name = "DEZollernToolStripMenuItem"
-        Me.DEZollernToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
-        Me.DEZollernToolStripMenuItem.Text = "DE | Zollern"
+        Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0)
+        Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1"
+        Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(99, 300)
+        Me.UsrCntlBenachrichtigungen1.TabIndex = 0
+        '
+        'UsrCntlBenachrichtigungen2
+        '
+        Me.UsrCntlBenachrichtigungen2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 51)
+        Me.UsrCntlBenachrichtigungen2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.UsrCntlBenachrichtigungen2.Name = "UsrCntlBenachrichtigungen2"
+        Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(252, 243)
+        Me.UsrCntlBenachrichtigungen2.TabIndex = 1
+        '
+        'BerechtigungenNeuLadenToolStripMenuItem1
+        '
+        Me.BerechtigungenNeuLadenToolStripMenuItem1.Name = "BerechtigungenNeuLadenToolStripMenuItem1"
+        Me.BerechtigungenNeuLadenToolStripMenuItem1.Size = New System.Drawing.Size(257, 22)
+        Me.BerechtigungenNeuLadenToolStripMenuItem1.Text = "Berechtigungen neu laden"
        '
        'frmHauptfenster
        '
@@ -4567,4 +4574,5 @@ Partial Class frmHauptfenster
    Friend WithEvents ToolStripMenuItem23 As ToolStripMenuItem
    Friend WithEvents ToolStripMenuItem25 As ToolStripMenuItem
    Friend WithEvents DEZollernToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents BerechtigungenNeuLadenToolStripMenuItem1 As ToolStripMenuItem
 End Class
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
--- a/Aviso/frmSendungsdetailsNEU.Designer.vb
+++ b/Aviso/frmSendungsdetailsNEU.Designer.vb
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -326,30 +326,50 @@ Public Class frmSendungsdetailsNEU
                        (cboVorpapier2.Text.Trim <> "" AndAlso txtVorpapier2Pos.Text.Trim = "" Or cboVorpapier2.Text.Trim = "" AndAlso txtVorpapier2Pos.Text.Trim <> "") OrElse
                        (cboVorpapier3.Text.Trim <> "" AndAlso txtVorpapier3Pos.Text.Trim = "" Or cboVorpapier3.Text.Trim = "" AndAlso txtVorpapier3Pos.Text.Trim <> "")

+
+            Dim missingWarenwert As Boolean = (txtWarenwert.Text.Trim = "" OrElse txtWarenwertWaehrung.Text.Trim = "") AndAlso (
+                                                                                                                                cboVorpapier.Text.Trim <> "" OrElse
+                                                                                                                                txtVorpapierPos.Text.Trim <> "" OrElse
+                                                                                                                                cboVorpapier2.Text.Trim <> "" OrElse
+                                                                                                                                txtVorpapier2Pos.Text.Trim <> "" OrElse
+                                                                                                                                cboVorpapier3.Text.Trim <> "" OrElse
+                                                                                                                                txtVorpapier3Pos.Text.Trim <> ""
+                                                                                                                            )
+
+
            Dim hasIssue As Boolean

-            If isVerimex Then
-                hasIssue = (invalidPrepaper OrElse missingPosition)
-            Else
-                hasIssue = (invalidPrepaper OrElse missingPosition)
-            End If
+            hasIssue = (invalidPrepaper OrElse missingPosition)

            Dim InfoMsg As String

            If isVerimex Then
-                InfoMsg = "Pre-Paper/PosNr data is invalid or incomplete. Continue?"
+                InfoMsg = "Pre-Paper/PosNr data is invalid or incomplete." & vbCrLf & vbCrLf & "Do you want to continue anyway?"
            Else
-                InfoMsg = "Vorpapier-Nr/PosNr ist ungültig oder nicht vollständig, fortfahren?"
+                InfoMsg = "Vorpapier-Nr/PosNr ist ungültig oder nicht vollständig." & vbCrLf & vbCrLf & "Möchten Sie trotzdem fortfahren?"
+            End If
+
+            If Not hasIssue Then
+                hasIssue = missingWarenwert
+                If isVerimex Then
+                    InfoMsg = "The value of the goods has not been entered." & vbCrLf & vbCrLf & "Do you want to continue anyway?"
+                Else
+                    InfoMsg = "Der Warenwert wurde nicht eingetragen." & vbCrLf & vbCrLf & "Möchten Sie trotzdem fortfahren?"
+                End If
            End If

            If hasIssue Then
-
                If showErr Then
-                    If MsgBox(InfoMsg, vbYesNoCancel) <> vbYes Then
+                    If MsgBox(InfoMsg, vbYesNoCancel Or vbExclamation Or vbDefaultButton2, "Warning") <> vbYes Then
+                        If InfoMsg.Contains("Warenwert") Then
+                            txtWarenwert.Focus()
+                        Else
+                            txtVorpapierPos.Focus()
+                        End If
+
                        Return False
                    End If
                End If
-
            End If


@@ -364,6 +384,28 @@ Public Class frmSendungsdetailsNEU
                rtbValidierung.Text &= err & vbNewLine : pnlValidation.Visible = True

            End If
+            Dim isATB = SENDUNG_LIST.Any(Function(r) r.tblSnd_Abfertigungsart_ID = 44)
+
+            If isATB Then
+
+                Dim invalidSendung = SENDUNG_LIST.FirstOrDefault(Function(r) r.tblSnd_Abfertigungsart_ID <> 44 AndAlso ((String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier) OrElse
+             String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier_Pos)) OrElse
+            ((Not String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier2) OrElse
+              Not String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier2_Pos)) AndAlso
+             (String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier2) OrElse
+              String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier2_Pos))) OrElse
+            ((Not String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier3) OrElse
+              Not String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier3_Pos)) AndAlso
+             (String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier3) OrElse
+              String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier3_Pos)))))
+
+                If invalidSendung IsNot Nothing Then
+                    Dim err = "Sendung " & invalidSendung.tblSnd_PosUnterNr & " Vorp-Nr/PosNr fehlt/ist falsch."
+                    rtbValidierung.Text &= err & vbNewLine : pnlValidation.Visible = True
+                End If
+
+                End If
+



@@ -381,7 +423,7 @@ Public Class frmSendungsdetailsNEU

    Sub NEXT_SENDUNG()
        loadDataInLIST()
-        If CURRENT_INDEX + 1 < SENDUNG_LIST.Count Then
+        If CURRENT_INDEX + 1 <SENDUNG_LIST.Count Then
            CURRENT_INDEX += 1
            initDataBinding()
            '  initButtons()
@@ -4383,7 +4425,10 @@ Public Class frmSendungsdetailsNEU
                Dim f As SDL.frmFormulare = Nothing
                SDL.FormularManagerNEU.OPEN_FORM_Byref(SDL.FormularManagerArten.Importaviso, kdnrFrm, {kdnrFrm, FirmaFrm, SENDUNG_LIST(CURRENT_INDEX), AVISO, ROLLE},, f)
                AddHandler f.FormClosing, Sub()
-                                              If f.printed Then AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "Auftrag fehlt - angefordert", 1)
+                                              If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Firma <> 24 Then
+                                                  If f.printed Then AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "Auftrag fehlt - angefordert", 1)
+                                              End If
+
                                          End Sub

        End Select