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

Compare commits

base: edv:817638099e5683e8918e80bec420fb2f0e8c0bc9
Branches Tags
edv:master edv:Aviso_Murad edv:essensbestellungen edv:change_VM_logic edv:SDL
..
compare: edv:master
Branches Tags
edv:master edv:Aviso_Murad edv:essensbestellungen edv:change_VM_logic edv:SDL

11 Commits
817638099e ... master

Author SHA1 Message Date
d.breimaier
9a461c45b2 Version 2026-06-22 17:48:10 +02:00
d.breimaier
03b3296078 divl. Änderungne 2026-06-17 17:02:05 +02:00
d.breimaier
4a6ca14b55 Merge branch 'master' of https://git.it.verag.ag/edv/AVISO 2026-06-16 14:07:00 +02:00
d.breimaier
63c25aeac1 Version 2026-06-16 14:06:54 +02:00
Andreas Luxbauer
244564b24c Merge branch 'master' of https://git.it.verag.ag/edv/AVISO 2026-06-16 13:22:14 +02:00
Andreas Luxbauer
0649e9fc6e status link 2026-06-16 13:22:01 +02:00
d.breimaier
d742e3acfa Merge branch 'master' of https://git.it.verag.ag/edv/AVISO 2026-06-15 15:30:59 +02:00
d.breimaier
95b99503d1 Version 2026-06-15 15:30:56 +02:00
Andreas Luxbauer
b887f62438 vers 2026-06-15 15:25:21 +02:00
Andreas Luxbauer
9ea1ac2aa9 merge 2026-06-12 19:27:24 +02:00
Andreas Luxbauer
139ffffed4 vers 2026-06-12 19:27:07 +02:00
6 changed files with 13 additions and 13 deletions
Expand all files Collapse all files

3
Aviso/App.config
View File

@@ -6,7 +6,8 @@
</sectionGroup>
</configSections>
<connectionStrings>
<add name="AVISO.My.MySettings.AVISO_ConnectionString_TEST" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=false;User ID=sa;Password=BmWr501956;" providerName="System.Data.SqlClient" />
<add name="AVISO.My.MySettings.AVISO_ConnectionString_TEST" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;"
providerName="System.Data.SqlClient" />
</connectionStrings>
<appSettings>
<add key="CustomerPortalApiBaseUrl" value="https://login.server.verag.ag" />

4
Aviso/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("4.2.8.8")>
<Assembly: AssemblyFileVersion("4.2.8.8")>
<Assembly: AssemblyVersion("4.2.9.2")>
<Assembly: AssemblyFileVersion("4.2.9.2")>

6
Aviso/My Project/Settings.Designer.vb generated
View File

@@ -15,7 +15,7 @@ Option Explicit On
Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0"), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -93,8 +93,8 @@ Namespace My
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString), _
Global.System.Configuration.DefaultSettingValueAttribute("Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=fal"& _
"se;User ID=sa;Password=BmWr501956;")> _
Global.System.Configuration.DefaultSettingValueAttribute("Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO;Integrated Security=false;U"& _
"ser ID=sa;Password=BmWr501956;")> _
Public ReadOnly Property AVISO_ConnectionString_TEST() As String
Get
Return CType(Me("AVISO_ConnectionString_TEST"),String)

4
Aviso/My Project/Settings.settings
View File

@@ -14,10 +14,10 @@
<Setting Name="AVISO_ConnectionString_TEST" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
&lt;ConnectionString&gt;Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=false;User ID=sa;Password=BmWr501956;&lt;/ConnectionString&gt;
&lt;ConnectionString&gt;Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
<Value Profile="(Default)">Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=false;User ID=sa;Password=BmWr501956;</Value>
<Value Profile="(Default)">Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;</Value>
</Setting>
</Settings>
</SettingsFile>

8
Aviso/frmLogin.vb
View File

@@ -218,13 +218,13 @@ Public Class frmLogin
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)
SELECT AvisoId,Auftraggeber_KdNr as KDNR FROM [Aviso] where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX','AMBAR','UNISPED') 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)
SELECT AvisoId,Frächter_KdNr as KDNR FROM [Aviso] where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX','AMBAR','UNISPED') 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)
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','AMBAR','UNISPED') 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)
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','AMBAR','UNISPED') 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 */

1
Aviso/frmSendungsdetailsNEU.vb
View File

@@ -2016,7 +2016,6 @@ Public Class frmSendungsdetailsNEU
End If
If SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen Then
btnSpeditionsbuchEintragen.BackgroundImage = My.Resources.speditionsbuchAktiv
setTooltioBtn(btnSpeditionsbuchEintragen, "Speditionsbuch Eingetrag öffnen")