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-18 13:47:36 +01:00
parent bc5c7a794a c80374d1f0
commit 7a026b309b
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Aviso/frmGesamtsicherheitenNEU.vb
View File

@@ -51,6 +51,8 @@ Public Class frmGesamtsicherheitenNEU
Public firmaId As Integer Public firmaId As Integer
Public warenortPrefix As String = ""
Private Sub frmGesamtsicherheitNEU_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub frmGesamtsicherheitNEU_Load(sender As Object, e As EventArgs) Handles MyBase.Load
@@ -77,7 +79,14 @@ Public Class frmGesamtsicherheitenNEU
panOverlay.Visible = True 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) 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 AND [wo_firma] = " & firmaId & " ORDER BY [wo_reihenfolge] ", True, "AVISO", True) '
If warenortPrefix <> "" Then
cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] = 1 AND wo_ze = 1 AND LEFT([wo_warenort],2) = " & warenortPrefix & " ORDER BY [wo_reihenfolge] ", True, "AVISO", True)
Else
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) '
End If
If datum = Nothing Then datum = Date.Now If datum = Nothing Then datum = Date.Now
nextGessicherheitID = -1 nextGessicherheitID = -1
@@ -1111,7 +1120,14 @@ Public Class frmGesamtsicherheitenNEU
panOverlay.Visible = True 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) cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
cboFiliale.SelectedIndex = cboFiliale.FindString(Me.FilialNummer) cboFiliale.SelectedIndex = cboFiliale.FindString(Me.FilialNummer)
cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_knnr],' - ' ,[wo_bezeichnung]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' AND wo_ze = 1 AND [wo_firma] = '" & firmaId & "' ORDER BY [wo_reihenfolge] ", True, "AVISO", True) 'cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_knnr],' - ' ,[wo_bezeichnung]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' AND wo_ze = 1 AND [wo_firma] = '" & firmaId & "' ORDER BY [wo_reihenfolge] ", True, "AVISO", True)
If warenortPrefix <> "" Then
cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] = 1 AND wo_ze = 1 AND LEFT([wo_warenort],2) = '" & warenortPrefix & "' ORDER BY [wo_reihenfolge] ", True, "AVISO", True)
Else
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) '
End If
txtlkwIdSearch.initSearchBox(Me.FindForm, " LKW_Nr, avisoID, CAST(datum As Date) As Datum FROM [Aviso]", {"LKW_Nr", "AvisoID", "Datum"}, "", "Datum desc", "LKW_Nr", "AvisoId", "AVISO",, 250, 200) txtlkwIdSearch.initSearchBox(Me.FindForm, " LKW_Nr, avisoID, CAST(datum As Date) As Datum FROM [Aviso]", {"LKW_Nr", "AvisoID", "Datum"}, "", "Datum desc", "LKW_Nr", "AvisoId", "AVISO",, 250, 200)
txtlkwIdSearch.SET_VALUE(avisoID) txtlkwIdSearch.SET_VALUE(avisoID)
txtAbfertNum.Text = Me.Abfertigungsnummer txtAbfertNum.Text = Me.Abfertigungsnummer

11
Aviso/usrCntlSND_ATBGestellung.vb
View File

@@ -134,9 +134,9 @@ Public Class usrCntlSND_ATBGestellung
Select Case gessicherheit.gs_standort Select Case gessicherheit.gs_standort
Case "Verag GmbH" Case "Verag GmbH"
firmaId = 1
Case "Verag AG"
firmaId = 2 firmaId = 2
Case "Verag AG"
firmaId = 1
Case "Unisped GmbH" Case "Unisped GmbH"
firmaId = 21 firmaId = 21
Case "AMBAR" Case "AMBAR"
@@ -160,6 +160,7 @@ Public Class usrCntlSND_ATBGestellung
.LKWKZ = gessicherheit.gs_LKWKZ .LKWKZ = gessicherheit.gs_LKWKZ
.avisoID = gessicherheit.gs_avisoId .avisoID = gessicherheit.gs_avisoId
.firmaId = firmaId .firmaId = firmaId
'.warenortPrefix = SND.tblSnd_Zollsystem_Land
End With End With
AddHandler frm.FormClosing, Function() AddHandler frm.FormClosing, Function()
@@ -175,13 +176,13 @@ Public Class usrCntlSND_ATBGestellung
Select Case SND.FilialenNr Select Case SND.FilialenNr
Case 4803, 4809 Case 4803, 4809
Standort = "VERAG AG" : firmaId = 2 Standort = "VERAG AG" : firmaId = 1
Case 5601 Case 5601
Standort = "Unisped GmbH" : firmaId = 21 Standort = "Unisped GmbH" : firmaId = 21
Case 5701 Case 5701
Standort = "AMBAR" : firmaId = 24 Standort = "AMBAR" : firmaId = 24
Case 4810, 5103, 5901 Case 4810, 5103, 5901
Standort = "VERAG GmbH" : firmaId = 1 Standort = "VERAG GmbH" : firmaId = 2
Case 5501 Case 5501
Standort = "IMEX" : firmaId = 20 Standort = "IMEX" : firmaId = 20
End Select End Select
@@ -191,7 +192,7 @@ Public Class usrCntlSND_ATBGestellung
Select Case SND.FilialenNr Select Case SND.FilialenNr
Case 5501, 4803, 4809, 5103 Case 5501, 4803, 4809, 5103
Standort = "VERAG GmbH" : firmaId = 1 Standort = "VERAG GmbH" : firmaId = 2
End Select End Select
ElseIf SND.tblSnd_Zollsystem_Land = "AT" Then ElseIf SND.tblSnd_Zollsystem_Land = "AT" Then