merge

Aviso/Aviso.vbproj

@@ -64,7 +64,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
-    <OptionExplicit>On</OptionExplicit>
+    <OptionExplicit>Off</OptionExplicit>
   </PropertyGroup>
   <PropertyGroup>
     <OptionCompare>Binary</OptionCompare>
@@ -126,12 +126,13 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
-    <Reference Include="ChilkatDotNet47">
+    <Reference Include="ChilkatDotNet47, Version=9.5.0.88, Culture=neutral, PublicKeyToken=eb5fc1fc52ef09bd, processorArchitecture=AMD64">
-      <HintPath>..\..\..\dll\ChillKat64\ChilkatDotNet47.dll</HintPath>
-    </Reference>
-    <Reference Include="ClosedXML, Version=0.95.4.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ClosedXML.0.95.4\lib\net46\ClosedXML.dll</HintPath>
+      <HintPath>F:\PROGRAMMIERUNG\dll\ChillKat64\neu 2023\chilkatdotnet47-9.5.0-x64\ChilkatDotNet47.dll</HintPath>
+    </Reference>
+    <Reference Include="ClosedXML, Version=0.68.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>F:\PROGRAMMIERUNG\dll\closedxml\95\ClosedXML.dll</HintPath>
     </Reference>
     <Reference Include="cNCTSPartnerWorker, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
@@ -1395,6 +1396,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="AL20210908.pfx" />
     <None Include="AL20231110.pfx" />
     <None Include="App.config" />
     <None Include="app.manifest" />
@@ -1499,7 +1501,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="aviso.ico" />
-    <None Include="bin\Debug\Resources\ambar_boarder.png" />
+    <Content Include="bin\Debug\Resources\ambar_boarder.png" />
     <Content Include="My Project\aktAlt.jpg" />
     <None Include="Resources\ZwAbEinfuegen.png" />
     <None Include="Resources\unisped_aeo_DE.jpg" />
@@ -1549,6 +1551,7 @@
     <None Include="Resources\FO.bmp" />
     <None Include="Resources\atr.png" />
     <None Include="Resources\atr_s.png" />
+    <Content Include="Resources\ambar_boarder.png" />
     <Content Include="Resources\FO.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -1755,7 +1758,8 @@
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <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>
+    </PostBuildEvent>
   </PropertyGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb

@@ -64,6 +64,13 @@ Public Class usrCntlBenachrichtigungen
                         End Select
                     End If
 
+                    If cbxTaskForce.Checked Then
+                        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+                            Case "VERAG"
+                                whereMA &= " OR (ab_TO_Art='T' AND ab_TO_Code='7') " 'TEAM_TASKFORCE --> VERAG
+                        End Select
+                    End If
+
                     If cbxTeams.Checked Then
                         whereMA &= " Or (ab_TO_Art='T' AND ab_TO_Code IN (SELECT [team_id] FROM ADMIN.dbo.[tblTeams] WHERE team_firma = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "')) "
                     Else
@@ -232,6 +239,11 @@ Public Class usrCntlBenachrichtigungen
             cbxVerwarung.Checked = True
         End If
 
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BENACHRICHTIGUNGEN_SeeTaskForce", "AVISO") Then
+            cbxTaskForce.Visible = True
+            cbxTaskForce.Checked = True
+        End If
+
 
         'NEIN; weils zB Waidhaus dann alles sieht und übernimmt
         'If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER IsNot Nothing Then
@@ -348,7 +360,7 @@ Public Class usrCntlBenachrichtigungen
         initDgvAvisoBenachrichtigungen(True, Me.Font)
     End Sub
 
-    Private Sub cbxNeukunden_CheckedChanged(sender As Object, e As EventArgs) Handles cbxNeukunden.CheckedChanged
+    Private Sub cbxNeukunden_CheckedChanged(sender As Object, e As EventArgs) Handles cbxNeukunden.CheckedChanged, cbxVerwarung.CheckedChanged, cbxTaskForce.CheckedChanged
         initDgvAvisoBenachrichtigungen(True, Me.Font)
     End Sub
 

Aviso/My Project/app.manifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
+	<assemblyIdentity name="AVISO" version="3.9.7.0" language="neutral" processorArchitecture="amd64" />
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">

Aviso/frmHauptfenster.vb

@@ -4895,6 +4895,32 @@ Public Class AvisoStatusFunctions
 
     End Sub
 
+    Shared Sub SendStatusEmailByKdNr(AVISO As cAviso, KdNr As Integer)
+        Dim AvisoDAL As New cAvisoDAL
+        Dim art = 5
+        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+
+            Case "ATILLA"
+                'NED!
+            Case "VERAG", "IMEX"
+
+                'Mail-Adressen aus Firmentabelle holen
+                Dim EMails As String = ""
+                Dim EMails_CC As String = ""
+                Dim EMails_BCC As String = ""
+
+                Dim Emails_list_sent As New VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigungList
+
+                VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
+                If Emails_list_sent.LIST.Count > 0 Then
+                    Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, KdNr, "")
+                    ' VERAG_PROG_ALLGEMEIN.cAvisoStatusMails.INSERT_INTO(AVISO.AvisoID, KdNr, art)
+                End If
+
+        End Select
+
+    End Sub
+
 
 
     Shared Sub Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, KundenNr, Optional ForceMail = "")

Aviso/frmLaufzettel.vb

@@ -28,7 +28,7 @@ Public Class frmLaufzettel
         AVISO = VERAG_PROG_ALLGEMEIN.cAviso.getAvisoById(AvisoID)
         Me.SENDUNG_LIST = SENDUNG_LIST
         Me.DIGITAL = DIGITAL
-        Me.DIGITAL_T1 = DIGITAL_T1
+        Me.DIGITAL_T1 = DIGITAL_T1genl
         Me.DIGITAL_Rg = DIGITAL_rg
         Me.jeVP = jeVP
     End Sub

Aviso/frmLogin.vb

@@ -163,14 +163,34 @@ Public Class frmLogin
 
                 Dim AvisoDAL As New VERAG_PROG_ALLGEMEIN.cAvisoDAL
                 Dim VERAGSQL As New VERAG_PROG_ALLGEMEIN.SQL
-                Dim dt = VERAGSQL.loadDgvBySql("SELECT  [AvisoID]  FROM [Aviso] where datum >= '19.04.2022'
+
-                        and Firma IN ('VERAG','IMEX') and (SELECT COUNT(*) FROM Vermerke where  Vermerke.AvisoID=aviso.AvisoID and Hinweis_Vermerk LIKE 'Status E-Mail gesendet an:%') =0   and status NOT IN (1,2)", "AVISO")
+                Dim SQLSTR = " 
+                    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)
+						 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)
+						 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)
+						 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)
+						 ) as T1
+						 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 ADMIN.dbo.[tblAPI]  where  [api_AvisoId]=AvisoID AND [api_KundenNr]=KdNr and [api_Type]='MAIL' and api_status='1' and [api_apiArt]='1' and [api_apiUArt]='5') =0   
+					GROUP BY AVISOID,KDNR
+					 order by AvisoID "
+
+                'Dim dt = VERAGSQL.loadDgvBySql("SELECT  [AvisoID]  FROM [Aviso] where datum >=DATEADD(DAY,-4,GETDATE())
+                '        and Firma IN ('VERAG','IMEX') and (SELECT COUNT(*) FROM Vermerke where  Vermerke.AvisoID=aviso.AvisoID and Hinweis_Vermerk LIKE 'Status E-Mail gesendet an:%') =0   and status NOT IN (1,2)", "AVISO")
+
+                Dim dt = VERAGSQL.loadDgvBySql(SQLSTR, "AVISO")
 
                 For Each r In dt.Rows
                     'MsgBox("SO: " & (r("AvisoID")))
                     Dim AVISO = AvisoDAL.LesenAviso(r("AvisoID"), "")
                     If AVISO IsNot Nothing Then
-                        AvisoStatusFunctions.SendStatusEmail(AVISO)
+                        AvisoStatusFunctions.SendStatusEmailByKdNr(AVISO, r("KDNR"))
                     End If
                 Next
             Catch ex As Exception

Gemeinsames/Gemeinsames.vbproj

@@ -92,7 +92,7 @@
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>PrivateCodeSignaturDaniel20240131.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>Gemeinsames_TemporaryKey.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />