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

Merge branch 'master' of https://dev.azure.com/VeragAG/_git/AVISO

Browse Source
This commit is contained in:
Andreas Luxbauer
2024-11-14 21:52:06 +01:00
parent ce3134a939 96eb0f39c0
commit c61bbfe598
3 changed files with 53 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aviso/frmGesamtsicherheitenNEU.vb
View File

@@ -77,7 +77,7 @@ Public Class frmGesamtsicherheitenNEU
panOverlay.Visible = True
cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] = 1 AND wo_ze = 1 ORDER BY [wo_reihenfolge] ", True, "AVISO", True) 'AND [wo_firma] = " & firmaId & "
cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] = 1 AND wo_ze = 1 AND [wo_firma] = " & firmaId & " ORDER BY [wo_reihenfolge] ", True, "AVISO", True) '
If datum = Nothing Then datum = Date.Now
nextGessicherheitID = -1

2
Aviso/frmHauptfenster.vb
View File

@@ -616,7 +616,7 @@ Public Class frmHauptfenster
Dim f As New frmZEButtons("in", VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasFirmen)
f.ShowDialog()
f.BringToFront()
Else
Dim info
timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "in", IIf(cAllgemein.MITARBEITER.mit_homeoffice, 3, 0))
MsgBox(info)

60
Aviso/usrCntlSND_ATBGestellung.vb
View File

@@ -48,15 +48,35 @@ Public Class usrCntlSND_ATBGestellung
Standort = "Unisped GmbH"
Case 5701
Standort = "AMBAR"
Case 4810,
Case 4810, 5103, 5901
Standort = "VERAG GmbH"
Case 5103
Standort = "VERAG CS"
Case 5501
Standort = "IMEX"
End Select
'sonderfälle lt. Mestan
If SND.tblSnd_Zollsystem_Land = "DE" Then
Select Case SND.FilialenNr
Case 5501, 4803, 4809, 5103
Standort = "VERAG GmbH"
End Select
ElseIf SND.tblSnd_Zollsystem_Land = "AT" Then
If SND.tblSnd_Abfertigungsart_ID = 1 Then 'ZA
Standort = "VERAG CS"
ElseIf SND.tblSnd_Abfertigungsart_ID = 38 Then 'EV-Verz
Select Case SND.FilialenNr
Case 4803, 5303, 4809, 5103
Standort = "VERAG CS"
End Select
End If
End If
Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz(Standort)
If GesSichRef Is Nothing Then MsgBox("Verwahrungsreferenz kann nicht ermittelt werden!") : Exit Sub
@@ -152,20 +172,42 @@ Public Class usrCntlSND_ATBGestellung
Dim Standort As String = ""
Select Case SND.FilialenNr
Case 4803, 4809, 4810
Standort = "VERAG GmbH" : firmaId = 1
Case 4803, 4809
Standort = "VERAG AG" : firmaId = 2
Case 5601
Standort = "Unisped GmbH" : firmaId = 21
Case 5701
Standort = "AMBAR" : firmaId = 24
Case 5103
Standort = "VERAG CS" : firmaId = 11
Case 4810, 5103, 5901
Standort = "VERAG GmbH" : firmaId = 1
Case 5501
Standort = "IMEX" : firmaId = 20
End Select
'sonderfälle lt. Mestan
If SND.tblSnd_Zollsystem_Land = "DE" Then
Select Case SND.FilialenNr
Case 5501, 4803, 4809, 5103
Standort = "VERAG GmbH" : firmaId = 1
End Select
ElseIf SND.tblSnd_Zollsystem_Land = "AT" Then
If SND.tblSnd_Abfertigungsart_ID = 1 Then 'ZA
Standort = "VERAG CS" : firmaId = 11
ElseIf SND.tblSnd_Abfertigungsart_ID = 38 Then 'EV-Verz
Select Case SND.FilialenNr
Case 4803, 5303, 4809, 5103
Standort = "VERAG CS" : firmaId = 11
End Select
End If
End If
Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort)
Dim frm As New frmGesamtsicherheitenNEU