From 52ea51d4e06647a9ba0d47d47b13bae77f609654 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 18 Nov 2024 13:39:40 +0100 Subject: [PATCH] Gesamtsicherheiten --- Aviso/My Project/AssemblyInfo.vb | 4 ++-- Aviso/frmGesamtsicherheitenNEU.vb | 20 ++++++++++++++++++-- Aviso/usrCntlSND_ATBGestellung.vb | 11 ++++++----- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index f8decb2..25d4a6f 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index 05eb662..cc758bb 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -51,6 +51,8 @@ Public Class frmGesamtsicherheitenNEU Public firmaId As Integer + Public warenortPrefix As String = "" + Private Sub frmGesamtsicherheitNEU_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -77,7 +79,14 @@ 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 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 nextGessicherheitID = -1 @@ -1111,7 +1120,14 @@ 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) 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.SET_VALUE(avisoID) txtAbfertNum.Text = Me.Abfertigungsnummer diff --git a/Aviso/usrCntlSND_ATBGestellung.vb b/Aviso/usrCntlSND_ATBGestellung.vb index de8c7cc..e280ba6 100644 --- a/Aviso/usrCntlSND_ATBGestellung.vb +++ b/Aviso/usrCntlSND_ATBGestellung.vb @@ -134,9 +134,9 @@ Public Class usrCntlSND_ATBGestellung Select Case gessicherheit.gs_standort Case "Verag GmbH" - firmaId = 1 - Case "Verag AG" firmaId = 2 + Case "Verag AG" + firmaId = 1 Case "Unisped GmbH" firmaId = 21 Case "AMBAR" @@ -160,6 +160,7 @@ Public Class usrCntlSND_ATBGestellung .LKWKZ = gessicherheit.gs_LKWKZ .avisoID = gessicherheit.gs_avisoId .firmaId = firmaId + '.warenortPrefix = SND.tblSnd_Zollsystem_Land End With AddHandler frm.FormClosing, Function() @@ -175,13 +176,13 @@ Public Class usrCntlSND_ATBGestellung Select Case SND.FilialenNr Case 4803, 4809 - Standort = "VERAG AG" : firmaId = 2 + Standort = "VERAG AG" : firmaId = 1 Case 5601 Standort = "Unisped GmbH" : firmaId = 21 Case 5701 Standort = "AMBAR" : firmaId = 24 Case 4810, 5103, 5901 - Standort = "VERAG GmbH" : firmaId = 1 + Standort = "VERAG GmbH" : firmaId = 2 Case 5501 Standort = "IMEX" : firmaId = 20 End Select @@ -191,7 +192,7 @@ Public Class usrCntlSND_ATBGestellung Select Case SND.FilialenNr Case 5501, 4803, 4809, 5103 - Standort = "VERAG GmbH" : firmaId = 1 + Standort = "VERAG GmbH" : firmaId = 2 End Select ElseIf SND.tblSnd_Zollsystem_Land = "AT" Then