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

DGS zu ATANAK

Browse Source
This commit is contained in:
Andreas Luxbauer
2023-01-09 16:29:14 +01:00
parent fd650ba616
commit 31fc1c48ff
8 changed files with 65 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Aviso/Aviso.vbproj
View File

@@ -1355,19 +1355,19 @@
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
</None>
<None Include="Resources\Flender_Bocholt.xlsx" />
<None Include="Resources\old_ATANAK_Instructions_Export.xlsx">
<None Include="Resources\ATANAK_Instructions_Export.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\DGS_Instructions_Export.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\old_ATANAK_Instructions_Export_T1.xlsx">
<None Include="Resources\ATANAK_Instructions_Export_T1.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\DGS_Instructions_Export_T1.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\old_ATANAK_Instructions_Import.xlsx">
<None Include="Resources\ATANAK_Instructions_Import.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\DGS_Instructions_Import.xlsx">

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("3.8.4.3")>
<Assembly: AssemblyFileVersion("3.8.4.3")>
<Assembly: AssemblyVersion("3.8.4.6")>
<Assembly: AssemblyFileVersion("3.8.4.6")>

30
Aviso/My Project/Resources.Designer.vb generated
View File

@@ -268,6 +268,36 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Byte[].
'''</summary>
Friend ReadOnly Property ATANAK_Instructions_Export() As Byte()
Get
Dim obj As Object = ResourceManager.GetObject("ATANAK_Instructions_Export", resourceCulture)
Return CType(obj,Byte())
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Byte[].
'''</summary>
Friend ReadOnly Property ATANAK_Instructions_Export_T1() As Byte()
Get
Dim obj As Object = ResourceManager.GetObject("ATANAK_Instructions_Export_T1", resourceCulture)
Return CType(obj,Byte())
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Byte[].
'''</summary>
Friend ReadOnly Property ATANAK_Instructions_Import() As Byte()
Get
Dim obj As Object = ResourceManager.GetObject("ATANAK_Instructions_Import", resourceCulture)
Return CType(obj,Byte())
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>

9
Aviso/My Project/Resources.resx
View File

@@ -643,4 +643,13 @@
<data name="Koerfez61" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\VK1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ATANAK_Instructions_Export" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\atanak_instructions_export.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="ATANAK_Instructions_Export_T1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\atanak_instructions_export_t1.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="ATANAK_Instructions_Import" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\atanak_instructions_import.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>

0
Aviso/Resources/old_ATANAK_Instructions_Export.xlsx → Aviso/Resources/ATANAK_Instructions_Export.xlsx
View File

0
Aviso/Resources/old_ATANAK_Instructions_Export_T1.xlsx → Aviso/Resources/ATANAK_Instructions_Export_T1.xlsx
View File

0
Aviso/Resources/old_ATANAK_Instructions_Import.xlsx → Aviso/Resources/ATANAK_Instructions_Import.xlsx
View File

38
Aviso/frmSendungsdetailsNEU.vb
View File

@@ -3126,7 +3126,7 @@ Public Class frmSendungsdetailsNEU
End Sub
Sub initAnhang()
Dim hSQL As String = " SELECT [anh_id],[anh_Name],[anh_docId],CASE WHEN (anh_SendungsId is null OR anh_SendungsId <=0) AND anh_Art='' THEN '***' ELSE [anh_Art] END as [anh_Art],[anh_Typ],anh_LaufzettelDruck,anh_GestellungslisteAnfuegen FROM [tblAvisoAnhaenge]
Dim hSQL As String = " SELECT [anh_id],[anh_Name],anh_Datum,[anh_docId],CASE WHEN (anh_SendungsId is null OR anh_SendungsId <=0) AND anh_Art='' THEN '***' ELSE [anh_Art] END as [anh_Art],[anh_Typ],anh_LaufzettelDruck,anh_GestellungslisteAnfuegen FROM [tblAvisoAnhaenge]
WHERE anh_AvisoId=" & AvisoId & " AND (anh_SendungsId is null OR anh_SendungsId <=0 OR anh_SendungsId=" & SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID & ")
ORDER BY anh_SendungsId desc,
case
@@ -3175,6 +3175,9 @@ Public Class frmSendungsdetailsNEU
.Columns("anh_Name").HeaderText = "Name"
.Columns("anh_Name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns("anh_Datum").Width = 120
.Columns("anh_Datum").HeaderText = "Datum"
.Columns("anh_Art").MinimumWidth = 100
.Columns("anh_Art").HeaderText = "Art"
.Columns("anh_Art").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter
@@ -4684,7 +4687,7 @@ Public Class frmSendungsdetailsNEU
If True Then
Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\DGS\"
Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\ATANAK\"
If Not My.Computer.FileSystem.DirectoryExists(sPath) Then
My.Computer.FileSystem.CreateDirectory(sPath)
End If
@@ -4699,11 +4702,11 @@ Public Class frmSendungsdetailsNEU
.Visible = False
Try
Path = sPath & "DGS_Import_" & SENDUNG_LIST(CURRENT_INDEX).FilialenNr & "-" & SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr & "" & " .xlsx"
Path = sPath & "ATANAK_Import_" & SENDUNG_LIST(CURRENT_INDEX).FilialenNr & "-" & SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr & "" & " .xlsx"
While System.IO.File.Exists(Path)
Path = sPath & "DGS_Import_" & SENDUNG_LIST(CURRENT_INDEX).FilialenNr & "-" & SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr & "" & "_" & Now.ToString("ddMMyyyyHHmmss") & ".xlsx"
Path = sPath & "ATANAK_Import_" & SENDUNG_LIST(CURRENT_INDEX).FilialenNr & "-" & SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr & "" & "_" & Now.ToString("ddMMyyyyHHmmss") & ".xlsx"
End While
My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.DGS_Instructions_Import, False)
My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.ATANAK_Instructions_Import, False)
Catch ex As System.Exception
' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
@@ -4767,7 +4770,7 @@ Public Class frmSendungsdetailsNEU
If True Then
Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\DGS\"
Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\ATANAK\"
If Not My.Computer.FileSystem.DirectoryExists(sPath) Then
My.Computer.FileSystem.CreateDirectory(sPath)
End If
@@ -4782,11 +4785,11 @@ Public Class frmSendungsdetailsNEU
.Visible = False
Try
Path = sPath & "DGS_Export_" & SENDUNG_LIST(CURRENT_INDEX).FilialenNr & "-" & SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr & "" & " .xlsx"
Path = sPath & "ATANAK_Export_" & SENDUNG_LIST(CURRENT_INDEX).FilialenNr & "-" & SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr & "" & " .xlsx"
While System.IO.File.Exists(Path)
Path = sPath & "DGS_Export_" & SENDUNG_LIST(CURRENT_INDEX).FilialenNr & "-" & SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr & "" & "_" & Now.ToString("ddMMyyyyHHmmss") & ".xlsx"
Path = sPath & "ATANAK_Export_" & SENDUNG_LIST(CURRENT_INDEX).FilialenNr & "-" & SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr & "" & "_" & Now.ToString("ddMMyyyyHHmmss") & ".xlsx"
End While
My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.DGS_Instructions_Export, False)
My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.ATANAK_Instructions_Export, False)
Catch ex As System.Exception
' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
@@ -4849,7 +4852,7 @@ Public Class frmSendungsdetailsNEU
If True Then
Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\DGS\"
Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\ATANAK\"
If Not My.Computer.FileSystem.DirectoryExists(sPath) Then
My.Computer.FileSystem.CreateDirectory(sPath)
End If
@@ -4864,11 +4867,11 @@ Public Class frmSendungsdetailsNEU
.Visible = False
Try
Path = sPath & "DGS_ExportT1_" & AVISO.AvisoID & "" & " .xlsx"
Path = sPath & "ATANAK_ExportT1_" & AVISO.AvisoID & "" & " .xlsx"
While System.IO.File.Exists(Path)
Path = sPath & "DGS_ExportT1_" & AVISO.AvisoID & "" & "_" & Now.ToString("ddMMyyyyHHmmss") & ".xlsx"
Path = sPath & "ATANAK_ExportT1_" & AVISO.AvisoID & "" & "_" & Now.ToString("ddMMyyyyHHmmss") & ".xlsx"
End While
My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.DGS_Instructions_Export_T1, False)
My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.ATANAK_Instructions_Export_T1, False)
Catch ex As System.Exception
' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
@@ -4993,10 +4996,11 @@ Public Class frmSendungsdetailsNEU
Next
Mail.Subject = If(AVISO.ImEx <> "", AVISO.ImEx & " / ", "") & AVISO.LKW_Nr & " / " & "ETA: " & If(AVISO.VoraussichtlichesEintreffen IsNot Nothing, CDate(AVISO.VoraussichtlichesEintreffen).ToShortDateString, "") & " // VERAG"
'Mail.To = "european@atanak.com"
Mail.To = "european@dailygroupage.com"
' Mail.To = "european@dailygroupage.com"
Mail.To = "dover@atanak.com"
Dim TextHTML = ""
TextHTML &= "Dear DGS Team,<br>"
TextHTML &= "Dear ATANAK Team,<br>"
TextHTML &= "<br>"
TextHTML &= "attached our next " & If(AVISO.ImEx = "", "customs", AVISO.ImEx) & " instruction.<br>"
TextHTML &= "<br>"
@@ -5016,9 +5020,9 @@ Public Class frmSendungsdetailsNEU
Mail.HTMLBody = "<div style=""font-family:Calibri, Arial;font-size:15px;"">" & TextHTML & SDL.cFakturierung.getSignature("EN",,,, "BREXIT_VERAG") & "</div>"
Dim answer = MsgBox("Vermerk 'An DGS avisiert' eintragen?", vbYesNoCancel)
Dim answer = MsgBox("Vermerk 'An ATANAK avisiert' eintragen?", vbYesNoCancel)
If vbYes = answer Then
AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "An DGS avisiert", 43)
AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "An ATANAK avisiert", 43)
End If
Mail.Display()