This commit is contained in:
2023-11-11 22:08:15 +01:00
parent 9117ca1c17
commit 1f230b49a2
4 changed files with 15 additions and 10 deletions

View File

@@ -38,10 +38,10 @@ Public Class usrctlStatVERIMEX
Select Case cboAbfFirma._value Select Case cboAbfFirma._value
Case "" Case ""
Case 0 : whereFiliale = " and tblSendungen.FilialenNr <=0 " Case 0 : whereFiliale = " and tblSendungen.FilialenNr <=0 "
Case "ATILLA" : whereFiliale = " and tblSendungen.FilialenNr='4801' " Case "ATILLA" : whereFiliale = " and tblSendungen.FilialenNr IN ('4801','4802') "
Case Else Case Else
whereFiliale = " and tblSendungen.FilialenNr<>'4801' and Filialen.Firma='" & cboAbfFirma._value & "' " whereFiliale = " and tblSendungen.FilialenNr NOT IN ('4801','4802') and Filialen.Firma='" & cboAbfFirma._value & "' "
innerJoinFiliale = "inner join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen on [tblSendungen].FilialenNr=Filialen.FilialenNr" innerJoinFiliale = "inner join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen on [tblSendungen].FilialenNr=Filialen.FilialenNr"
End Select End Select
@@ -208,10 +208,10 @@ Public Class usrctlStatVERIMEX
Select Case cboAbfFirma._value Select Case cboAbfFirma._value
Case "" Case ""
Case 0 : whereFiliale = " and tblSendungen.FilialenNr <=0 " Case 0 : whereFiliale = " and tblSendungen.FilialenNr <=0 "
Case "ATILLA" : whereFiliale = " and tblSendungen.FilialenNr='4801' " Case "ATILLA" : whereFiliale = " and tblSendungen.FilialenNr IN ('4801','4802') "
Case Else Case Else
whereFiliale = " and tblSendungen.FilialenNr<>'4801' and Filialen.Firma='" & cboAbfFirma._value & "' " whereFiliale = " and tblSendungen.FilialenNr NOT IN ('4801','4802') and Filialen.Firma='" & cboAbfFirma._value & "' "
innerJoinFiliale = "inner join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen on [tblSendungen].FilialenNr=Filialen.FilialenNr" innerJoinFiliale = "inner join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen on [tblSendungen].FilialenNr=Filialen.FilialenNr"
End Select End Select

View File

@@ -1751,8 +1751,7 @@
</PreBuildEvent> </PreBuildEvent>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<PostBuildEvent> <PostBuildEvent>\\192.168.0.90\f\Zertifikate\signtool.exe sign /f \\192.168.0.90\f\Zertifikate\AL20231110.pfx /p zYGNNJRG+tzlw90Rz6NqOXnoeBycFCy07YcUsY5iD0M= "Aviso.exe"</PostBuildEvent>
</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>

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("3.9.4.0")> <Assembly: AssemblyVersion("3.9.4.2")>
<Assembly: AssemblyFileVersion("3.9.4.0")> <Assembly: AssemblyFileVersion("3.9.4.2")>

View File

@@ -1375,7 +1375,12 @@ Public Class frmHauptfenster
Dim errOcc = False Dim errOcc = False
'MsgBox(sqlStr) 'MsgBox(sqlStr)
gridMyAviso.DataSource = VERAGSQL.loadDgvBySql_Param(sqlStr, "AVISO", 1500, list, False, errOcc) Try
gridMyAviso.DataSource = VERAGSQL.loadDgvBySql_Param(sqlStr, "AVISO", 1500, list, False, errOcc)
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG)
End Try
If errOcc Then If errOcc Then
pic.Visible = True pic.Visible = True
End If End If
@@ -1391,7 +1396,8 @@ Public Class frmHauptfenster
With gridMyAviso With gridMyAviso
If .Columns.Count = 0 Then pic.Visible = False : Exit Sub If .Columns.Count <= 0 Then pic.Visible = False : Exit Sub
If .Columns("AvisoID") Is Nothing Then pic.Visible = False : Exit Sub
.DefaultCellStyle.Font = nfont .DefaultCellStyle.Font = nfont