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

Compare commits

base: edv:b4f812062bf833657cbadc023181ec61eef2676d
Branches Tags
edv:master edv:Aviso_Murad edv:essensbestellungen edv:change_VM_logic edv:SDL
...
compare: edv:master
Branches Tags
edv:master edv:Aviso_Murad edv:essensbestellungen edv:change_VM_logic edv:SDL

14 Commits
b4f812062b ... master

Author SHA1 Message Date
d.breimaier
03b3296078 divl. Änderungne 2026-06-17 17:02:05 +02:00
d.breimaier
4a6ca14b55 Merge branch 'master' of https://git.it.verag.ag/edv/AVISO 2026-06-16 14:07:00 +02:00
d.breimaier
63c25aeac1 Version 2026-06-16 14:06:54 +02:00
Andreas Luxbauer
244564b24c Merge branch 'master' of https://git.it.verag.ag/edv/AVISO 2026-06-16 13:22:14 +02:00
Andreas Luxbauer
0649e9fc6e status link 2026-06-16 13:22:01 +02:00
d.breimaier
d742e3acfa Merge branch 'master' of https://git.it.verag.ag/edv/AVISO 2026-06-15 15:30:59 +02:00
d.breimaier
95b99503d1 Version 2026-06-15 15:30:56 +02:00
Andreas Luxbauer
b887f62438 vers 2026-06-15 15:25:21 +02:00
Andreas Luxbauer
9ea1ac2aa9 merge 2026-06-12 19:27:24 +02:00
Andreas Luxbauer
139ffffed4 vers 2026-06-12 19:27:07 +02:00
d.breimaier
817638099e version 2026-06-12 14:28:47 +02:00
d.breimaier
a5d1e847f3 Zollern FirmaID korrigiert. 2026-06-10 16:52:58 +02:00
d.breimaier
911d50d8aa fix 2026-06-10 11:49:05 +02:00
d.breimaier
a583a220c5 version 2026-06-08 17:21:22 +02:00
5 changed files with 10 additions and 14 deletions
Expand all files Collapse all files

4
Aviso/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("4.2.8.6")> <Assembly: AssemblyVersion("4.2.9.1")>
<Assembly: AssemblyFileVersion("4.2.8.6")> <Assembly: AssemblyFileVersion("4.2.9.1")>

3
Aviso/frmLaufzettel.vb
View File

@@ -643,7 +643,4 @@ Public Class frmLaufzettel
Me.Cursor = Cursors.Default Me.Cursor = Cursors.Default
End Sub End Sub
Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles cbxAktenzettelDruck.CheckedChanged
End Sub
End Class End Class

8
Aviso/frmLogin.vb
View File

@@ -218,13 +218,13 @@ Public Class frmLogin
Dim SQLSTR = " Dim SQLSTR = "
SELECT AVISOID,KDNR FROM SELECT AVISOID,KDNR FROM
( (
SELECT AvisoId,Auftraggeber_KdNr as KDNR FROM [Aviso] where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX') and cast(datum as date)> '29.01.2024' and status NOT IN (1,2) SELECT AvisoId,Auftraggeber_KdNr as KDNR FROM [Aviso] where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX','AMBAR','UNISPED') and cast(datum as date)> '29.01.2024' and status NOT IN (1,2)
UNION UNION
SELECT AvisoId,Frächter_KdNr as KDNR FROM [Aviso] where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX') and cast(datum as date)> '29.01.2024' and status NOT IN (1,2) SELECT AvisoId,Frächter_KdNr as KDNR FROM [Aviso] where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX','AMBAR','UNISPED') and cast(datum as date)> '29.01.2024' and status NOT IN (1,2)
UNION UNION
SELECT AvisoId,tblSnd_AvisiererKdNr as KDNR FROM [Aviso] inner join tblSendungen on tblSnd_AvisoID=AvisoID where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX') and cast(datum as date)> '29.01.2024' and status NOT IN (1,2) SELECT AvisoId,tblSnd_AvisiererKdNr as KDNR FROM [Aviso] inner join tblSendungen on tblSnd_AvisoID=AvisoID where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX','AMBAR','UNISPED') and cast(datum as date)> '29.01.2024' and status NOT IN (1,2)
UNION UNION
SELECT AvisoId,tblSnd_FrachtfuehrerKdNr as KDNR FROM [Aviso] inner join tblSendungen on tblSnd_AvisoID=AvisoID where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX') and cast(datum as date)> '29.01.2024' and status NOT IN (1,2) SELECT AvisoId,tblSnd_FrachtfuehrerKdNr as KDNR FROM [Aviso] inner join tblSendungen on tblSnd_AvisoID=AvisoID where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX','AMBAR','UNISPED') and cast(datum as date)> '29.01.2024' and status NOT IN (1,2)
) as T1 ) as T1
where KDNR is not null and kdnr >0 where KDNR is not null and kdnr >0
/*and(SELECT COUNT(*) FROM tblAvisoStatusMails where asm_AvisoId=AvisoID AND asm_KdNr=KdNr and asm_StatuscodeSent=5) =0 */ /*and(SELECT COUNT(*) FROM tblAvisoStatusMails where asm_AvisoId=AvisoID AND asm_KdNr=KdNr and asm_StatuscodeSent=5) =0 */

1
Aviso/frmSendungsdetailsNEU.vb
View File

@@ -2016,7 +2016,6 @@ Public Class frmSendungsdetailsNEU
End If End If
If SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen Then If SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen Then
btnSpeditionsbuchEintragen.BackgroundImage = My.Resources.speditionsbuchAktiv btnSpeditionsbuchEintragen.BackgroundImage = My.Resources.speditionsbuchAktiv
setTooltioBtn(btnSpeditionsbuchEintragen, "Speditionsbuch Eingetrag öffnen") setTooltioBtn(btnSpeditionsbuchEintragen, "Speditionsbuch Eingetrag öffnen")

6
Aviso/usrCntlSND_ATBGestellung.vb
View File

@@ -127,7 +127,7 @@ Public Class usrCntlSND_ATBGestellung
If isZollern(SND) Then If isZollern(SND) Then
Standort = Sicherheiten_Standort.ZOLLERN : firmaID = 99 Standort = Sicherheiten_Standort.ZOLLERN : firmaID = 90
End If End If
@@ -209,7 +209,7 @@ Public Class usrCntlSND_ATBGestellung
Case Sicherheiten_Standort.IMEX Case Sicherheiten_Standort.IMEX
firmaId = 20 firmaId = 20
Case Sicherheiten_Standort.ZOLLERN Case Sicherheiten_Standort.ZOLLERN
firmaId = 99 firmaId = 90
End Select End Select
With frm With frm
@@ -277,7 +277,7 @@ Public Class usrCntlSND_ATBGestellung
If isZollern(SND) Then If isZollern(SND) Then
Standort = Sicherheiten_Standort.ZOLLERN : firmaId = 99 Standort = Sicherheiten_Standort.ZOLLERN : firmaId = 90
End If End If