edv/AVISO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
d.breimaier
2026-04-09 13:02:02 +02:00
parent ed9bb82597 6b2e60a3a2
commit ae8231c9a3
7 changed files with 236 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Aviso/frmHauptfenster.vb
View File

@@ -207,12 +207,12 @@ Public Class frmHauptfenster
If message.StartsWith("OpenKd_") Then
Invoke(Sub()
Dim split = message.ToString.split("_")
Dim split = message.ToString.Split("_")
FUNC.showKd(split(1), True)
End Sub)
ElseIf message.StartsWith("OpenAvisoSnd_") Then
Invoke(Sub()
Dim split = message.ToString.split("_")
Dim split = message.ToString.Split("_")
If split.Count > 1 AndAlso IsNumeric(split(1)) AndAlso split(1) > 0 Then
Dim frmSendungsdetails As New frmSendungsdetailsNEU(split(1), -1)
frmSendungsdetails.ShowDialog(Me)
@@ -221,7 +221,7 @@ Public Class frmHauptfenster
ElseIf message.StartsWith("OpenAviso_") Then
Invoke(Sub()
Dim split = message.ToString.split("_")
Dim split = message.ToString.Split("_")
If split.Count > 1 AndAlso IsNumeric(split(1)) AndAlso split(1) > 0 Then
If IsNumeric(split(1)) AndAlso split(1) > 0 Then
@@ -1513,7 +1513,14 @@ ELSE_ATILLA:
sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR CLUSTER='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' OR FIRMA='ATILLA' ) "
Else
sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR CLUSTER='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' ) "
' MsgBox(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then
' '+AMBAR
' sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR (tblSendungen.FilialenNr IN('5701') AND tblSnd_Abfertigungsart_ID IN(1,38,39,46,66)) ) "
'Else
' sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' ) "
'End If
End If
Else
@@ -2305,7 +2312,7 @@ ELSE_ATILLA:
Dim t As String = txtSuche.Text
' t = t.Replace("/V003/", "")
t = t.Replace("/", "")
Dim v() = t.split("-")
Dim v() = t.Split("-")
'Dim o As New cOptionenDAL
If v.Length > 1 Then