This commit is contained in:
2020-01-08 13:18:12 +01:00
parent de1d935624
commit a6964d7082
28 changed files with 3853 additions and 1086 deletions

View File

@@ -430,13 +430,13 @@ Public Class cDakosyEZA
End Try
Return LOADByAnmID
End Function
Shared Function LOADByBezugsNr(bezugsNr As String, loadALL As Boolean) As cDakosyEZA
Shared Function LOADByBezugsNr(bezugsNr As String, loadALL As Boolean, Optional checkValidStatus As Boolean = False) As cDakosyEZA
Try
Dim EZA As New cDakosyEZA
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblDakosy_EZA WHERE eza_ObjectName=@bezugsNr ", conn)
Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblDakosy_EZA WHERE eza_ObjectName LIKE @bezugsNr " & If(checkValidStatus, " AND eza_status BETWEEN 40 and 90 ", "") & " order by eza_LetzteBearbeitung desc ", conn)
cmd.Parameters.AddWithValue("@bezugsNr", bezugsNr)
Dim dr = cmd.ExecuteReader()
If dr.Read Then
@@ -448,8 +448,8 @@ Public Class cDakosyEZA
Else
propInfo.SetValue(EZA, dr.Item(l.Text))
End If
Next
If loadALL Then
EZA.LOAD_Unterlagen()
EZA.LOAD_Warenposition()
@@ -912,6 +912,10 @@ Public Class cDakosyEZA
Dim filiale = getFiliale(Me.eza_ObjectName, filialeBez)
Dim abfertigungsnummer = getAbfertigungsnummer(Me.eza_ObjectName)
If abfertigungsnummer = "" Then
getFilialeAbfertigungsnummerFromSendung(filiale, abfertigungsnummer, DY.dy_SendungsId)
End If
If filiale <> "" And abfertigungsnummer <> "" Then
If countSpedbuchEntrysFilialeAbf(filiale, abfertigungsnummer) = 0 Then
' VERAG_PROG_ALLGEMEIN.cErrorHandler.sendERRORperMail("HEUREKA EZA ", "" & Me.eza_ObjectName, Now.ToString("yyyy.MM.dd HH:mm"), "al@verag.ag", "")
@@ -968,6 +972,10 @@ Public Class cDakosyEZA
Case "5003" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
Case "5103" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
Case "5303" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
Case "5501", "5601", "5701", "5801" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
Case Else
If IsNumeric(bezugsNr.ToString.Substring(0, 4)) Then Return bezugsNr.ToString.Substring(0, 4)
'Case "4801", "4803", "4805", "4807", "4811", "5003", "5103", "5303" : Return bezugsNr.ToString.Substring(0, 4) ...... derzeit nur 4803
'filialeBez SUB, NKD, WAI,.-..
End Select
@@ -996,6 +1004,17 @@ Public Class cDakosyEZA
End If
Return ""
End Function
Sub getFilialeAbfertigungsnummerFromSendung(ByRef filiale, ByRef abfertigungsnummer, dy_SendungsId)
If dy_SendungsId IsNot Nothing AndAlso IsNumeric(dy_SendungsId) Then
Dim SND As New VERAG_PROG_ALLGEMEIN.cSendungen(dy_SendungsId)
If SND IsNot Nothing Then
If SND.FilialenNr > 0 Then filiale = SND.FilialenNr
If SND.AbfertigungsNr > 0 Then abfertigungsnummer = SND.AbfertigungsNr
End If
End If
End Sub
Public Shared Sub DakosyEZADatenbereitstellung(ByRef SPEDITIONSBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, EZA_Nr As String, ByRef notFound As Boolean, ByRef PosAnzahl As Integer)
Dim DY As DAKOSY_Worker.cDakosyEZA = DAKOSY_Worker.cDakosyEZA.LOADByBezugsNr(EZA_Nr, True)
If DY Is Nothing Then
@@ -1280,6 +1299,7 @@ Public Class cDakosy_EZA_Aufschub
Property ezaAfb_ArtAufschubantrag As Object = Nothing
Property ezaAfb_AufschubnehmerEORI As Object = Nothing
Property ezaAfb_KontoNr As Object = Nothing
Property ezaAfb_HZA As Object = Nothing
Property ezaAfb_AufschuBIN As Object = Nothing
'Public selButton As Object = Nothing ' Für die GUI
@@ -1305,6 +1325,7 @@ Public Class cDakosy_EZA_Aufschub
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ezaAfb_AufschubnehmerEORI", ezaAfb_AufschubnehmerEORI))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ezaAfb_KontoNr", ezaAfb_KontoNr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ezaAfb_AufschuBIN", ezaAfb_AufschuBIN))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ezaAfb_HZA", ezaAfb_HZA))
Return list
End Function

View File

@@ -499,13 +499,13 @@ Public Class cDakosyNCTSOut
End Try
Return LOADByAnmID
End Function
Shared Function LOADByBezugsNr(bezugsNr As String, loadALL As Boolean) As cDakosyNCTSOut
Shared Function LOADByBezugsNr(bezugsNr As String, loadALL As Boolean, Optional checkValidStatus As Boolean = False) As cDakosyNCTSOut
Try
Dim NCTS As New cDakosyNCTSOut
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblDakosy_NCTSOut WHERE ncts_ObjectName=@bezugsNr ", conn)
Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblDakosy_NCTSOut WHERE ncts_ObjectName LIKE @bezugsNr " & If(checkValidStatus, " AND ncts_status BETWEEN 40 and 90 ", "") & " order by ncts_LetzteBearbeitung desc", conn)
cmd.Parameters.AddWithValue("@bezugsNr", bezugsNr)
Dim dr = cmd.ExecuteReader()
If dr.Read Then
@@ -761,6 +761,11 @@ Public Class cDakosyNCTSOut
Dim filialeBez = ""
Dim filiale = getFiliale(Me.ncts_ObjectName, filialeBez)
Dim abfertigungsnummer = getAbfertigungsnummer(Me.ncts_ObjectName)
If abfertigungsnummer = "" Then
getFilialeAbfertigungsnummerFromSendung(filiale, abfertigungsnummer, DY.dy_SendungsId)
End If
If filiale <> "" And abfertigungsnummer <> "" Then
' If countSpedbuchEntrysFilialeAbf(filiale, abfertigungsnummer) = 0 Then
If countSpedbuchEntrys(filiale, Me.ncts_ObjectName) = 0 Then
@@ -815,6 +820,9 @@ Public Class cDakosyNCTSOut
Case "5003" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
Case "5103" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
Case "5303" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
Case "5501", "5601", "5701", "5801" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
Case Else
If IsNumeric(bezugsNr.ToString.Substring(0, 4)) Then Return bezugsNr.ToString.Substring(0, 4) 'Case Else : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
'Case "4801", "4803", "4805", "4807", "4811", "5003", "5103", "5303" : Return bezugsNr.ToString.Substring(0, 4) ...... derzeit nur 4803
'filialeBez SUB, NKD, WAI,.-..
End Select
@@ -845,6 +853,16 @@ Public Class cDakosyNCTSOut
End If
Return ""
End Function
Sub getFilialeAbfertigungsnummerFromSendung(ByRef filiale, ByRef abfertigungsnummer, dy_SendungsId)
If dy_SendungsId IsNot Nothing AndAlso IsNumeric(dy_SendungsId) Then
Dim SND As New VERAG_PROG_ALLGEMEIN.cSendungen(dy_SendungsId)
If SND IsNot Nothing Then
If SND.FilialenNr > 0 Then filiale = SND.FilialenNr
If SND.AbfertigungsNr > 0 Then abfertigungsnummer = SND.AbfertigungsNr
End If
End If
End Sub
Public Shared Sub DakosyNCTSDatenbereitstellung(ByRef SPEDITIONSBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, NCTS_Nr As String, ByRef notFound As Boolean)
Dim DY As DAKOSY_Worker.cDakosyNCTSOut = DAKOSY_Worker.cDakosyNCTSOut.LOADByBezugsNr(NCTS_Nr, True)

View File

@@ -101,20 +101,28 @@ Public Class cDakosy_Zollanmeldungen
' ElseIf Then
' srchStrAbf = split(X)
Else
Return False
' Return False
End If
End If
If Not IsNumeric(srchStrFiliale) Or Not IsNumeric(srchStrAbf) Then Return False
If srchStrFiliale.Length <> 4 Then Return False
'If srchStrAbf.Length > 8 Then srchStrAbf = srchStrAbf.Substring(0, 8)
If srchStrAbf.Length < 8 Then srchStrAbf = Me.dy_Erstellung.ToString("yy") & CInt(srchStrAbf).ToString("000000")
If IsNumeric(srchStrFiliale) AndAlso IsNumeric(srchStrAbf) AndAlso srchStrFiliale.Length = 4 Then
'If srchStrAbf.Length > 8 Then srchStrAbf = srchStrAbf.Substring(0, 8)
If srchStrAbf.Length < 8 Then srchStrAbf = Me.dy_Erstellung.ToString("yy") & CInt(srchStrAbf).ToString("000000")
Dim sqlstr = " select [tblSnd_SendungID],[tblSnd_AvisoID] FROM [tblSendungen] where '" & srchStrAbf & "' like ('%' + cast(AbfertigungsNr as varchar(10))+ '%') and FilialenNr ='" & srchStrFiliale & "' and AbfertigungsNr >0"
Dim sqlstr = " select [tblSnd_SendungID],[tblSnd_AvisoID] FROM [tblSendungen] where '" & srchStrAbf & "' like ('%' + cast(AbfertigungsNr as varchar(10))+ '%') and FilialenNr ='" & srchStrFiliale & "' and AbfertigungsNr >0"
Dim dt2 As DataTable = SQL.loadDgvBySql(sqlstr, "AVISO")
If dt2 IsNot Nothing AndAlso dt2.Rows.Count > 0 Then
Me.dy_SendungsId = dt2.Rows(0)("tblSnd_SendungID")
Me.dy_AvisoId = dt2.Rows(0)("tblSnd_AvisoID")
Return True
End If
End If
Dim dt As DataTable = SQL.loadDgvBySql(sqlstr, "AVISO")
'UNISPED:
Dim sqlstr2 = " select [tblSnd_SendungID],[tblSnd_AvisoID] FROM [tblSendungen] where '" & Me.dy_BezugsNr & "' like ( cast(tblSnd_DakosyRef as varchar(20))+ '%') AND tblSnd_DakosyRef is not null AND len(tblSnd_DakosyRef) > 10 "
Dim dt = SQL.loadDgvBySql(sqlstr2, "AVISO")
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
Me.dy_SendungsId = dt.Rows(0)("tblSnd_SendungID")
Me.dy_AvisoId = dt.Rows(0)("tblSnd_AvisoID")

View File

@@ -125,6 +125,7 @@
<Compile Include="Form.vb" />
<Compile Include="Forms.vb" />
<Compile Include="KD_EXPORT\KundenExport\VERAG_KundenStamm_Export.Designer.vb" />
<Compile Include="KD_EXPORT\KundenExport\VERAG_KundenStamm_Export_V2.Designer.vb" />
<Compile Include="My Project\AssemblyInfo.vb" />
<Compile Include="My Project\Application.Designer.vb">
<AutoGen>True</AutoGen>
@@ -277,6 +278,9 @@
<None Include="KD_EXPORT\KundenExport\VERAG_KundenStamm_Export.xsd">
<SubType>Designer</SubType>
</None>
<None Include="KD_EXPORT\KundenExport\VERAG_KundenStamm_Export_V2.xsd">
<SubType>Designer</SubType>
</None>
<None Include="My Project\Application.myapp">
<Generator>MyApplicationCodeGenerator</Generator>
<LastGenOutput>Application.Designer.vb</LastGenOutput>

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Mit XMLSpy v2017 rel. 3 sp1 (x64) (http://www.altova.com) von Andreas Luxbauer (VERAG Spedition AG) bearbeitet -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning" elementFormDefault="qualified" attributeFormDefault="unqualified" vc:minVersion="1.1">
<xs:element name="VERAG_Kundenstamm_IMPORT">
<xs:complexType>
<xs:sequence>
<xs:element name="Transaktion">
<xs:complexType>
<xs:sequence>
<xs:element name="Version"/>
<xs:element name="IOPartner"/>
<xs:element name="IODivision1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="KundenDaten" maxOccurs="999">
<xs:complexType>
<xs:sequence>
<xs:element name="KundenNr"/>
<xs:element name="EORI"/>
<xs:element name="EORI_Niederlassung"/>
<xs:element name="Kurzname"/>
<xs:element name="Name1"/>
<xs:element name="Name2" minOccurs="0"/>
<xs:element name="UID_Nr" minOccurs="0"/>
<xs:sequence id="Adresse">
<xs:element name="Adresse" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="LandKz" minOccurs="0"/>
<xs:element name="Plz" minOccurs="0"/>
<xs:element name="Ort" minOccurs="0"/>
<xs:element name="Strasse" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:sequence id="Kontakt">
<xs:element name="Kontakt" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="EMail" minOccurs="0"/>
<xs:element name="Tel" minOccurs="0"/>
<xs:element name="Fax" minOccurs="0"/>
<xs:element name="Ansprechpartner" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:sequence>
<xs:element name="Aufschubkonten" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="Aufschub" minOccurs="0" maxOccurs="2">
<xs:complexType>
<xs:sequence>
<xs:element name="Art">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="10"/>
<xs:enumeration value="15"/>
<xs:enumeration value="20"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="Hauptzollamt">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:minLength value="1"/>
<xs:maxLength value="2"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="KontoNr"/>
<xs:element name="BIN"/>
<xs:element name="EORI"/>
<xs:element name="EORI_Niederlassung"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:element name="Dakosy_Mandant"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>

View File

@@ -19,8 +19,9 @@ Public Class cDakosyFunftions
Dim DY_pwd = ""
Dim DY_port = ""
Dim DY_PFAD_IN = ""
Dim DY_PFAD_IN_KD = ""
getSFTPLoginData(DY_server, DY_name, DY_pwd, DY_port, DY_PFAD_IN, "")
getSFTPLoginData(DY_server, DY_name, DY_pwd, DY_port, DY_PFAD_IN, "", DY_PFAD_IN_KD)
Dim ConnectionInfo As New ConnectionInfo(DY_server, DY_port, DY_name, New PasswordAuthenticationMethod(DY_name, DY_pwd))
Using client = New SftpClient(ConnectionInfo)
@@ -72,15 +73,17 @@ Public Class cDakosyFunftions
Dim DY_pwd = ""
Dim DY_port = ""
Dim DY_PFAD_IN = ""
Dim DY_PFAD_IN_KD = ""
getSFTPLoginData(DY_server, DY_name, DY_pwd, DY_port, DY_PFAD_IN, "")
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "" Then VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG"
getSFTPLoginData(DY_server, DY_name, DY_pwd, DY_port, DY_PFAD_IN, "", DY_PFAD_IN_KD)
Dim ConnectionInfo As New ConnectionInfo(DY_server, DY_port, DY_name, New PasswordAuthenticationMethod(DY_name, DY_pwd))
Using client = New SftpClient(ConnectionInfo)
client.Connect()
'client.Create(file, file)
If misc Then
client.ChangeDirectory(DY_PFAD_IN.Replace("gebox", "misc"))
client.ChangeDirectory(DY_PFAD_IN_KD) 'DY_PFAD_IN.Replace("gebox", "misc"))
Else
client.ChangeDirectory(DY_PFAD_IN)
End If
@@ -107,21 +110,31 @@ Public Class cDakosyFunftions
End Function
Shared Sub getSFTPLoginData(ByRef DY_server, ByRef DY_name, ByRef DY_pwd, ByRef DY_port, ByRef DY_PFAD_IN, ByRef DY_PFAD_OUT)
Shared Sub getSFTPLoginData(ByRef DY_server, ByRef DY_name, ByRef DY_pwd, ByRef DY_port, ByRef DY_PFAD_IN, ByRef DY_PFAD_OUT, ByRef DY_PFAD_IN_KD)
If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
DY_server = cDY_Paramter.GET_PARAM_ByName("FTP_TEST_SERVER", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
DY_name = cDY_Paramter.GET_PARAM_ByName("FTP_TEST_NAME", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
DY_pwd = cDY_Paramter.GET_PARAM_ByName("FTP_TEST_PASSWORD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
DY_port = cDY_Paramter.GET_PARAM_ByName("FTP_TEST_PORT", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
DY_PFAD_IN = "in/test/gebox/"
DY_PFAD_OUT = "out/test/"
DY_PFAD_IN = cDY_Paramter.GET_PARAM_ByName("DY_PFAD_IN", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
DY_PFAD_OUT = cDY_Paramter.GET_PARAM_ByName("DY_PFAD_OUT", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
If DY_PFAD_IN = "" Then DY_PFAD_IN = "in/test/gebox/"
If DY_PFAD_OUT = "" Then DY_PFAD_OUT = "out/test/"
DY_PFAD_IN_KD = cDY_Paramter.GET_PARAM_ByName("DY_PFAD_IN_KD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
Else
DY_server = cDY_Paramter.GET_PARAM_ByName("FTP_PROD_SERVER", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
DY_name = cDY_Paramter.GET_PARAM_ByName("FTP_PROD_NAME", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
DY_pwd = cDY_Paramter.GET_PARAM_ByName("FTP_PROD_PASSWORD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
DY_port = cDY_Paramter.GET_PARAM_ByName("FTP_PROD_PORT", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
DY_PFAD_IN = "in/prod/gebox/"
DY_PFAD_OUT = "out/prod/"
DY_PFAD_IN = cDY_Paramter.GET_PARAM_ByName("DY_PFAD_IN", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
DY_PFAD_OUT = cDY_Paramter.GET_PARAM_ByName("DY_PFAD_OUT", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
If DY_PFAD_IN = "" Then DY_PFAD_IN = "in/prod/gebox/"
If DY_PFAD_OUT = "" Then DY_PFAD_OUT = "out/prod/"
DY_PFAD_IN_KD = cDY_Paramter.GET_PARAM_ByName("DY_PFAD_IN_KD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
End If
End Sub
@@ -162,7 +175,14 @@ Public Class cDakosyFunftions
End Function
Shared Function sendData(Optional defaultFolder As String = "", Optional Dakosy_Mandant As String = "VERG")
Shared Function sendData(Optional defaultFolder As String = "") ', Optional Dakosy_Mandant As String = "VERG")
Dim Dakosy_Mandant = "VERG"
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "UNISPED" : Dakosy_Mandant = "UNAT"
'Case Else
' Dakosy_Mandant = "VERG"
End Select
Dim dt = DAKOSY_Worker.cDakosyFunftions.getKDData
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
@@ -179,7 +199,14 @@ Public Class cDakosyFunftions
Return False
End Function
Shared Function sendDataByKdNr(KdNr As Integer, Optional defaultFolder As String = "", Optional Dakosy_Mandant As String = "VERG")
Shared Function sendDataByKdNr(KdNr As Integer, Optional defaultFolder As String = "") ', Optional Dakosy_Mandant As String = "VERG")
Dim Dakosy_Mandant = "VERG"
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "UNISPED" : Dakosy_Mandant = "UNAT"
'Case Else
' Dakosy_Mandant = "VERG"
End Select
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then
MsgBox("Übertrag derzeit nicht möglich!")
Return False
@@ -219,6 +246,14 @@ Public Class cDakosyFunftions
End Function
Shared Function generateVERAGKdData(dt As DataTable, path As String, ByRef saveFile As String, Optional Dakosy_Mandant As String = "VERG") As Boolean
Select Case Dakosy_Mandant
Case "UNAT" : Return generateVERAGKdData_V2(dt, path, saveFile, Dakosy_Mandant)
Case Else : Return generateVERAGKdData_V1(dt, path, saveFile, Dakosy_Mandant)
End Select
End Function
Shared Function generateVERAGKdData_V1(dt As DataTable, path As String, ByRef saveFile As String, Optional Dakosy_Mandant As String = "VERG") As Boolean
Try
Dim Interface_VERSION = "003"
@@ -314,4 +349,113 @@ Public Class cDakosyFunftions
End Function
Shared Function generateVERAGKdData_V2(dt As DataTable, path As String, ByRef saveFile As String, Optional Dakosy_Mandant As String = "VERG") As Boolean
Try
'Dim Interface_VERSION = "003"
Dim XML As New DAKOSY_Worker.VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORT
Dim TRANS As New DAKOSY_Worker.VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORTTransaktion
TRANS.Version = "002"
TRANS.IOPartner = Dakosy_Mandant
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "IMEX" : TRANS.IODivision1 = "IMEX"
Case "UNISPED" : TRANS.IODivision1 = "UNAT" : TRANS.IOPartner = "UNAT"
Case "ATILLA" : TRANS.IODivision1 = "ATIL"
Case Else
TRANS.IODivision1 = "VERG"
End Select
XML.Transaktion = TRANS
For Each ROW As DataRow In dt.Rows
Dim KD As New DAKOSY_Worker.VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORTKundenDaten
KD.Dakosy_Mandant = Dakosy_Mandant
KD.KundenNr = ROW("KundenNr")
KD.EORI = ROW("EORITIN")
If ROW("EORITIN_NL") Is DBNull.Value OrElse If(ROW("EORITIN_NL"), "") = "" Then
KD.EORI_Niederlassung = "0000"
Else
KD.EORI_Niederlassung = ROW("EORITIN_NL")
End If
If ROW("Ordnungsbegriff") IsNot DBNull.Value Then KD.Kurzname = ROW("Ordnungsbegriff")
If ROW("Name 1") IsNot DBNull.Value Then KD.Name1 = ROW("Name 1")
If ROW("Name 2") IsNot DBNull.Value Then KD.Name2 = ROW("Name 2")
If ROW("UstIdKz") IsNot DBNull.Value And ("UstIdNr") IsNot DBNull.Value Then KD.UID_Nr = ROW("UstIdKz") & ROW("UstIdNr")
KD.Adresse = New DAKOSY_Worker.VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORTKundenDatenAdresse
If ROW("Straße") IsNot DBNull.Value Then KD.Adresse.Strasse = ROW("Straße")
If ROW("PLZ") IsNot DBNull.Value Then KD.Adresse.Plz = ROW("PLZ")
If ROW("Ort") IsNot DBNull.Value Then KD.Adresse.Ort = ROW("Ort")
If ROW("LandKz") IsNot DBNull.Value Then KD.Adresse.LandKz = ROW("LandKzISO2")
KD.Kontakt = New DAKOSY_Worker.VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORTKundenDatenKontakt
If ROW("E-Mail") IsNot DBNull.Value Then KD.Kontakt.EMail = ROW("E-Mail")
If ROW("Telefon") IsNot DBNull.Value Then KD.Kontakt.Tel = ROW("Telefon")
If ROW("Telefax") IsNot DBNull.Value Then KD.Kontakt.Fax = ROW("Telefax")
If ROW("Ansprechpartner") IsNot DBNull.Value Then KD.Kontakt.Ansprechpartner = If(ROW("Anrede") IsNot DBNull.Value, ROW("Anrede") & " ", "") & ROW("Ansprechpartner")
Dim KD_AKTO = VERAG_PROG_ALLGEMEIN.cKundenAufschubkonten.LOAD_ListAufschubKTOByKdNr(KD.KundenNr)
If KD_AKTO IsNot Nothing Then
Dim AKTOLIST = New List(Of VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORTKundenDatenAufschub)
For Each KTO In KD_AKTO
If If(KTO.kdAkto_bin, "").ToString.Trim <> String.Empty And
If(KTO.kdAkto_eori, "").ToString.Trim <> String.Empty And
If(KTO.kdAkto_hauptzollamt, "").ToString.Trim <> String.Empty And
If(KTO.kdAkto_kontonummer, "").ToString.Trim <> String.Empty Then
Dim AUFSCH As New DAKOSY_Worker.VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORTKundenDatenAufschub
Select Case KTO.kdAkto_art
Case "10" : AUFSCH.Art = VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORTKundenDatenAufschubArt.Item10
Case "15" : AUFSCH.Art = VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORTKundenDatenAufschubArt.Item15
Case "20" : AUFSCH.Art = VERAG_KundenStamm_Export_V2.VERAG_Kundenstamm_IMPORTKundenDatenAufschubArt.Item20
End Select
AUFSCH.BIN = KTO.kdAkto_bin
AUFSCH.EORI = KTO.kdAkto_eori
If KTO.kdAkto_eoriNL IsNot Nothing Then AUFSCH.EORI_Niederlassung = KTO.kdAkto_eoriNL Else AUFSCH.EORI_Niederlassung = "0000"
AUFSCH.Hauptzollamt = KTO.kdAkto_hauptzollamt
AUFSCH.KontoNr = KTO.kdAkto_kontonummer
AKTOLIST.Add(AUFSCH)
If AKTOLIST.Count = 2 Then Exit For 'max. 2 Aufschub
End If
Next
If AKTOLIST.Count > 0 Then KD.Aufschubkonten = AKTOLIST
End If
XML.KundenDaten.Add(KD)
Next
Dim saveDir = path
If Not IO.Directory.Exists(saveDir) Then
IO.Directory.CreateDirectory(saveDir)
End If
Dim counter = 1
While IO.File.Exists(saveDir & "VERAG_KD_" & counter.ToString("D4") & ".xml")
counter += 1
End While
saveFile = saveDir & "VERAG_KD_" & counter.ToString("D4") & ".xml"
XML.SaveToFile(saveFile)
Return True
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
Return False
End Try
End Function
End Class

View File

@@ -988,7 +988,7 @@ Public Class cDY_Paramter
Shared SQL As New VERAG_PROG_ALLGEMEIN.SQL
Shared Function GET_PARAM_ByName(dyParam_name, TESTSYSTEM) As String
Return SQL.getValueTxtBySql("SELECT TOP 1 [dyParam_value] FROM [tbl_DY_Paramter] WHERE [dyParam_name]='" & dyParam_name & "'", , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM))
Return SQL.getValueTxtBySql("SELECT TOP 1 [dyParam_value] FROM [tbl_DY_Paramter] WHERE [dyParam_name]='" & dyParam_name & "' AND dyParam_firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'", , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM))
End Function
End Class

View File

@@ -265,6 +265,21 @@ Public Class cZOLL_IMPORT
ATLAS_SERVER_VERBINDUNG = "ATLAS"
End If
If SendungId > 0 Then SENDUNG = New VERAG_PROG_ALLGEMEIN.cSendungen(SendungId)
If EZA_Nr = "" And NCTS_Nr = "" Then
If SENDUNG IsNot Nothing AndAlso If(SENDUNG.tblSnd_DakosyRef, "") <> "" Then
Select Case SENDUNG.tblSnd_Abfertigungsart_ID
Case 5, 6, 24, 33, 34, 37, 40
NCTS_Nr = SENDUNG.tblSnd_DakosyRef
SPEDITIONSBUCH.AtlasBezNrNCTS = NCTS_Nr
Case Else
EZA_Nr = SENDUNG.tblSnd_DakosyRef
SPEDITIONSBUCH.AtlasBezNrEZA = EZA_Nr
End Select
Zollsystem = 2
End If
End If
'-------------------------------------------------------------------------------------------------------------
' ATLAS / EZOLL
@@ -295,57 +310,44 @@ Public Class cZOLL_IMPORT
Case 2 'dakosy
SPEDITIONSBUCH.Zollsystem = "D"
If EZA_Nr <> "" Then
DAKOSY_Worker.cDakosyEZA.DakosyEZADatenbereitstellung(SPEDITIONSBUCH, EZA_Nr, notFound, PosAnzahl)
ElseIf NCTS_Nr <> "" Then
' SPEDITIONSBUCH.AtlasBezNrNCTS = NCTS_Nr
DAKOSY_Worker.cDakosyNCTSOut.DakosyNCTSDatenbereitstellung(SPEDITIONSBUCH, NCTS_Nr, notFound)
End If
Me.notFound = notFound
Case 3 'telotec
SPEDITIONSBUCH.Zollsystem = "T"
If EZA_Nr <> "" Then
TELOTEC_Worker.cTelotec_Anmeldung.TELOTECDatenbereitstellung(SPEDITIONSBUCH, EZA_Nr, notFound, "EZA", PosAnzahl)
ElseIf NCTS_Nr <> "" Then
' SPEDITIONSBUCH.AtlasBezNrNCTS = NCTS_Nr
TELOTEC_Worker.cTelotec_Anmeldung.TELOTECDatenbereitstellung(SPEDITIONSBUCH, NCTS_Nr, notFound, "NCTS", PosAnzahl)
End If
Me.notFound = notFound
Case Else 'Kein Zollsystem
End Select
If avisoLinkId = 0 Or SendungId = 0 Then
Dim DY As DAKOSY_Worker.cDakosy_Zollanmeldungen = DAKOSY_Worker.cDakosy_Zollanmeldungen.LOADByBezugsNr(If(EZA_Nr <> "", EZA_Nr, NCTS_Nr))
If DY IsNot Nothing Then
If avisoLinkId = 0 Then avisoLinkId = If(DY.dy_AvisoId, 0)
If SendungId = 0 Then SendungId = If(DY.dy_SendungsId, 0)
End If
End If
'-------------------------------------------------------------------------------------------------------------
If SPEDITIONSBUCH.Abfertigungsdatum Is Nothing Then SPEDITIONSBUCH.Abfertigungsdatum = Now.ToShortDateString
If SendungId > 0 Then SPEDITIONSBUCH.SendungID = SendungId
' Dim fNEF = DirectCast(Me.Owner, frmNacherfassungNEU)
If SendungId = 0 And SPEDITIONSBUCH.SendungID > 0 Then SendungId = SPEDITIONSBUCH.SendungID 'Falls falsch übergeben
If SendungId > 0 Then SENDUNG = New VERAG_PROG_ALLGEMEIN.cSendungen(SendungId)
If SendungId > 0 And SENDUNG Is Nothing Then SENDUNG = New VERAG_PROG_ALLGEMEIN.cSendungen(SendungId)
' Dim dt As DataTable = SQLAVISO.loadDataTableBySQL("SELECT * FROM tblSendungen WHERE tblSnd_SendungID='" & SendungId & "' ")
If SENDUNG IsNot Nothing Then
@@ -397,7 +399,6 @@ Public Class cZOLL_IMPORT
MsgBox("BAR-Err: Beträge konnten nicht geladen werden!" & vbNewLine & ex.Message & ex.StackTrace)
End Try
'If If(SENDUNG.tblSnd_bar, False) Then
'SPEDITIONSBUCH.Bar = True
' If (SENDUNG.tblSnd_barBeleg IsNot Nothing) And SPEDITIONSBUCH.ErfassungsNr = "" Then SPEDITIONSBUCH.ErfassungsNr = "VERA/" & VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG & "/" & CDate(SPEDITIONSBUCH.Abfertigungsdatum).ToShortDateString & "/" & SENDUNG.tblSnd_barBeleg
@@ -415,14 +416,11 @@ Public Class cZOLL_IMPORT
SPEDITIONSBUCH.NCTS_Verzollungsadresse &= vbNewLine
SPEDITIONSBUCH.NCTS_Verzollungsadresse = SPEDITIONSBUCH.NCTS_Verzollungsadresse.Trim
End If
If SPEDITIONSBUCH.Endempfänger Is Nothing OrElse SPEDITIONSBUCH.Endempfänger = "" Then
SPEDITIONSBUCH.Endempfänger = SENDUNG.tblSnd_Endempfaenger
End If
If IsNull(SPEDITIONSBUCH.KdAuftragsNr) Then SPEDITIONSBUCH.KdAuftragsNr = If(SENDUNG.tblSnd_KdAuftragsNr, "")
If IsNull(SPEDITIONSBUCH.KdAuftragsNrAvisierer) Then SPEDITIONSBUCH.KdAuftragsNrAvisierer = If(SENDUNG.tblSnd_KdAuftragsNrAvisierer, "")
If IsNull(SPEDITIONSBUCH.KdAuftragsNrEmpfaenger) Then SPEDITIONSBUCH.KdAuftragsNrEmpfaenger = If(SENDUNG.tblSnd_KdAuftragsNrEmpfaenger, "")
@@ -450,11 +448,12 @@ Public Class cZOLL_IMPORT
' txtAuftraggeber.Text = Aviso.Auftraggeber
' txtAuftraggeberKdNr.Text = Aviso.Auftraggeber_KdNr
SPEDITIONSBUCH.Avisierer = Aviso.Auftraggeber
If getint(Aviso.Auftraggeber_KdNr) > 0 Then SPEDITIONSBUCH.AvisiererKundenNr = Aviso.Auftraggeber_KdNr
'NICHT MEHR:
'SPEDITIONSBUCH.Avisierer = Aviso.Auftraggeber
'If getint(Aviso.Auftraggeber_KdNr) > 0 Then SPEDITIONSBUCH.AvisiererKundenNr = Aviso.Auftraggeber_KdNr
SPEDITIONSBUCH.Frachtführer = Aviso.Frächter
If getint(Aviso.Frächter_KdNr) > 0 Then SPEDITIONSBUCH.FrachtführerKundenNr = Aviso.Frächter_KdNr
'SPEDITIONSBUCH.Frachtführer = Aviso.Frächter
'If getint(Aviso.Frächter_KdNr) > 0 Then SPEDITIONSBUCH.FrachtführerKundenNr = Aviso.Frächter_KdNr
SPEDITIONSBUCH.LKW_Kennzeichen = Aviso.LKW_Nr
@@ -474,6 +473,17 @@ Public Class cZOLL_IMPORT
If SENDUNG IsNot Nothing Then
'NEU:
SPEDITIONSBUCH.Avisierer = SENDUNG.tblSnd_Avisierer
If getint(SENDUNG.tblSnd_AvisiererKdNr) > 0 Then SPEDITIONSBUCH.AvisiererKundenNr = SENDUNG.tblSnd_AvisiererKdNr
SPEDITIONSBUCH.Frachtführer = SENDUNG.tblSnd_Frachtfuehrer
If getint(SENDUNG.tblSnd_FrachtfuehrerKdNr) > 0 Then SPEDITIONSBUCH.FrachtführerKundenNr = SENDUNG.tblSnd_FrachtfuehrerKdNr
If SPEDITIONSBUCH.AbsenderKundenNr Is Nothing OrElse SPEDITIONSBUCH.AbsenderKundenNr <= 0 Then
If SENDUNG.tblSnd_AbsenderKdNr > 0 Then
SPEDITIONSBUCH.AbsenderKundenNr = SENDUNG.tblSnd_AbsenderKdNr
@@ -525,7 +535,7 @@ Public Class cZOLL_IMPORT
End If
If (SENDUNG.tblSnd_Abfertigungsart_ID = 26 Or SENDUNG.tblSnd_Abfertigungsart_ID = 28) And NCTS_Nr <> "" Then
If (SENDUNG.tblSnd_Abfertigungsart_ID = 26 Or SENDUNG.tblSnd_Abfertigungsart_ID = 28 Or SENDUNG.tblSnd_Abfertigungsart_ID = 38) And NCTS_Nr <> "" Then
'Überstellungs-T
SPEDITIONSBUCH.Abfertigungsart = 5
Else
@@ -633,7 +643,9 @@ Public Class cZOLL_IMPORT
If SPEDITIONSBUCH.Abfertigungsanzahl = 0 Then Return False
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.sendERRORperMail("Validierungsfehler SpedBuch - Trotzdem eingearbeitet!", ex.Message, ex.StackTrace, "al@verag.ag", "")
' VERAG_PROG_ALLGEMEIN.cErrorHandler.sendERRORperMail(, ex.Message, ex.StackTrace, , "",)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Validierungsfehler SpedBuch - Trotzdem eingearbeitet!", "al@verag.ag", "al@verag.ag")
End Try
Return True
End Function

View File

@@ -29,6 +29,9 @@
'End Sub
Function getATAMRNBezugsnummer(BezugsNr As String, Abfertigungsart As String) As String
If BezugsNr.Length <= 12 Then Return ""
BezugsNr = BezugsNr & "%"
getATAMRNBezugsnummer = ""
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
' Case "IMEX"
@@ -38,15 +41,16 @@
Select Case Abfertigungsart
Case 38, 26 'AT
' getADFrom_EZOLL
getATAMRNBezugsnummer = load_NCTS_MRN_FromDAKOSY(BezugsNr) 'Ü-T1
getATAMRNBezugsnummer = load_NCTS_MRN_FromDAKOSY(BezugsNr, True) 'Ü-T1
Sachbearbeiter = "" ' Bei Ü-T1 soll der SB leer sein, sonst wird dieser evtl. beim Austragen herangezogen...
Case 1, 2, 3, 28, 39
getATAMRNBezugsnummer = load_EZA_ATA_FromDAKOSY(BezugsNr)
getATAMRNBezugsnummer = load_EZA_ATA_FromDAKOSY(BezugsNr, True)
'... and Systeme
Case Else
getATAMRNBezugsnummer = load_NCTS_MRN_FromDAKOSY(BezugsNr)
getATAMRNBezugsnummer = load_NCTS_MRN_FromDAKOSY(BezugsNr, True)
If getATAMRNBezugsnummer = "" Then 'Falls doch nicht
getATAMRNBezugsnummer = load_EZA_ATA_FromDAKOSY(BezugsNr)
getATAMRNBezugsnummer = load_EZA_ATA_FromDAKOSY(BezugsNr, True)
End If
End Select
End Select
@@ -54,6 +58,8 @@
End Function
Function getDataByBezugsnummer(BezugsNr As String, Abfertigungsart As String) As Boolean
If BezugsNr.Length <= 12 Then Return ""
BezugsNr = BezugsNr & "%"
getDataByBezugsnummer = False
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
' Case "UNISPED"
@@ -62,19 +68,20 @@
Select Case Abfertigungsart
Case 38, 26 'AT
' getADFrom_EZOLL
getDataByBezugsnummer = load_NCTS_FromDAKOSY(BezugsNr)'Ü-T1
getDataByBezugsnummer = load_NCTS_FromDAKOSY(BezugsNr, True) 'Ü-T1
Sachbearbeiter = "" ' Bei Ü-T1 soll der SB leer sein, sonst wird dieser evtl. beim Austragen herangezogen...
Case 1, 2, 3, 28, 39
getDataByBezugsnummer = load_EZA_FromDAKOSY(BezugsNr)
getDataByBezugsnummer = load_EZA_FromDAKOSY(BezugsNr, True)
'... and Systeme
Case Else
getDataByBezugsnummer = load_NCTS_FromDAKOSY(BezugsNr)
getDataByBezugsnummer = load_NCTS_FromDAKOSY(BezugsNr, True)
If Not getDataByBezugsnummer Then 'Falls doch nicht
getDataByBezugsnummer = load_EZA_FromDAKOSY(BezugsNr)
getDataByBezugsnummer = load_EZA_FromDAKOSY(BezugsNr, True)
End If
End Select
End Select
Return False
End Function
@@ -96,22 +103,22 @@
End Function
Function load_EZA_ATA_FromDAKOSY(BezugsNr) As String
Dim EZA = DAKOSY_Worker.cDakosyEZA.LOADByBezugsNr(BezugsNr, True)
Function load_EZA_ATA_FromDAKOSY(BezugsNr, Optional checkValidStatus = False) As String
Dim EZA = DAKOSY_Worker.cDakosyEZA.LOADByBezugsNr(BezugsNr, True, checkValidStatus)
If EZA Is Nothing Then Return ""
Return If(EZA.eza_ANR, If(EZA.eza_MRN, ""))
End Function
Function load_NCTS_MRN_FromDAKOSY(BezugsNr) As String
Dim NCTS = DAKOSY_Worker.cDakosyNCTSOut.LOADByBezugsNr(BezugsNr, True)
Function load_NCTS_MRN_FromDAKOSY(BezugsNr, Optional checkValidStatus = False) As String
Dim NCTS = DAKOSY_Worker.cDakosyNCTSOut.LOADByBezugsNr(BezugsNr, True, checkValidStatus)
If NCTS Is Nothing Then Return ""
Return If(NCTS.ncts_MRN, If(NCTS.ncts_ANR, ""))
End Function
Function load_EZA_FromDAKOSY(BezugsNr) As Boolean
Dim EZA = DAKOSY_Worker.cDakosyEZA.LOADByBezugsNr(BezugsNr, True)
Function load_EZA_FromDAKOSY(BezugsNr As String, Optional checkValidStatus As Boolean = False) As Boolean
Dim EZA = DAKOSY_Worker.cDakosyEZA.LOADByBezugsNr(BezugsNr, True, True)
If EZA Is Nothing Then Return False
Return load_EZA_FromDAKOSY(EZA)
End Function
@@ -119,7 +126,7 @@
Function load_EZA_FromDAKOSY(EZA As DAKOSY_Worker.cDakosyEZA) As Boolean
Try
If EZA Is Nothing Then Return Nothing
If EZA Is Nothing Then Return False
EZA.LOAD_Warenposition()
'
@@ -185,7 +192,8 @@
Dim AUFSCHUB_List As New List(Of String)
For Each AB In EZA.eza_AUFSCHUB
addIfNotExists(AUFSCHUB_List, (If(AB.ezaAfb_KontoNr, "")).Trim)
Dim kto = (If(AB.ezaAfb_HZA, "") & If(AB.ezaAfb_KontoNr, "")).Trim
addIfNotExists(AUFSCHUB_List, kto & load_KdFromAKto(kto))
Next
AbgabenKonto = listToString(AUFSCHUB_List)
@@ -194,13 +202,17 @@
Return True
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine, System.Reflection.MethodInfo.GetCurrentMethod.Name)
Return Nothing
Return False
End Try
Return False
End Function
Function load_NCTS_FromDAKOSY(BezugsNr) As Boolean
Dim NCTS = DAKOSY_Worker.cDakosyNCTSOut.LOADByBezugsNr(BezugsNr, True)
Function load_KdFromAKto(kto) As String
Return SQL.getValueTxtBySql("SELECT TOP 1 Ordnungsbegriff FROM [tblKundenAufschubkonten] inner join adressen on adressennr = [kdAkto_KundenNr] where kdAkto_hauptzollamt + kdAkto_kontonummer ='" & kto & "'", "FMZOLL")
End Function
Function load_NCTS_FromDAKOSY(BezugsNr As String, Optional checkValidStatus As Boolean = False) As Boolean
Dim NCTS = DAKOSY_Worker.cDakosyNCTSOut.LOADByBezugsNr(BezugsNr, True, checkValidStatus)
If NCTS Is Nothing Then Return False
Return load_NCTS_FromDAKOSY(NCTS)
End Function

View File

@@ -25,6 +25,7 @@
Property dedet_ExcelMonatFarbe As Object
Property dedet_ExcelMonatBezeichnung As String = ""
Property dedet_Aktiv As Boolean = True
Property ZEITEN As New List(Of cDienstplanSchichtZeiten)
@@ -69,6 +70,7 @@
Me.dedet_ExcelMonatFarbe = If(row("dedet_ExcelMonatFarbe") IsNot DBNull.Value, row("dedet_ExcelMonatFarbe"), Nothing)
Me.dedet_ExcelMonatBezeichnung = If(row("dedet_ExcelMonatBezeichnung") IsNot DBNull.Value, row("dedet_ExcelMonatBezeichnung"), "")
Me.dedet_Aktiv = CBool(row("dedet_Aktiv"))
LOAD_ZEITEN(Me.dedet_id)
End If

View File

@@ -389,7 +389,7 @@ Public Class frmDienstplanVariabel
' Next
FlowLayoutPanel.Controls.Clear()
Dim DTBenutzer As DataTable = ADMIN.AnzeigeTabelle(" SELECT * FROM [tblDienstplanEintraegeDetails] WHERE [dedet_niederlassung]='" & niederlassung & "' AND dedet_benutzerdefinierteSchicht=1 ORDER BY dedet_reihenfolge")
Dim DTBenutzer As DataTable = ADMIN.AnzeigeTabelle(" SELECT * FROM [tblDienstplanEintraegeDetails] WHERE [dedet_niederlassung]='" & niederlassung & "' AND dedet_benutzerdefinierteSchicht=1 AND dedet_aktiv=1 ORDER BY dedet_reihenfolge")
For Each r As DataRow In DTBenutzer.Rows
Dim SCHICHT As New cDienstplanSchicht(r("dedet_id"))
Dim u As New usrCntlDienstWoche(SCHICHT, SETTINGS)

View File

@@ -103,6 +103,7 @@ Partial Class frmSchichtenZeiten
Me.frbBGExcelMonat = New System.Windows.Forms.Button()
Me.CheckBox3 = New System.Windows.Forms.CheckBox()
Me.ColorDialog3 = New System.Windows.Forms.ColorDialog()
Me.cbxAktiv = New System.Windows.Forms.CheckBox()
CType(Me.dgvSchihten, System.ComponentModel.ISupportInitialize).BeginInit()
Me.grp.SuspendLayout()
Me.pnl.SuspendLayout()
@@ -877,12 +878,25 @@ Partial Class frmSchichtenZeiten
Me.CheckBox3.Text = "BG Farbe:"
Me.CheckBox3.UseVisualStyleBackColor = True
'
'cbxAktiv
'
Me.cbxAktiv.AutoSize = True
Me.cbxAktiv.Checked = True
Me.cbxAktiv.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxAktiv.Location = New System.Drawing.Point(598, 160)
Me.cbxAktiv.Name = "cbxAktiv"
Me.cbxAktiv.Size = New System.Drawing.Size(49, 17)
Me.cbxAktiv.TabIndex = 130
Me.cbxAktiv.Text = "aktiv"
Me.cbxAktiv.UseVisualStyleBackColor = True
'
'frmSchichtenZeiten
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.White
Me.ClientSize = New System.Drawing.Size(659, 400)
Me.Controls.Add(Me.cbxAktiv)
Me.Controls.Add(Me.CheckBox3)
Me.Controls.Add(Me.cbxSchichtArbeitszeit)
Me.Controls.Add(Me.frbBGExcelMonat)
@@ -990,4 +1004,5 @@ Partial Class frmSchichtenZeiten
Friend WithEvents Label10 As System.Windows.Forms.Label
Friend WithEvents CheckBox3 As System.Windows.Forms.CheckBox
Friend WithEvents ColorDialog3 As System.Windows.Forms.ColorDialog
Friend WithEvents cbxAktiv As CheckBox
End Class

View File

@@ -110,7 +110,7 @@
End If
txtExcelMonat.Text = SCHICHT.dedet_ExcelMonatBezeichnung
cbxAktiv.Checked = SCHICHT.dedet_Aktiv
txtZusatzAL.Text = SCHICHT.dedet_bezLeiter
If SCHICHT.dedet_ExcelBgFarbe IsNot Nothing Then
@@ -168,7 +168,7 @@
End If
DP.updateEintraegeDetails_Benuterdef(dgvSchihten.SelectedRows(0).Cells("dedet_id").Value, txtDPBezeichnung.Text, txtProzent.Text, txtExcelBezeichnung.Text, txtExcelBezeichnung2.Text, txtExcelBezeichnung3.Text, txtExcelZeilen.Text, cbxBenutzerdefinierteSchicht.Checked, cbxSchichtArbeitszeit.Checked,
IIf(IsNumeric(txtReihenfolge.Text), txtReihenfolge.Text, 50), cbxTagesSchichtWechsel.Checked, txtSchichtWechselZu.Text, txtHotKey.Text, bg, bgExcel, txtZusatzAL.Text, bgExcelMonat, txtExcelMonat.Text)
IIf(IsNumeric(txtReihenfolge.Text), txtReihenfolge.Text, 50), cbxTagesSchichtWechsel.Checked, txtSchichtWechselZu.Text, txtHotKey.Text, bg, bgExcel, txtZusatzAL.Text, bgExcelMonat, txtExcelMonat.Text, cbxAktiv.Checked)
End If
' d.dedet_bezeichnungDP = dr.Item("dedet_bezeichnungDP")

View File

@@ -31,6 +31,7 @@ Partial Class usrCntlDienstplan
Me.btnDienstplan = New System.Windows.Forms.Button()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.Panel3 = New System.Windows.Forms.Panel()
Me.cbxInaktiv = New System.Windows.Forms.CheckBox()
Me.numJahr = New System.Windows.Forms.NumericUpDown()
Me.cboMonat = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.btnAuswertung = New System.Windows.Forms.Button()
@@ -46,7 +47,7 @@ Partial Class usrCntlDienstplan
Me.tbVerag = New System.Windows.Forms.TabPage()
Me.tbAtilla2 = New System.Windows.Forms.TabPage()
Me.tbImex = New System.Windows.Forms.TabPage()
Me.cbxInaktiv = New System.Windows.Forms.CheckBox()
Me.tbFrontOffice = New System.Windows.Forms.TabPage()
CType(Me.dgvMA, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
Me.Panel3.SuspendLayout()
@@ -154,6 +155,16 @@ Partial Class usrCntlDienstplan
Me.Panel3.Size = New System.Drawing.Size(121, 771)
Me.Panel3.TabIndex = 6
'
'cbxInaktiv
'
Me.cbxInaktiv.AutoSize = True
Me.cbxInaktiv.Location = New System.Drawing.Point(6, 364)
Me.cbxInaktiv.Name = "cbxInaktiv"
Me.cbxInaktiv.Size = New System.Drawing.Size(82, 17)
Me.cbxInaktiv.TabIndex = 12
Me.cbxInaktiv.Text = "inaktive MA"
Me.cbxInaktiv.UseVisualStyleBackColor = True
'
'numJahr
'
Me.numJahr.Location = New System.Drawing.Point(4, 482)
@@ -288,6 +299,7 @@ Partial Class usrCntlDienstplan
Me.tbFirmen.Controls.Add(Me.tbVerag)
Me.tbFirmen.Controls.Add(Me.tbAtilla2)
Me.tbFirmen.Controls.Add(Me.tbImex)
Me.tbFirmen.Controls.Add(Me.tbFrontOffice)
Me.tbFirmen.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.tbFirmen.Location = New System.Drawing.Point(0, 42)
Me.tbFirmen.Name = "tbFirmen"
@@ -325,15 +337,15 @@ Partial Class usrCntlDienstplan
Me.tbImex.Text = "IMEX"
Me.tbImex.UseVisualStyleBackColor = True
'
'cbxInaktiv
'tbFrontOffice
'
Me.cbxInaktiv.AutoSize = True
Me.cbxInaktiv.Location = New System.Drawing.Point(6, 364)
Me.cbxInaktiv.Name = "cbxInaktiv"
Me.cbxInaktiv.Size = New System.Drawing.Size(82, 17)
Me.cbxInaktiv.TabIndex = 12
Me.cbxInaktiv.Text = "inaktive MA"
Me.cbxInaktiv.UseVisualStyleBackColor = True
Me.tbFrontOffice.Location = New System.Drawing.Point(4, 33)
Me.tbFrontOffice.Name = "tbFrontOffice"
Me.tbFrontOffice.Padding = New System.Windows.Forms.Padding(3)
Me.tbFrontOffice.Size = New System.Drawing.Size(950, 0)
Me.tbFrontOffice.TabIndex = 3
Me.tbFrontOffice.Text = "FRONTOFFICE"
Me.tbFrontOffice.UseVisualStyleBackColor = True
'
'usrCntlDienstplan
'
@@ -378,4 +390,5 @@ Partial Class usrCntlDienstplan
Friend WithEvents numJahr As NumericUpDown
Friend WithEvents cboMonat As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents cbxInaktiv As CheckBox
Friend WithEvents tbFrontOffice As TabPage
End Class

View File

@@ -56,6 +56,8 @@ Public Class usrCntlDienstplan
Sub initNiederlassungen(Optional start = False)
MyFlowLayoutPanel1.Controls.Clear()
If tbFirmen.TabPages.Count = 0 Then Exit Sub
If tbFirmen.SelectedIndex < 0 Then Exit Sub
Dim s As New VERAG_PROG_ALLGEMEIN.SQL
Dim dt As DataTable = s.loadDgvBySql("SELECT [dpset_id],[dpset_niederlassung] FROM [tblDienstSettings] WHERE dpset_firma='" & tbFirmen.SelectedTab.Text & "' order by dpset_reihenfolge ", "ADMIN")
For Each r As DataRow In dt.Rows
@@ -86,22 +88,42 @@ Public Class usrCntlDienstplan
If start Then
'Einschränkung DP Firma:
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DpUserStandardFirma IsNot Nothing Then
If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMINFUNCTIONS", Me.FindForm) And Not VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DpUserStandardFirma = "ALLE" Then
'tbFirmen.Enabled = False
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DpUserStandardFirma <> "ATILLA" And VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DpUserStandardFirma2 <> "ATILLA" Then tbFirmen.TabPages.Remove(tbAtilla2)
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DpUserStandardFirma <> "IMEX" And VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DpUserStandardFirma2 <> "IMEX" Then tbFirmen.TabPages.Remove(tbImex)
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DpUserStandardFirma <> "VERAG" And VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DpUserStandardFirma2 <> "VERAG" Then tbFirmen.TabPages.Remove(tbVerag)
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DpUserStandardFirma <> "FRONTOFFICE" And VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DpUserStandardFirma2 <> "FRONTOFFICE" Then tbFirmen.TabPages.Remove(tbFrontOffice)
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DpUserStandardFirma
Case "ATILLA" : tbFirmen.SelectedTab = tbAtilla2
Case "IMEX" : tbFirmen.SelectedTab = tbImex
Case "VERAG" : tbFirmen.SelectedTab = tbVerag
Case "FRONTOFFICE" : tbFirmen.SelectedTab = tbFrontOffice
' Case "ALLE" : tbFirmen.SelectedTab = tbVerag : tbFirmen.Enabled = True
Case Else : tbFirmen.SelectedTab = tbVerag
End Select
If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMINFUNCTIONS", Me.FindForm) Then tbFirmen.Enabled = False
End If
''Einschränkung DP Firma:
'If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DpUserStandardFirma IsNot Nothing Then
' Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DpUserStandardFirma
' Case "ATILLA" : tbFirmen.SelectedTab = tbAtilla2
' Case "IMEX" : tbFirmen.SelectedTab = tbImex
' Case "VERAG" : tbFirmen.SelectedTab = tbVerag
' Case "FRONTOFFICE" : tbFirmen.SelectedTab = tbFrontOffice
' ' Case "ALLE" : tbFirmen.SelectedTab = tbVerag : tbFirmen.Enabled = True
' Case Else : tbFirmen.SelectedTab = tbVerag
' End Select
' If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMINFUNCTIONS", Me.FindForm) And Not VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DpUserStandardFirma = "ALLE" Then tbFirmen.Enabled = False
'End If
'Wenn zusätzlich eingeschränkt auf NL:
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DpUserStandardDP IsNot Nothing AndAlso VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DpUserStandardDP <> "" Then
initButtons(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DpUserStandardDP)
initDone = True
If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMINFUNCTIONS", Me.FindForm) Then
If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMINFUNCTIONS", Me.FindForm) And Not VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DpUserStandardFirma = "ALLE" Then
For Each b As Button In MyFlowLayoutPanel1.Controls
b.Enabled = False
tbFirmen.Enabled = False

View File

@@ -61,6 +61,8 @@ Partial Class frmMitarbDetails
Me.cboATLAS_SB = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label4 = New System.Windows.Forms.Label()
Me.GroupBox2 = New System.Windows.Forms.GroupBox()
Me.cboTeam = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label53 = New System.Windows.Forms.Label()
Me.cboALIASDomain = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.txtALIASUser = New System.Windows.Forms.TextBox()
Me.Label52 = New System.Windows.Forms.Label()
@@ -161,8 +163,7 @@ Partial Class frmMitarbDetails
Me.PictureBox6 = New System.Windows.Forms.PictureBox()
Me.cboAdminBer = New System.Windows.Forms.ComboBox()
Me.Label7 = New System.Windows.Forms.Label()
Me.cboTeam = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label53 = New System.Windows.Forms.Label()
Me.cboDPFirma2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
Me.TabControl2.SuspendLayout()
@@ -296,6 +297,7 @@ Partial Class frmMitarbDetails
'
'TabPage2
'
Me.TabPage2.Controls.Add(Me.cboDPFirma2)
Me.TabPage2.Controls.Add(Me.cboDPFirma)
Me.TabPage2.Controls.Add(Me.Label50)
Me.TabPage2.Controls.Add(Me.Label38)
@@ -327,7 +329,7 @@ Partial Class frmMitarbDetails
Me.cboDPFirma.FormattingEnabled = True
Me.cboDPFirma.Location = New System.Drawing.Point(7, 151)
Me.cboDPFirma.Name = "cboDPFirma"
Me.cboDPFirma.Size = New System.Drawing.Size(198, 21)
Me.cboDPFirma.Size = New System.Drawing.Size(101, 21)
Me.cboDPFirma.TabIndex = 107
'
'Label50
@@ -647,6 +649,30 @@ Partial Class frmMitarbDetails
Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Firmendaten"
'
'cboTeam
'
Me.cboTeam._allowedValuesFreiText = Nothing
Me.cboTeam._allowFreiText = False
Me.cboTeam._value = ""
Me.cboTeam.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cboTeam.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboTeam.FormattingEnabled = True
Me.cboTeam.Items.AddRange(New Object() {"Buchhaltung", "EDV", "Fiskal", "Geschäftsführung", "Lager", "MDM", "quick-stop", "Verrechnung", "Zollabteilung"})
Me.cboTeam.Location = New System.Drawing.Point(406, 116)
Me.cboTeam.Name = "cboTeam"
Me.cboTeam.Size = New System.Drawing.Size(136, 21)
Me.cboTeam.TabIndex = 101
'
'Label53
'
Me.Label53.AutoSize = True
Me.Label53.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label53.Location = New System.Drawing.Point(403, 100)
Me.Label53.Name = "Label53"
Me.Label53.Size = New System.Drawing.Size(37, 13)
Me.Label53.TabIndex = 102
Me.Label53.Text = "Team:"
'
'cboALIASDomain
'
Me.cboALIASDomain._allowedValuesFreiText = Nothing
@@ -1728,29 +1754,17 @@ Partial Class frmMitarbDetails
Me.Label7.TabIndex = 78
Me.Label7.Text = "Berechtigung:"
'
'cboTeam
'cboDPFirma2
'
Me.cboTeam._allowedValuesFreiText = Nothing
Me.cboTeam._allowFreiText = False
Me.cboTeam._value = ""
Me.cboTeam.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cboTeam.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboTeam.FormattingEnabled = True
Me.cboTeam.Items.AddRange(New Object() {"Buchhaltung", "EDV", "Fiskal", "Geschäftsführung", "Lager", "MDM", "quick-stop", "Verrechnung", "Zollabteilung"})
Me.cboTeam.Location = New System.Drawing.Point(406, 116)
Me.cboTeam.Name = "cboTeam"
Me.cboTeam.Size = New System.Drawing.Size(136, 21)
Me.cboTeam.TabIndex = 101
'
'Label53
'
Me.Label53.AutoSize = True
Me.Label53.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label53.Location = New System.Drawing.Point(403, 100)
Me.Label53.Name = "Label53"
Me.Label53.Size = New System.Drawing.Size(37, 13)
Me.Label53.TabIndex = 102
Me.Label53.Text = "Team:"
Me.cboDPFirma2._allowedValuesFreiText = Nothing
Me.cboDPFirma2._allowFreiText = False
Me.cboDPFirma2._value = ""
Me.cboDPFirma2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboDPFirma2.FormattingEnabled = True
Me.cboDPFirma2.Location = New System.Drawing.Point(106, 151)
Me.cboDPFirma2.Name = "cboDPFirma2"
Me.cboDPFirma2.Size = New System.Drawing.Size(101, 21)
Me.cboDPFirma2.TabIndex = 108
'
'frmMitarbDetails
'
@@ -1934,4 +1948,5 @@ Partial Class frmMitarbDetails
Friend WithEvents Label52 As Label
Friend WithEvents cboTeam As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents Label53 As Label
Friend WithEvents cboDPFirma2 As VERAG_PROG_ALLGEMEIN.MyComboBox
End Class

View File

@@ -50,12 +50,23 @@
cboDPFirma.Items.Clear()
cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "ALLE"))
cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA"))
cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR"))
cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FRONTOFFICE"))
cboDPFirma2.Items.Clear()
cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "ALLE"))
cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA"))
cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR"))
cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FRONTOFFICE"))
cboALIASDomain.Items.Clear()
cboALIASDomain.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
@@ -260,6 +271,7 @@
If mitarbeiter.mit_DpUserStandardDP IsNot Nothing Then cboDP.changeItem(mitarbeiter.mit_DpUserStandardDP)
If mitarbeiter.mit_DpUserStandardFirma IsNot Nothing Then cboDPFirma.changeItem(mitarbeiter.mit_DpUserStandardFirma)
If mitarbeiter.mit_DpUserStandardFirma2 IsNot Nothing Then cboDPFirma2.changeItem(mitarbeiter.mit_DpUserStandardFirma2)
cbxSpedBuch.Checked = mitarbeiter.mit_FMZollPersIDKasseIsnotSpedBuch
@@ -484,6 +496,7 @@
mitarbeiter.mit_DpUserStandardDP = cboDP._value
mitarbeiter.mit_DpUserStandardFirma = cboDPFirma._value
mitarbeiter.mit_DpUserStandardFirma2 = cboDPFirma2._value
If IsNumeric(MyComboBox2._value) AndAlso MyComboBox2._value > 0 Then
mitarbeiter.mit_standartFiliale = MyComboBox2._value

View File

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

View File

@@ -60,6 +60,24 @@ Namespace My.Resources
End Set
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die ähnelt.
'''</summary>
Friend ReadOnly Property adasasd23asdasdasd() As String
Get
Return ResourceManager.GetString("adasasd23asdasdasd", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die ähnelt.
'''</summary>
Friend ReadOnly Property adasdasd() As String
Get
Return ResourceManager.GetString("adasdasd", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
@@ -375,15 +393,6 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die ähnelt.
'''</summary>
Friend ReadOnly Property jjjiioioolokoik() As String
Get
Return ResourceManager.GetString("jjjiioioolokoik", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
@@ -644,7 +653,7 @@ Namespace My.Resources
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die 1.8.8 ähnelt.
''' Sucht eine lokalisierte Zeichenfolge, die 1.9.1 ähnelt.
'''</summary>
Friend ReadOnly Property Version() As String
Get

View File

@@ -188,7 +188,7 @@
<value>Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;</value>
</data>
<data name="Version" xml:space="preserve">
<value>1.8.8</value>
<value>1.9.1</value>
</data>
<data name="del" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -298,7 +298,10 @@
<data name="gear" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\gear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="jjjiioioolokoik" xml:space="preserve">
<data name="adasasd23asdasdasd" xml:space="preserve">
<value />
</data>
<data name="adasdasd" xml:space="preserve">
<value />
</data>
</root>

View File

@@ -1512,8 +1512,8 @@ Public Class cMitarbeiter
'Änderung
Dim sql = "INSERT INTO tblMitarbeiter " &
"(mit_username, mit_pwd, mit_geschlecht, mit_affix, mit_vname, mit_nname, mit_gebdat, mit_strasse,mit_hausnr,mit_land,mit_plz,mit_ort,mit_niederlassung, mit_abteilung, mit_position, mit_durchwahl, mit_email, mit_mobiltel, mit_allowAnruf,mit_info, mit_einstiegsdatum, mit_gekuendigt, mit_kuendigungsdatum, mit_foto,mit_firma,mit_firmaFMZoll,mit_FMZollPersID,mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch,mit_standartFiliale,mit_DpUserStandardDP,mit_EZOLL_SB,mit_ATLAS_SB,mit_FirmenDatenAnzeige,mit_DAKOSY_SB,mit_DAKOSY_SBFull,mit_DpUserStandardFirma,mit_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username,mit_teamId) VALUES " &
"(@mit_username,@mit_pwd,@mit_geschlecht,@mit_affix,@mit_vname,@mit_nname,@mit_gebdat,@mit_strasse,@mit_hausnr,@mit_land,@mit_plz,@mit_ort,@mit_niederlassung,@mit_abteilung,@mit_position,@mit_durchwahl,@mit_email,@mit_mobiltel,@mit_allowAnruf,@mit_info,@mit_einstiegsdatum,@mit_gekuendigt,@mit_kuendigungsdatum,@mit_foto,@mit_firma,@mit_firmaFMZoll,@mit_FMZollPersID,@mit_FMZollPersIDKasseIsnotSpedBuch,@mit_FMZollPersIDSpedBuch,@mit_standartFiliale,@mit_DpUserStandardDP,@mit_EZOLL_SB,@mit_ATLAS_SB,@mit_FirmenDatenAnzeige,@mit_DAKOSY_SB,@mit_DAKOSY_SBFull,@mit_DpUserStandardFirma,@mit_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username,@mit_teamId)"
"(mit_username, mit_pwd, mit_geschlecht, mit_affix, mit_vname, mit_nname, mit_gebdat, mit_strasse,mit_hausnr,mit_land,mit_plz,mit_ort,mit_niederlassung, mit_abteilung, mit_position, mit_durchwahl, mit_email, mit_mobiltel, mit_allowAnruf,mit_info, mit_einstiegsdatum, mit_gekuendigt, mit_kuendigungsdatum, mit_foto,mit_firma,mit_firmaFMZoll,mit_FMZollPersID,mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch,mit_standartFiliale,mit_DpUserStandardDP,mit_EZOLL_SB,mit_ATLAS_SB,mit_FirmenDatenAnzeige,mit_DAKOSY_SB,mit_DAKOSY_SBFull,mit_DpUserStandardFirma,mit_DpUserStandardFirma2,mit_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username,mit_teamId) VALUES " &
"(@mit_username,@mit_pwd,@mit_geschlecht,@mit_affix,@mit_vname,@mit_nname,@mit_gebdat,@mit_strasse,@mit_hausnr,@mit_land,@mit_plz,@mit_ort,@mit_niederlassung,@mit_abteilung,@mit_position,@mit_durchwahl,@mit_email,@mit_mobiltel,@mit_allowAnruf,@mit_info,@mit_einstiegsdatum,@mit_gekuendigt,@mit_kuendigungsdatum,@mit_foto,@mit_firma,@mit_firmaFMZoll,@mit_FMZollPersID,@mit_FMZollPersIDKasseIsnotSpedBuch,@mit_FMZollPersIDSpedBuch,@mit_standartFiliale,@mit_DpUserStandardDP,@mit_EZOLL_SB,@mit_ATLAS_SB,@mit_FirmenDatenAnzeige,@mit_DAKOSY_SB,@mit_DAKOSY_SBFull,@mit_DpUserStandardFirma,@mit_DpUserStandardFirma2,@mit_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username,@mit_teamId)"
Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
Using cmd As New SqlCommand(sql, conn)
@@ -1543,6 +1543,7 @@ Public Class cMitarbeiter
cmd.Parameters.AddWithValue("@mit_standartFiliale", m.mit_standartFiliale)
cmd.Parameters.AddWithValue("@mit_DpUserStandardDP", m.mit_DpUserStandardDP)
cmd.Parameters.AddWithValue("@mit_DpUserStandardFirma", m.mit_DpUserStandardFirma)
cmd.Parameters.AddWithValue("@mit_DpUserStandardFirma2", m.mit_DpUserStandardFirma2)
cmd.Parameters.AddWithValue("@mit_info", m.mit_info)
If m.mit_einstiegsdatum <> "" Then cmd.Parameters.AddWithValue("@mit_einstiegsdatum", m.mit_einstiegsdatum) Else cmd.Parameters.AddWithValue("@mit_einstiegsdatum", DBNull.Value)
cmd.Parameters.AddWithValue("@mit_gekuendigt", m.mit_gekuendigt)
@@ -1578,7 +1579,7 @@ Public Class cMitarbeiter
Dim hAuswahl As String = ""
Dim sql = "UPDATE tblMitarbeiter " &
"SET mit_username=@mit_username, mit_pwd=@mit_pwd, mit_geschlecht=@mit_geschlecht, mit_affix=@mit_affix, mit_vname=@mit_vname, mit_nname=@mit_nname, mit_gebdat=@mit_gebdat, mit_strasse=@mit_strasse, mit_hausnr=@mit_hausnr, mit_land=@mit_land, mit_plz=@mit_plz, mit_ort=@mit_ort, mit_niederlassung=@mit_niederlassung, mit_abteilung=@mit_abteilung, mit_position=@mit_position, mit_durchwahl=@mit_durchwahl, mit_email=@mit_email, mit_mobiltel=@mit_mobiltel, mit_allowAnruf=@mit_allowAnruf, mit_info=@mit_info, mit_einstiegsdatum=@mit_einstiegsdatum, mit_gekuendigt=@mit_gekuendigt, mit_kuendigungsdatum=@mit_kuendigungsdatum, mit_foto=@mit_foto, mit_firma=@mit_firma,mit_firmaFMZoll=@mit_firmaFMZoll,mit_FMZollPersID=@mit_FMZollPersID, mit_FMZollPersIDKasseIsnotSpedBuch=@mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch=@mit_FMZollPersIDSpedBuch,mit_standartFiliale=@mit_standartFiliale,mit_standardPreisliste=@mit_standardPreisliste,mit_DpUserStandardDP=@mit_DpUserStandardDP, mit_EZOLL_SB=@mit_EZOLL_SB, mit_ATLAS_SB=@mit_ATLAS_SB,mit_FirmenDatenAnzeige=@mit_FirmenDatenAnzeige,mit_DAKOSY_SB=@mit_DAKOSY_SB, mit_DAKOSY_SBFull=@mit_DAKOSY_SBFull ,mit_DpUserStandardFirma=@mit_DpUserStandardFirma, mit_TESTonly=@mit_TESTonly,mit_PasswortChanged=@mit_PasswortChanged,mit_TELOTEC_SB=@mit_TELOTEC_SB,mit_AliasAD_Domain=@mit_AliasAD_Domain,mit_AliasAD_Username=@mit_AliasAD_Username,mit_teamId=@mit_teamId " &
"SET mit_username=@mit_username, mit_pwd=@mit_pwd, mit_geschlecht=@mit_geschlecht, mit_affix=@mit_affix, mit_vname=@mit_vname, mit_nname=@mit_nname, mit_gebdat=@mit_gebdat, mit_strasse=@mit_strasse, mit_hausnr=@mit_hausnr, mit_land=@mit_land, mit_plz=@mit_plz, mit_ort=@mit_ort, mit_niederlassung=@mit_niederlassung, mit_abteilung=@mit_abteilung, mit_position=@mit_position, mit_durchwahl=@mit_durchwahl, mit_email=@mit_email, mit_mobiltel=@mit_mobiltel, mit_allowAnruf=@mit_allowAnruf, mit_info=@mit_info, mit_einstiegsdatum=@mit_einstiegsdatum, mit_gekuendigt=@mit_gekuendigt, mit_kuendigungsdatum=@mit_kuendigungsdatum, mit_foto=@mit_foto, mit_firma=@mit_firma,mit_firmaFMZoll=@mit_firmaFMZoll,mit_FMZollPersID=@mit_FMZollPersID, mit_FMZollPersIDKasseIsnotSpedBuch=@mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch=@mit_FMZollPersIDSpedBuch,mit_standartFiliale=@mit_standartFiliale,mit_standardPreisliste=@mit_standardPreisliste,mit_DpUserStandardDP=@mit_DpUserStandardDP, mit_EZOLL_SB=@mit_EZOLL_SB, mit_ATLAS_SB=@mit_ATLAS_SB,mit_FirmenDatenAnzeige=@mit_FirmenDatenAnzeige,mit_DAKOSY_SB=@mit_DAKOSY_SB, mit_DAKOSY_SBFull=@mit_DAKOSY_SBFull ,mit_DpUserStandardFirma=@mit_DpUserStandardFirma,mit_DpUserStandardFirma2=@mit_DpUserStandardFirma2, mit_TESTonly=@mit_TESTonly,mit_PasswortChanged=@mit_PasswortChanged,mit_TELOTEC_SB=@mit_TELOTEC_SB,mit_AliasAD_Domain=@mit_AliasAD_Domain,mit_AliasAD_Username=@mit_AliasAD_Username,mit_teamId=@mit_teamId " &
" WHERE mit_id=@mit_id "
@@ -1611,6 +1612,7 @@ Public Class cMitarbeiter
cmd.Parameters.AddWithValue("@mit_standardPreisliste", m.mit_standardPreisliste)
cmd.Parameters.AddWithValue("@mit_DpUserStandardDP", m.mit_DpUserStandardDP)
cmd.Parameters.AddWithValue("@mit_DpUserStandardFirma", m.mit_DpUserStandardFirma)
cmd.Parameters.AddWithValue("@mit_DpUserStandardFirma2", m.mit_DpUserStandardFirma2)
cmd.Parameters.AddWithValue("@mit_info", m.mit_info)
If m.mit_einstiegsdatum <> "" Then cmd.Parameters.AddWithValue("@mit_einstiegsdatum", m.mit_einstiegsdatum) Else cmd.Parameters.AddWithValue("@mit_einstiegsdatum", DBNull.Value)
@@ -2912,12 +2914,12 @@ Public Class cDienstplan
End Function
Public Function updateEintraegeDetails_Benuterdef(dedet_id, dedet_bezeichnungDP, dedet_ProzentGrafik, dedet_bezeichnungExcel, dedet_bezeichnungExcel2, dedet_bezeichnungExcel3, dedet_ZeilenExcel, dedet_benutzerdefinierteSchicht, dedet_stdWieArbeitszeit, dedet_reihenfolge, dedet_TagesWechsel, dedet_WechselZuSchicht, dedet_HotKey, dedet_bgAlternativeFarbe, dedet_ExcelBgFarbe, dedet_bezLeiter, dedet_ExcelMonatFarbe, dedet_ExcelMonatBezeichnung) As Boolean
Public Function updateEintraegeDetails_Benuterdef(dedet_id, dedet_bezeichnungDP, dedet_ProzentGrafik, dedet_bezeichnungExcel, dedet_bezeichnungExcel2, dedet_bezeichnungExcel3, dedet_ZeilenExcel, dedet_benutzerdefinierteSchicht, dedet_stdWieArbeitszeit, dedet_reihenfolge, dedet_TagesWechsel, dedet_WechselZuSchicht, dedet_HotKey, dedet_bgAlternativeFarbe, dedet_ExcelBgFarbe, dedet_bezLeiter, dedet_ExcelMonatFarbe, dedet_ExcelMonatBezeichnung, dedet_aktiv) As Boolean
Dim hAuswahl As String = ""
Dim sql As String = "UPDATE tblDienstplanEintraegeDetails " &
"SET dedet_bezeichnungDP=@dedet_bezeichnungDP,dedet_ProzentGrafik=@dedet_ProzentGrafik,dedet_bezeichnungExcel=@dedet_bezeichnungExcel,dedet_bezeichnungExcel2=@dedet_bezeichnungExcel2,dedet_bezeichnungExcel3=@dedet_bezeichnungExcel3,dedet_ZeilenExcel=@dedet_ZeilenExcel,dedet_benutzerdefinierteSchicht=@dedet_benutzerdefinierteSchicht,dedet_stdWieArbeitszeit=@dedet_stdWieArbeitszeit, " &
" dedet_reihenfolge=@dedet_reihenfolge,dedet_TagesWechsel=@dedet_TagesWechsel,dedet_WechselZuSchicht=@dedet_WechselZuSchicht,dedet_HotKey=@dedet_HotKey ,dedet_bgAlternativeFarbe=@dedet_bgAlternativeFarbe, dedet_ExcelBgFarbe=@dedet_ExcelBgFarbe,dedet_bezLeiter=@dedet_bezLeiter,dedet_ExcelMonatFarbe=@dedet_ExcelMonatFarbe,dedet_ExcelMonatBezeichnung=@dedet_ExcelMonatBezeichnung" &
" dedet_reihenfolge=@dedet_reihenfolge,dedet_TagesWechsel=@dedet_TagesWechsel,dedet_WechselZuSchicht=@dedet_WechselZuSchicht,dedet_HotKey=@dedet_HotKey ,dedet_bgAlternativeFarbe=@dedet_bgAlternativeFarbe, dedet_ExcelBgFarbe=@dedet_ExcelBgFarbe,dedet_bezLeiter=@dedet_bezLeiter,dedet_ExcelMonatFarbe=@dedet_ExcelMonatFarbe,dedet_ExcelMonatBezeichnung=@dedet_ExcelMonatBezeichnung,dedet_aktiv=@dedet_aktiv " &
" WHERE dedet_id=@dedet_id "
@@ -2945,6 +2947,7 @@ Public Class cDienstplan
cmd.Parameters.AddWithValue("@dedet_bezLeiter", dedet_bezLeiter)
cmd.Parameters.AddWithValue("@dedet_ExcelMonatFarbe", dedet_ExcelMonatFarbe)
cmd.Parameters.AddWithValue("@dedet_ExcelMonatBezeichnung", dedet_ExcelMonatBezeichnung)
cmd.Parameters.AddWithValue("@dedet_aktiv", dedet_aktiv)
Try
cmd.ExecuteNonQuery()

File diff suppressed because it is too large Load Diff

View File

@@ -26,7 +26,7 @@ Public Class cWorker_NCTS
outputFile.Close()
Dim AnsprechpTMP_Email = ""
Dim DETUDC As DAKOSY_Worker.DETUDC.DETUDC = DAKOSY_Worker.DETUDC.DETUDC.LoadFromFile(p)
' Dim NCTS As New DAKOSY_Worker.cDakosyNCTS
@@ -162,26 +162,32 @@ Public Class cWorker_NCTS
End If
End If
If DETUDC.ProcedureOwner.ContactPerson.MailAddress IsNot Nothing Then
Dim AnsprechpTMP_Email = DETUDC.ProcedureOwner.ContactPerson.MailAddress
If AnsprechpTMP_Email.Contains("@imex") Then
NCTS.ncts_firma = "IMEX"
NCTS.ncts_niederlassung = "IMEX"
'GLOBAL--> EORI
ElseIf AnsprechpTMP_Email.Contains("@ambar") Then
NCTS.ncts_firma = "AMBAR"
NCTS.ncts_niederlassung = "AMBAR"
ElseIf AnsprechpTMP_Email.Contains("atilla@verag.ag") Or AnsprechpTMP_Email.Contains("@atilla") Then
NCTS.ncts_firma = "ATILLA"
NCTS.ncts_niederlassung = "SUB"
ElseIf AnsprechpTMP_Email.Contains("@durmaz") Then
NCTS.ncts_firma = "DURMAZ"
NCTS.ncts_niederlassung = "SBG"
'GLOBAL--> EORI
ElseIf AnsprechpTMP_Email.Contains("@verag") Then
NCTS.ncts_firma = "VERAG"
' EZA.eza_niederlassung = "IMEX"
'GLOBAL--> EORI
End If
AnsprechpTMP_Email = DETUDC.ProcedureOwner.ContactPerson.MailAddress
'If AnsprechpTMP_Email.Contains("@imex") Then
' NCTS.ncts_firma = "IMEX"
' NCTS.ncts_niederlassung = "IMEX"
' 'GLOBAL--> EORI
'ElseIf AnsprechpTMP_Email.Contains("@ambar") Then
' NCTS.ncts_firma = "AMBAR"
' NCTS.ncts_niederlassung = "AMBAR"
'ElseIf AnsprechpTMP_Email.Contains("atilla@verag.ag") Or AnsprechpTMP_Email.Contains("@atilla") Then
' NCTS.ncts_firma = "ATILLA"
' NCTS.ncts_niederlassung = "SUB"
'ElseIf AnsprechpTMP_Email.Contains("@durmaz") Then
' NCTS.ncts_firma = "DURMAZ"
' NCTS.ncts_niederlassung = "SBG"
' 'GLOBAL--> EORI
'ElseIf AnsprechpTMP_Email.Contains("@verag") Then
' NCTS.ncts_firma = "VERAG"
' ' EZA.eza_niederlassung = "IMEX"
' 'GLOBAL--> EORI
'ElseIf AnsprechpTMP_Email.Contains("@unisped") Then
' NCTS.ncts_firma = "UNISPED"
' NCTS.ncts_niederlassung = "ATSP"
' 'GLOBAL--> EORI
'End If
End If
End If
End If
@@ -371,6 +377,8 @@ Public Class cWorker_NCTS
End If
End If
frmDYNachrichtenVerarbeitung.tryGetFirmaNiederlassung(NCTS.ncts_firma, NCTS.ncts_niederlassung, If(AnsprechpTMP_Email, "").ToString, readNCTS_VersandanmeldungXML)
If If(NCTS.ncts_Status, 0) <= 5 Then NCTS.ncts_Status = DAKOSY_Worker.cDY_Statusliste.S_05
' If If(NCTS.ncts_Status_KEWILL_Equivalent, 0) <= 5 Then NCTS.ncts_Status_KEWILL_Equivalent = DAKOSY_Worker.cDY_Statusliste.S_05
NCTS.ncts_Status_KEWILL_Equivalent = NCTS.ncts_Status
@@ -842,29 +850,34 @@ Public Class cWorker_NCTS
For Each l In lines
If l.StartsWith("COM+") Then
If l.Contains("@imex") Then
NCTS.ncts_firma = "IMEX"
NCTS.ncts_niederlassung = "IMEX"
'GLOBAL--> EORI
ElseIf l.Contains("@ambar") Then
NCTS.ncts_firma = "AMBAR"
NCTS.ncts_niederlassung = "AMBAR"
frmDYNachrichtenVerarbeitung.tryGetFirmaNiederlassung(NCTS.ncts_firma, NCTS.ncts_niederlassung, l, "")
ElseIf l.Contains("atilla@verag.ag") Or l.Contains("@atilla") Then
NCTS.ncts_firma = "ATILLA"
NCTS.ncts_niederlassung = "SUB"
ElseIf l.Contains("@durmaz") Then
NCTS.ncts_firma = "DURMAZ"
NCTS.ncts_niederlassung = "SBG"
'If l.Contains("@imex") Then
' NCTS.ncts_firma = "IMEX"
' NCTS.ncts_niederlassung = "IMEX"
' 'GLOBAL--> EORI
'ElseIf l.Contains("@ambar") Then
' NCTS.ncts_firma = "AMBAR"
' NCTS.ncts_niederlassung = "AMBAR"
'ElseIf l.Contains("atilla@verag.ag") Or l.Contains("@atilla") Then
' NCTS.ncts_firma = "ATILLA"
' NCTS.ncts_niederlassung = "SUB"
'ElseIf l.Contains("@durmaz") Then
' NCTS.ncts_firma = "DURMAZ"
' NCTS.ncts_niederlassung = "SBG"
'GLOBAL--> EORI
ElseIf l.Contains("@verag") Then
NCTS.ncts_firma = "VERAG"
' EZA.eza_niederlassung = "IMEX"
'GLOBAL--> EORI
' 'GLOBAL--> EORI
'ElseIf l.Contains("@verag") Then
' NCTS.ncts_firma = "VERAG"
' ' EZA.eza_niederlassung = "IMEX"
' 'GLOBAL--> EORI
End If
'ElseIf l.Contains("@unisped") Then
' NCTS.ncts_firma = "UNISPED"
' NCTS.ncts_niederlassung = "ATSP"
'End If
End If
Next
@@ -944,28 +957,35 @@ Public Class cWorker_NCTS
If DETBAE.AuthorisedConsignee.ContactPerson.MailAddress IsNot Nothing Then
AnsprechpTMP_Email = DETBAE.AuthorisedConsignee.ContactPerson.MailAddress
If AnsprechpTMP_Email.Contains("@imex") Then
NCTS.ncts_firma = "IMEX"
NCTS.ncts_niederlassung = "IMEX"
'GLOBAL--> EORI
ElseIf AnsprechpTMP_Email.Contains("@ambar") Then
NCTS.ncts_firma = "AMBAR"
NCTS.ncts_niederlassung = "AMBAR"
ElseIf AnsprechpTMP_Email.Contains("atilla@verag.ag") Or AnsprechpTMP_Email.Contains("@atilla") Then
NCTS.ncts_firma = "ATILLA"
NCTS.ncts_niederlassung = "SUB"
ElseIf AnsprechpTMP_Email.Contains("@durmaz") Then
NCTS.ncts_firma = "DURMAZ"
NCTS.ncts_niederlassung = "SBG"
'GLOBAL--> EORI
ElseIf AnsprechpTMP_Email.Contains("@verag") Then
NCTS.ncts_firma = "VERAG"
' EZA.eza_niederlassung = "IMEX"
'GLOBAL--> EORI
End If
'If AnsprechpTMP_Email.Contains("@imex") Then
' NCTS.ncts_firma = "IMEX"
' NCTS.ncts_niederlassung = "IMEX"
' 'GLOBAL--> EORI
'ElseIf AnsprechpTMP_Email.Contains("@ambar") Then
' NCTS.ncts_firma = "AMBAR"
' NCTS.ncts_niederlassung = "AMBAR"
'ElseIf AnsprechpTMP_Email.Contains("atilla@verag.ag") Or AnsprechpTMP_Email.Contains("@atilla") Then
' NCTS.ncts_firma = "ATILLA"
' NCTS.ncts_niederlassung = "SUB"
'ElseIf AnsprechpTMP_Email.Contains("@durmaz") Then
' NCTS.ncts_firma = "DURMAZ"
' NCTS.ncts_niederlassung = "SBG"
' 'GLOBAL--> EORI
'ElseIf AnsprechpTMP_Email.Contains("@verag") Then
' NCTS.ncts_firma = "VERAG"
' ' EZA.eza_niederlassung = "IMEX"
'ElseIf AnsprechpTMP_Email.Contains("@unisped") Then
' NCTS.ncts_firma = "UNISPED"
' NCTS.ncts_niederlassung = "ATSP"
' 'GLOBAL--> EORIAnsprechpTMP_Email
'End If
End If
frmDYNachrichtenVerarbeitung.tryGetFirmaNiederlassung(NCTS.ncts_firma, NCTS.ncts_niederlassung, If(AnsprechpTMP_Email, "").ToString, "")
Else
Return "" 'Keine Bezugsnummer
'Return "" 'Keine Bezugsnummer
End If
End If
@@ -1220,20 +1240,21 @@ Public Class cWorker_NCTS
NCTS_TMP.ncts_Status_KEWILL_Equivalent = DY_TMP.dy_Status 'weil der Status bereit überprüft wurde --> neuste TransaktionsID
End If
'NCTS_TMP.ncts_Status_KEWILL_Equivalent = STATUS.dySt_status
If ANR <> "" Then NCTS_TMP.ncts_ANR = ANR
If MRN <> "" Then NCTS_TMP.ncts_MRN = MRN
If ANR <> "" Or MRN <> "" Then
If ANR <> "" Then NCTS_TMP.ncts_ANR = ANR
If MRN <> "" Then NCTS_TMP.ncts_MRN = MRN
End If
NCTS_TMP.SAVE()
'Eintragen
Else
'Update
NCTS_TMP.UPDATE_Status(DY_TMP.dy_Status) 'weil der Status bereit überprüft wurde --> neuste TransaktionsID
If ANR <> "" Then NCTS_TMP.ncts_ANR = ANR : NCTS_TMP.SAVE()
If MRN <> "" Then NCTS_TMP.ncts_MRN = MRN : NCTS_TMP.SAVE()
If ANR <> "" Or MRN <> "" Then
If ANR <> "" Then NCTS_TMP.ncts_ANR = ANR : NCTS_TMP.SAVE()
If MRN <> "" Then NCTS_TMP.ncts_MRN = MRN : NCTS_TMP.SAVE()
End If
End If
saveDY_NCTS = NCTS_TMP
saveDY_NCTS = NCTS_TMP
End Function
Shared Sub SaveNCTS_FirmaNL(ByRef NCTS_TMP As DAKOSY_Worker.cDakosyNCTSOut, DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen, division As String)
@@ -1271,6 +1292,9 @@ Public Class cWorker_NCTS
Case "NEU"
NCTS_TMP.ncts_firma = "VERAG"
NCTS_TMP.ncts_niederlassung = "NEU"
Case "ATSP", "ATSPED"
NCTS_TMP.ncts_firma = "UNISPED"
NCTS_TMP.ncts_niederlassung = "ATSP"
End Select
NCTS_TMP.SAVE()
End If
@@ -1388,11 +1412,11 @@ Public Class cWorker_NCTS
'UNBEKANNT ?????
End Select
STATUS.dySt_ergCode = "DY_" & status_DY
STATUS.dySt_ergMitteilung = grund
STATUS.dySt_ergMitteilung = MRN & grund
If tstmp IsNot Nothing Then STATUS.dySt_ergZeitpunkt = tstmp
'EINTRAG IN tblDakosy_Zollanmeldungen
Dim DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen = FORM.saveDY_ZA(STATUS, NCTS.Transaktion.IOReferenz, STATUS.dySt_ergZeitpunkt, "NCTS")
Dim NCTS_TMP As DAKOSY_Worker.cDakosyNCTSOut = saveDY_NCTS(STATUS, DY_TMP, NCTS.Transaktion.IOReferenz, STATUS.dySt_ergZeitpunkt, , MRN)
Dim DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen = FORM.saveDY_ZA(STATUS, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, "NCTS")
Dim NCTS_TMP As DAKOSY_Worker.cDakosyNCTSOut = saveDY_NCTS(STATUS, DY_TMP, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, , "") 'MRN)
SaveNCTS_FirmaNL(NCTS_TMP, DY_TMP, division)
@@ -1895,7 +1919,8 @@ Public Class cWorker_NCTS
STATUS.dySt_status = DAKOSY_Worker.cDY_Statusliste.S_53
STATUS.dySt_ergCode = "TSTMP"
STATUS.dySt_ergMitteilung = ""
STATUS.dySt_ergMitteilung = MRN
' STATUS.dySt_ergMitteilung = ""
If tstmp IsNot Nothing Then STATUS.dySt_ergZeitpunkt = tstmp
'EINTRAG IN tblDakosy_Zollanmeldungen
Dim DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen = FORM.saveDY_ZA(STATUS, NCTS.Transaktion.IOReferenz, If(tstmp, NCTS.Transaktion.IODatumZeit), "NCTS")

View File

@@ -36,6 +36,7 @@ Public Class frmDYNachrichtenVerarbeitung
End Sub
Sub initPfade()
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "" Then VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG"
Me.VERARBEITUNGS_PFAD = DAKOSY_Worker.cDY_Paramter.GET_PARAM_ByName("VERARBEITUNGS_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
'"\\192.168.0.91\Datenarchiv\DAKOSY\TESTSYSTEM\Nachrichtendaten_Einarbeitung\"
Me.ZIEL_PFAD = DAKOSY_Worker.cDY_Paramter.GET_PARAM_ByName("ZIEL_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
@@ -99,7 +100,7 @@ Public Class frmDYNachrichtenVerarbeitung
Dim DY_port = ""
Dim DY_PFAD_out = ""
DAKOSY_Worker.cDakosyFunftions.getSFTPLoginData(DY_server, DY_name, DY_pwd, DY_port, "", DY_PFAD_out)
DAKOSY_Worker.cDakosyFunftions.getSFTPLoginData(DY_server, DY_name, DY_pwd, DY_port, "", DY_PFAD_out, "")
Dim ConnectionInfo As New ConnectionInfo(DY_server, DY_port, DY_name, New PasswordAuthenticationMethod(DY_name, DY_pwd))
@@ -107,8 +108,7 @@ Public Class frmDYNachrichtenVerarbeitung
client.Connect()
For Each f In client.ListDirectory(DY_PFAD_out)
' MsgBox(f.Name)
If Not f.Name.StartsWith(".") Then
If Not f.Name.StartsWith(".") And Not f.IsDirectory Then
'Temp. DownloadPfad
Dim destFilenameTMP = VERARBEITUNGS_PFAD + "." & If(IO.File.Exists(VERARBEITUNGS_PFAD & "." & f.Name), Now.ToString("yyMMdd_HHmmss.fff_"), "") & f.Name
@@ -2794,7 +2794,10 @@ Public Class frmDYNachrichtenVerarbeitung
If TMP.DutyDefermentApplicant IsNot Nothing AndAlso TMP.DutyDefermentApplicant.Identification IsNot Nothing Then
AUFSCHUB.ezaAfb_AufschubnehmerEORI = TMP.DutyDefermentApplicant.Identification.ReferenceNumber
End If
AUFSCHUB.ezaAfb_AufschuBIN = TMP.AuthorisationNumber
AUFSCHUB.ezaAfb_HZA = TMP.AccountPrefix
AUFSCHUB.ezaAfb_KontoNr = TMP.AccountNumber
AUFSCHUB.ezaAfb_Aufschubart = TMP.Type
AUFSCHUB.ezaAfb_ArtAufschubantrag = TMP.ApplicationType
@@ -3603,27 +3606,35 @@ Public Class frmDYNachrichtenVerarbeitung
' ###################################################
If If(EZA.eza_AnmeldenderBearbeiterEMail, "").ToString.Contains("@imex") Then
EZA.eza_firma = "IMEX"
EZA.eza_niederlassung = "IMEX"
'GLOBAL--> EORI
ElseIf If(EZA.eza_AnmeldenderBearbeiterEMail, "").ToString.Contains("@ambar") Then
EZA.eza_firma = "AMBAR"
EZA.eza_niederlassung = "AMBAR"
'GLOBAL--> EORI
ElseIf If(EZA.eza_AnmeldenderBearbeiterEMail, "").ToString.Contains("atilla@verag.ag") Or If(EZA.eza_AnmeldenderBearbeiterEMail, "").ToString.Contains("@atilla") Then
EZA.eza_firma = "ATILLA"
EZA.eza_niederlassung = "SUB"
'GLOBAL--> EORI
ElseIf If(EZA.eza_AnmeldenderBearbeiterEMail, "").ToString.Contains("@durmaz") Then
EZA.eza_firma = "DURMAZ"
EZA.eza_niederlassung = "SBG"
'GLOBAL--> EORI
ElseIf If(EZA.eza_AnmeldenderBearbeiterEMail, "").ToString.Contains("@verag") Then
EZA.eza_firma = "VERAG"
' EZA.eza_niederlassung = "IMEX"
'GLOBAL--> EORI
End If
'If If(EZA.eza_AnmeldenderBearbeiterEMail, "").ToString.Contains("@imex") Then
' EZA.eza_firma = "IMEX"
' EZA.eza_niederlassung = "IMEX"
' 'GLOBAL--> EORI
'ElseIf If(EZA.eza_AnmeldenderBearbeiterEMail, "").ToString.Contains("@ambar") Then
' EZA.eza_firma = "AMBAR"
' EZA.eza_niederlassung = "AMBAR"
' 'GLOBAL--> EORI
'ElseIf If(EZA.eza_AnmeldenderBearbeiterEMail, "").ToString.Contains("atilla@verag.ag") Or If(EZA.eza_AnmeldenderBearbeiterEMail, "").ToString.Contains("@atilla") Then
' EZA.eza_firma = "ATILLA"
' EZA.eza_niederlassung = "SUB"
' 'GLOBAL--> EORI
'ElseIf If(EZA.eza_AnmeldenderBearbeiterEMail, "").ToString.Contains("@durmaz") Then
' EZA.eza_firma = "DURMAZ"
' EZA.eza_niederlassung = "SBG"
' 'GLOBAL--> EORI
'ElseIf If(EZA.eza_AnmeldenderBearbeiterEMail, "").ToString.Contains("@verag") Then
' EZA.eza_firma = "VERAG"
' ' EZA.eza_niederlassung = "IMEX"
' 'GLOBAL--> EORI
'ElseIf If(EZA.eza_AnmeldenderBearbeiterEMail, "").ToString.Contains("@unisped") Then
' EZA.eza_firma = "UNISPED"
' EZA.eza_niederlassung = "ATSP"
'End If
tryGetFirmaNiederlassung(EZA.eza_firma, EZA.eza_niederlassung, (EZA.eza_AnmeldenderBearbeiterEMail, "").ToString, bezugsNr)
End If
@@ -3645,6 +3656,63 @@ Public Class frmDYNachrichtenVerarbeitung
End Function
Public Shared Sub tryGetFirmaNiederlassung(ByRef firma As String, ByRef niederlassung As String, Mail As String, BezugsNr As String)
If Mail.Contains("@imex") Then
firma = "IMEX"
niederlassung = "IMEX"
ElseIf Mail.Contains("@ambar") Then
firma = "AMBAR"
niederlassung = "AMBAR"
ElseIf Mail.Contains("atilla@verag.ag") Or Mail.Contains("@atilla") Then
firma = "ATILLA"
niederlassung = "SUB"
ElseIf Mail.Contains("@durmaz") Then
firma = "DURMAZ"
niederlassung = "SBG"
ElseIf Mail.Contains("@verag") Then
firma = "VERAG"
ElseIf Mail.Contains("@unisped") Then
firma = "UNISPED"
niederlassung = "ATSP"
End If
If firma = "" Then
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA 'Gehrt nur bei UNSPED
Case "UNISPED"
firma = "UNISPED"
niederlassung = "ATSP"
End Select
End If
If firma = "" Then
If BezugsNr <> "" And BezugsNr.Length > 4 Then
Select Case BezugsNr.Substring(0, 4)
Case "5501"
firma = "IMEX"
'niederlassung = "IMEX"
Case "5701"
firma = "AMBAR"
niederlassung = "AMBAR"
Case "4801"
firma = "ATILLA"
niederlassung = "SUB"
'Case "4801"
' firma = "DURMAZ"
' niederlassung = "SBG"
Case "4803", "5003", "5103", "5303", "4805", "4811"
firma = "VERAG"
Case "4801"
firma = "UNISPED"
niederlassung = "ATSP"
End Select
End If
End If
End Sub
Function getEZAAresseFromLine(AdressTMP, typ) As DAKOSY_Worker.cDakosy_EZA_Adressen
Dim ADR As New DAKOSY_Worker.cDakosy_EZA_Adressen
ADR.ezaAd_AdressTyp = typ

File diff suppressed because it is too large Load Diff

View File

@@ -262,151 +262,7 @@
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox8.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox7.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox6.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox5.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox4.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox3.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox2.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="picC0008.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
@@ -454,7 +310,151 @@
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="picC0008.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="PictureBox2.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox3.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox4.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox5.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox6.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox7.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox8.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB

View File

@@ -83,6 +83,15 @@ Public Class frmStartOptions
f.Show()
AddHandler f.FormClosed, AddressOf closeMe
Case "DY_EINARBEITUNG_UNISPED"
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED"
Dim f As New frmDYNachrichtenVerarbeitung(True)
Me.Visible = False
f.Show()
AddHandler f.FormClosed, AddressOf closeMe
Case "TC_EINARBEITUNG"
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
Dim f As New frmTCNachrichtenVerarbeitung(True)
@@ -990,12 +999,32 @@ Public Class frmStartOptions
Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click
Dim ok As Boolean = False
Select Case MyComboBox1._value
Case "DY" : ok = cVERAG_Interface.copyFileFTP_VERAGncts_DY_ByBezugsNr(txtVRGOut_BezugsNr.Text)
Case "TC" : ok = cVERAG_Interface.copyFileFTP_VERAGncts_TC_ByBezugsNr(txtVRGOut_BezugsNr.Text)
Case "DHF" : ok = cVERAG_Interface.copyFileFTP_VERAGncts_EZOLL_ByBezugsNr(txtVRGOut_BezugsNr.Text)
Case "DY" : ok = cVERAG_Interface.copyFileFTP_VERAGncts_DY_ByBezugsNr(txtVRGOut_BezugsNr.Text, getISett)
Case "TC" : ok = cVERAG_Interface.copyFileFTP_VERAGncts_TC_ByBezugsNr(txtVRGOut_BezugsNr.Text, getISett)
Case "DHF" : ok = cVERAG_Interface.copyFileFTP_VERAGncts_EZOLL_ByBezugsNr(txtVRGOut_BezugsNr.Text, getISett)
End Select
showPic(ok, PictureBox14)
End Sub
Function getISett ()As cVERAG_Interface_Settings
getISett = New cVERAG_Interface_Settings
getISett.acticeInterface_OREGON = cbxISett_OREGON.Checked
getISett.acticeInterface_TOBB = cbxISett_TOBB.Checked
getISett.acticeInterface_EKOL = cbxISett_EKOL.Checked
getISett.acticeInterface_TEST = cbxISett_TEST.Checked
getISett.acticeInterface_VERAG = cbxISett_VERAG.Checked
getISett.acticeInterface_IMEX = cbxISett_IMEX.Checked
End Function
Private Sub LinkLabel28_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel28.LinkClicked
Me.Visible = False
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED"
Dim f As New frmDYNachrichtenVerarbeitung
f.ShowDialog()
Me.Visible = True
End Sub
End Class