This commit is contained in:
2022-03-21 10:17:42 +01:00
parent 39911e313e
commit e3843466c8
28 changed files with 4460 additions and 608 deletions

View File

@@ -1167,7 +1167,7 @@ Public Class cDakosyEZA
packst &= p.ezaWP_PackstueckArt & " "
End If
packst &= If(p.ezaWP_Warenbezeichnung, "") & vbNewLine
rohmasseTmp += If(p.ezaWP_Rohmasse, 0)
rohmasseTmp += If(p.ezaWP_Eigenmasse, 0)
rechnungspreisTmp += If(p.ezaWP_Artikelpreis, 0)
If cnt = 0 Then
@@ -1289,7 +1289,7 @@ Public Class cDakosyEZA
' packst &= p.ezaWP_PackstueckArt & " "
'End If
packst &= If(p.aesWP_Warenbezeichnung, "") & vbNewLine
rohmasseTmp += If(p.aesWP_Rohmasse, 0)
rohmasseTmp += If(p.aesWP_Eigenmasse, 0)
'rechnungspreisTmp += If(p.bet, 0)
If cnt = 0 Then

View File

@@ -42,7 +42,8 @@ Public Class cIMPORT_Codelisten
Using WC As New System.Net.WebClient()
' C0008_URL()
WC.Encoding = ASCIIEncoding.UTF8
Dim URL = cDY_Paramter.GET_PARAM_ByName("C0008_URL", TESTSYSTEM)
Dim URL = cDY_Paramter.GET_PARAM_ByName("C0008_URL", TESTSYSTEM, "VERAG")
If URL = String.Empty Then Return False
MyData = WC.DownloadString(URL)
@@ -91,7 +92,7 @@ Public Class cIMPORT_Codelisten
Using WC As New System.Net.WebClient()
' C0010_URL()
WC.Encoding = ASCIIEncoding.UTF8
Dim URL = cDY_Paramter.GET_PARAM_ByName("C0010_URL", TESTSYSTEM)
Dim URL = cDY_Paramter.GET_PARAM_ByName("C0010_URL", TESTSYSTEM, "VERAG")
If URL = String.Empty Then Return False
MyData = WC.DownloadString(URL)
@@ -139,7 +140,7 @@ Public Class cIMPORT_Codelisten
Using WC As New System.Net.WebClient()
' C0008_URL()
WC.Encoding = ASCIIEncoding.UTF8
Dim URL = cDY_Paramter.GET_PARAM_ByName("C0017_URL", TESTSYSTEM)
Dim URL = cDY_Paramter.GET_PARAM_ByName("C0017_URL", TESTSYSTEM, "VERAG")
If URL = String.Empty Then Return False
' MsgBox(URL)
MyData = WC.DownloadString(URL)
@@ -188,7 +189,7 @@ Public Class cIMPORT_Codelisten
Using WC As New System.Net.WebClient()
' C0008_URL()
WC.Encoding = ASCIIEncoding.UTF8
Dim URL = cDY_Paramter.GET_PARAM_ByName("C0014_URL", TESTSYSTEM)
Dim URL = cDY_Paramter.GET_PARAM_ByName("C0014_URL", TESTSYSTEM, "VERAG")
If URL = String.Empty Then Return False
' MsgBox(URL)
MyData = WC.DownloadString(URL)
@@ -237,7 +238,7 @@ Public Class cIMPORT_Codelisten
Using WC As New System.Net.WebClient()
' C0008_URL()
WC.Encoding = ASCIIEncoding.UTF8
Dim URL = cDY_Paramter.GET_PARAM_ByName("C0013_URL", TESTSYSTEM)
Dim URL = cDY_Paramter.GET_PARAM_ByName("C0013_URL", TESTSYSTEM, "VERAG")
If URL = String.Empty Then Return False
' MsgBox(URL)
MyData = WC.DownloadString(URL)
@@ -286,7 +287,7 @@ Public Class cIMPORT_Codelisten
Using WC As New System.Net.WebClient()
' A0122_URL()
WC.Encoding = ASCIIEncoding.UTF8
Dim URL = cDY_Paramter.GET_PARAM_ByName("A0122_URL", TESTSYSTEM)
Dim URL = cDY_Paramter.GET_PARAM_ByName("A0122_URL", TESTSYSTEM, "VERAG")
If URL = String.Empty Then Return False
MyData = WC.DownloadString(URL)
@@ -334,7 +335,7 @@ Public Class cIMPORT_Codelisten
Using WC As New System.Net.WebClient()
' A0122_URL()
WC.Encoding = ASCIIEncoding.UTF8
Dim URL = cDY_Paramter.GET_PARAM_ByName("A0127_URL", TESTSYSTEM)
Dim URL = cDY_Paramter.GET_PARAM_ByName("A0127_URL", TESTSYSTEM, "VERAG")
If URL = String.Empty Then Return False
MyData = WC.DownloadString(URL)
@@ -380,7 +381,7 @@ Public Class cIMPORT_Codelisten
Using WC As New System.Net.WebClient()
' C0008_URL()
WC.Encoding = ASCIIEncoding.UTF8
Dim URL = cDY_Paramter.GET_PARAM_ByName("I0400_URL", TESTSYSTEM)
Dim URL = cDY_Paramter.GET_PARAM_ByName("I0400_URL", TESTSYSTEM, "VERAG")
If URL = String.Empty Then Return False
' MsgBox(URL)
MyData = WC.DownloadString(URL)
@@ -429,7 +430,7 @@ Public Class cIMPORT_Codelisten
Using WC As New System.Net.WebClient()
' C0008_URL()
WC.Encoding = ASCIIEncoding.UTF8
Dim URL = cDY_Paramter.GET_PARAM_ByName("I0200_URL", TESTSYSTEM)
Dim URL = cDY_Paramter.GET_PARAM_ByName("I0200_URL", TESTSYSTEM, "VERAG")
If URL = String.Empty Then Return False
' MsgBox(URL)
MyData = WC.DownloadString(URL)
@@ -480,7 +481,7 @@ Public Class cIMPORT_Codelisten
Using WC As New System.Net.WebClient()
' C0008_URL()
WC.Encoding = ASCIIEncoding.UTF8
Dim URL = cDY_Paramter.GET_PARAM_ByName("I0700_URL", TESTSYSTEM)
Dim URL = cDY_Paramter.GET_PARAM_ByName("I0700_URL", TESTSYSTEM, "VERAG")
If URL = String.Empty Then Return False
' MsgBox(URL)
MyData = WC.DownloadString(URL)

View File

@@ -441,6 +441,7 @@ Public Class cZOLL_IMPORT
If If(bezugsNr, "").ToString.Length > 4 Then
Select Case bezugsNr.ToString.Substring(0, 4)
Case "4803" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
Case "7001" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
Case "4805" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
Case "4811" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
Case "5003" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
@@ -856,7 +857,7 @@ Public Class cZOLL_IMPORT
' Else
' cboNiederlassung.SelectedIndex = 0
Select Case SENDUNG.FilialenNr
Case 4803, 4809
Case 4803, 4809, 7001
strManNl = "SUB"
Case 4801
strManNl = "SUW"
@@ -1004,7 +1005,7 @@ Public Class cZOLL_IMPORT
' Else
' cboNiederlassung.SelectedIndex = 0
Select Case SPEDITIONSBUCH.FilialenNr
Case 4803, 4809
Case 4803, 4809, 7001
strManNl = "SUB"
Case 4801
strManNl = "SUW"