Merge branch 'ADMIN' of https://git.it.verag.ag/edv/ADMIN into ADMIN
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
Imports com.sun.tools.corba.se
|
Imports System.Security.Cryptography
|
||||||
|
Imports com.sun.tools.corba.se
|
||||||
Imports VERAG_PROG_ALLGEMEIN
|
Imports VERAG_PROG_ALLGEMEIN
|
||||||
Public Class cZOLL_IMPORT
|
Public Class cZOLL_IMPORT
|
||||||
Public Aviso As cAviso
|
Public Aviso As cAviso
|
||||||
@@ -350,7 +351,10 @@ Public Class cZOLL_IMPORT
|
|||||||
If tryFindAviso(LRN, SPEDBUCH.AvisoID, SPEDBUCH.SendungID) Then
|
If tryFindAviso(LRN, SPEDBUCH.AvisoID, SPEDBUCH.SendungID) Then
|
||||||
SPEDBUCH_TMP = SPEDBUCH
|
SPEDBUCH_TMP = SPEDBUCH
|
||||||
If filiale <> "" And abfertigungsnummer <> "" Then
|
If filiale <> "" And abfertigungsnummer <> "" Then
|
||||||
If countSpedbuchEntrys(filiale, LRN, art) = 0 Then
|
|
||||||
|
If countSpedbuchEntrys(filiale, LRN, art) = 0 Then 'gibts einen SPED mit BezugsNr ->
|
||||||
|
|
||||||
|
If countSpedbuchEntrys(filiale, abfertigungsnummer, "") = 0 Then 'gibts einen SPED mit Filiale-AbfertiungsNr
|
||||||
|
|
||||||
SPEDBUCH.FilialenNr = filiale
|
SPEDBUCH.FilialenNr = filiale
|
||||||
SPEDBUCH.AbfertigungsNr = abfertigungsnummer
|
SPEDBUCH.AbfertigungsNr = abfertigungsnummer
|
||||||
@@ -389,6 +393,42 @@ Public Class cZOLL_IMPORT
|
|||||||
End If
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
ElseIf art <> "" Then
|
||||||
|
|
||||||
|
Dim SPEDITIONSBUCH_UPDATE As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(filiale, abfertigungsnummer, 0)
|
||||||
|
|
||||||
|
If SPEDITIONSBUCH_UPDATE.hasEntry Then
|
||||||
|
|
||||||
|
If SPEDITIONSBUCH_UPDATE.Zollsystem = "" Then
|
||||||
|
SPEDITIONSBUCH_UPDATE.Zollsystem = "E"
|
||||||
|
End If
|
||||||
|
|
||||||
|
Select Case art
|
||||||
|
Case "NCTS"
|
||||||
|
If SPEDITIONSBUCH_UPDATE.AtlasBezNrNCTS = "" Then
|
||||||
|
SPEDITIONSBUCH_UPDATE.AtlasBezNrNCTS = LRN
|
||||||
|
|
||||||
|
SPEDITIONSBUCH_UPDATE.SAVE()
|
||||||
|
End If
|
||||||
|
|
||||||
|
Case "AES"
|
||||||
|
If SPEDITIONSBUCH_UPDATE.AtlasBezNrAES = "" Then
|
||||||
|
SPEDITIONSBUCH_UPDATE.AtlasBezNrAES = LRN
|
||||||
|
SPEDITIONSBUCH_UPDATE.SAVE()
|
||||||
|
End If
|
||||||
|
|
||||||
|
Case "EZA"
|
||||||
|
If SPEDITIONSBUCH_UPDATE.AtlasBezNrEZA = "" Then
|
||||||
|
SPEDITIONSBUCH_UPDATE.AtlasBezNrEZA = LRN
|
||||||
|
SPEDITIONSBUCH_UPDATE.SAVE()
|
||||||
|
End If
|
||||||
|
|
||||||
|
End Select
|
||||||
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
End If
|
||||||
|
|
||||||
' MsgBox(SQL.getValueTxtBySql("select count(*) FROM [VERAG].[dbo].[Speditionsbuch] where AbfertigungsNr = 18035380", "FMZOLL"))
|
' MsgBox(SQL.getValueTxtBySql("select count(*) FROM [VERAG].[dbo].[Speditionsbuch] where AbfertigungsNr = 18035380", "FMZOLL"))
|
||||||
|
|
||||||
End If
|
End If
|
||||||
@@ -444,8 +484,12 @@ Public Class cZOLL_IMPORT
|
|||||||
Shared Function countSpedbuchEntrys(filiale, bezugsnr, art) As Integer
|
Shared Function countSpedbuchEntrys(filiale, bezugsnr, art) As Integer
|
||||||
If art = "NCTS" Then
|
If art = "NCTS" Then
|
||||||
Return countSpedbuchEntrysNCTS(filiale, bezugsnr)
|
Return countSpedbuchEntrysNCTS(filiale, bezugsnr)
|
||||||
Else
|
ElseIf art = "EZA" Then
|
||||||
Return countSpedbuchEntrysEZA(filiale, bezugsnr)
|
Return countSpedbuchEntrysEZA(filiale, bezugsnr)
|
||||||
|
ElseIf art = "AES" Then
|
||||||
|
Return countSpedbuchEntrysAES(filiale, bezugsnr)
|
||||||
|
Else
|
||||||
|
Return countSpedbuchEntryALL(filiale, bezugsnr)
|
||||||
End If
|
End If
|
||||||
End Function
|
End Function
|
||||||
Shared Function countSpedbuchEntrysNCTS(filiale, ncts) As Integer
|
Shared Function countSpedbuchEntrysNCTS(filiale, ncts) As Integer
|
||||||
@@ -458,6 +502,16 @@ Public Class cZOLL_IMPORT
|
|||||||
Return SQL.getValueTxtBySqlVarList("SELECT isnull(count(*),0) FROM Speditionsbuch WHERE [FilialenNr]='" & filiale & "' AND AtlasBezNrEZA='" & eza & "'", "FMZOLL")
|
Return SQL.getValueTxtBySqlVarList("SELECT isnull(count(*),0) FROM Speditionsbuch WHERE [FilialenNr]='" & filiale & "' AND AtlasBezNrEZA='" & eza & "'", "FMZOLL")
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
|
Shared Function countSpedbuchEntrysAES(filiale, AES) As Integer
|
||||||
|
If If(AES, "") = "" Then Return 0
|
||||||
|
Return SQL.getValueTxtBySqlVarList("SELECT isnull(count(*),0) FROM Speditionsbuch WHERE [FilialenNr]='" & filiale & "' AND AtlasBezNrAES='" & AES & "'", "FMZOLL")
|
||||||
|
End Function
|
||||||
|
|
||||||
|
Shared Function countSpedbuchEntryALL(filiale, bezugsnr) As Integer
|
||||||
|
If If(bezugsnr, "") = "" Then Return 0
|
||||||
|
Return SQL.getValueTxtBySqlVarList("SELECT isnull(count(*),0) FROM Speditionsbuch WHERE [FilialenNr]='" & filiale & "' AND AbfertigungsNr='" & bezugsnr & "'", "FMZOLL")
|
||||||
|
End Function
|
||||||
|
|
||||||
Shared Function getFiliale(ByVal bezugsNr, ByRef filialeBez) As String
|
Shared Function getFiliale(ByVal bezugsNr, ByRef filialeBez) As String
|
||||||
If If(bezugsNr, "").ToString.Length > 4 Then
|
If If(bezugsNr, "").ToString.Length > 4 Then
|
||||||
Select Case bezugsNr.ToString.Substring(0, 4)
|
Select Case bezugsNr.ToString.Substring(0, 4)
|
||||||
@@ -578,9 +632,9 @@ Public Class cZOLL_IMPORT
|
|||||||
SPEDITIONSBUCH.Zollsystem = "E"
|
SPEDITIONSBUCH.Zollsystem = "E"
|
||||||
If EZA_Nr <> "" Then
|
If EZA_Nr <> "" Then
|
||||||
' SPEDITIONSBUCH.AtlasBezNrEZA = EZA_Nr
|
' SPEDITIONSBUCH.AtlasBezNrEZA = EZA_Nr
|
||||||
EZollEZADatenbereitstellung(EZA_Nr)
|
EZollEZADatenbereitstellung(EZA_Nr, False)
|
||||||
ElseIf AES_Nr <> "" Then
|
ElseIf AES_Nr <> "" Then
|
||||||
EZollEZADatenbereitstellung(AES_Nr) ' ????
|
EZollEZADatenbereitstellung(AES_Nr, True) ' ???? Warum wird hier nur auf EF geprüft??? AES ist doch -> AF!!!!
|
||||||
ElseIf NCTS_Nr <> "" Then
|
ElseIf NCTS_Nr <> "" Then
|
||||||
' SPEDITIONSBUCH.AtlasBezNrNCTS = NCTS_Nr
|
' SPEDITIONSBUCH.AtlasBezNrNCTS = NCTS_Nr
|
||||||
EZollNCTSDatenbereitstellung(NCTS_Nr)
|
EZollNCTSDatenbereitstellung(NCTS_Nr)
|
||||||
@@ -1662,14 +1716,18 @@ Public Class cZOLL_IMPORT
|
|||||||
SPEDITIONSBUCH.Bürgschaft = Bürgschaft
|
SPEDITIONSBUCH.Bürgschaft = Bürgschaft
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub EZollEZADatenbereitstellung(EZA_Nr)
|
Private Sub EZollEZADatenbereitstellung(EZA_Nr, isAES)
|
||||||
|
|
||||||
' Dim fNEF = DirectCast(Me.Owner, frmNacherfassungNEU)
|
' Dim fNEF = DirectCast(Me.Owner, frmNacherfassungNEU)
|
||||||
|
|
||||||
|
Dim VorgangID As String = "EF"
|
||||||
|
If isAES Then
|
||||||
|
VorgangID = "AF"
|
||||||
|
End If
|
||||||
|
|
||||||
Dim dEZOLL As DataTable = KDSQL.loadDgvBySql("SELECT LizenzNr, OperatorID, VorgangID, AnmID, GeaendertAm, GeaendertVon, CRN, LRN" &
|
Dim dEZOLL As DataTable = KDSQL.loadDgvBySql("SELECT LizenzNr, OperatorID, VorgangID, AnmID, GeaendertAm, GeaendertVon, CRN, LRN" &
|
||||||
" FROM zsAnmRefs" &
|
" FROM zsAnmRefs" &
|
||||||
" WHERE (VorgangID = 'EF') AND (LRN = '" & EZA_Nr & "')" &
|
" WHERE (VorgangID = '" & VorgangID & "' ) AND (LRN = '" & EZA_Nr & "')" &
|
||||||
" ORDER BY GeaendertAm DESC", EZOLL_SQL)
|
" ORDER BY GeaendertAm DESC", EZOLL_SQL)
|
||||||
If dEZOLL Is Nothing Then notFound = True : Exit Sub
|
If dEZOLL Is Nothing Then notFound = True : Exit Sub
|
||||||
|
|
||||||
|
|||||||
@@ -329,7 +329,7 @@ Public Class cPLOSE_Inv_Data
|
|||||||
order by plose_Dateiname"
|
order by plose_Dateiname"
|
||||||
|
|
||||||
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||||
Dim dtMehrfachImportiert_DT As DataTable = SQL.loadDgvBySql(mehrfachIMportiert_SQL, "FMZOLL")
|
Dim dtMehrfachImportiert_DT As DataTable = SQL.loadDgvBySql(mehrfachIMportiert_SQL, "FMZOLL", 40)
|
||||||
|
|
||||||
|
|
||||||
If dtMehrfachImportiert_DT.Rows.Count > 0 Then
|
If dtMehrfachImportiert_DT.Rows.Count > 0 Then
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
Imports System.Runtime.InteropServices
|
Imports System.Data.SqlClient
|
||||||
Imports System.Data.SqlClient
|
|
||||||
Imports System.IO
|
Imports System.IO
|
||||||
Imports System.Net
|
Imports System.Net
|
||||||
Imports System.Net.Mail
|
Imports System.Net.Mail
|
||||||
|
Imports System.Runtime.InteropServices
|
||||||
Imports ClosedXML.Excel
|
Imports ClosedXML.Excel
|
||||||
Imports com.sun.xml.internal.rngom.digested
|
|
||||||
Imports DAKOSY_Worker
|
Imports DAKOSY_Worker
|
||||||
Imports VERAG_PROG_ALLGEMEIN
|
Imports VERAG_PROG_ALLGEMEIN
|
||||||
|
|
||||||
@@ -58,7 +57,7 @@ Module Mail
|
|||||||
|
|
||||||
' PARAM = "MDM_IT_Verguetung"
|
' PARAM = "MDM_IT_Verguetung"
|
||||||
'PARAM = "JAHRESABRECHNUNG AG-ZS"
|
'PARAM = "JAHRESABRECHNUNG AG-ZS"
|
||||||
' PARAM = "UID_OPS_SYSKA_ABGLEICH"
|
'PARAM = "BRG_AUSWERTUNG_STANDARD"
|
||||||
|
|
||||||
|
|
||||||
'------------------------------------------------------------------------------------
|
'------------------------------------------------------------------------------------
|
||||||
@@ -285,13 +284,17 @@ Module Mail
|
|||||||
|
|
||||||
Dim KdNr As String = "714869"
|
Dim KdNr As String = "714869"
|
||||||
|
|
||||||
If dtParam.Rows.Count = 1 Then
|
If dtParam.Rows.Count > 1 Then
|
||||||
|
|
||||||
System.Console.WriteLine("OPTION erkannt: " & dtParam.Rows(0).Item("ms_info"))
|
For Each r As DataRow In dtParam.Rows
|
||||||
|
|
||||||
|
System.Console.WriteLine("OPTION erkannt: " & r.Item("ms_info"))
|
||||||
System.Console.WriteLine("Auswertung Details gestartet...")
|
System.Console.WriteLine("Auswertung Details gestartet...")
|
||||||
If SendEmail_ZF(dtParam.Rows(0).Item("ms_an"), KdNr, von, bis, "monthly", dtParam.Rows(0).Item("ms_cc"), dtParam.Rows(0).Item("ms_bcc"), dtParam.Rows(0).Item("ms_subject"), dtParam.Rows(0).Item("ms_mailtext")) Then
|
If SendEmail_ZF(r.Item("ms_an"), r.Item("ms_kundenNr"), von, bis, "monthly", r.Item("ms_cc"), r.Item("ms_bcc"), r.Item("ms_subject"), r.Item("ms_mailtext")) Then
|
||||||
System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...")
|
System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...")
|
||||||
End If
|
End If
|
||||||
|
Next
|
||||||
|
|
||||||
|
|
||||||
Else
|
Else
|
||||||
|
|
||||||
@@ -314,13 +317,14 @@ Module Mail
|
|||||||
|
|
||||||
KdNr = "764755"
|
KdNr = "764755"
|
||||||
|
|
||||||
If dtParam.Rows.Count = 1 Then
|
If dtParam.Rows.Count > 1 Then
|
||||||
|
'wurde bereits oben durchgeführt!
|
||||||
|
|
||||||
System.Console.WriteLine("OPTION erkannt: " & dtParam.Rows(0).Item("ms_info"))
|
'System.Console.WriteLine("OPTION erkannt: " & dtParam.Rows(0).Item("ms_info"))
|
||||||
System.Console.WriteLine("Auswertung Details gestartet...")
|
'System.Console.WriteLine("Auswertung Details gestartet...")
|
||||||
If SendEmail_ZF(dtParam.Rows(0).Item("ms_an"), KdNr, von, bis, "monthly", dtParam.Rows(0).Item("ms_cc"), dtParam.Rows(0).Item("ms_bcc"), dtParam.Rows(0).Item("ms_subject"), dtParam.Rows(0).Item("ms_mailtext")) Then
|
'If SendEmail_ZF(dtParam.Rows(0).Item("ms_an"), KdNr, von, bis, "monthly", dtParam.Rows(0).Item("ms_cc"), dtParam.Rows(0).Item("ms_bcc"), dtParam.Rows(0).Item("ms_subject"), dtParam.Rows(0).Item("ms_mailtext")) Then
|
||||||
System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...")
|
' System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...")
|
||||||
End If
|
'End If
|
||||||
|
|
||||||
Else
|
Else
|
||||||
|
|
||||||
@@ -360,7 +364,7 @@ Module Mail
|
|||||||
|
|
||||||
System.Console.WriteLine("OPTION erkannt: " & dtParam.Rows(0).Item("ms_info"))
|
System.Console.WriteLine("OPTION erkannt: " & dtParam.Rows(0).Item("ms_info"))
|
||||||
System.Console.WriteLine("Auswertung Details gestartet...")
|
System.Console.WriteLine("Auswertung Details gestartet...")
|
||||||
If SendEmail_ZF(dtParam.Rows(0).Item("ms_an"), KdNr, von, bis, "quarter", dtParam.Rows(0).Item("ms_cc"), dtParam.Rows(0).Item("ms_bcc"), dtParam.Rows(0).Item("ms_subject"), dtParam.Rows(0).Item("ms_mailtext")) Then
|
If SendEmail_ZF(dtParam.Rows(0).Item("ms_an"), dtParam.Rows(0).Item("ms_kundenNr"), von, bis, "quarter", dtParam.Rows(0).Item("ms_cc"), dtParam.Rows(0).Item("ms_bcc"), dtParam.Rows(0).Item("ms_subject"), dtParam.Rows(0).Item("ms_mailtext")) Then
|
||||||
System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...")
|
System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...")
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
|||||||
9
UID/My Project/Resources.Designer.vb
generated
9
UID/My Project/Resources.Designer.vb
generated
@@ -264,6 +264,15 @@ Namespace My.Resources
|
|||||||
End Get
|
End Get
|
||||||
End Property
|
End Property
|
||||||
|
|
||||||
|
'''<summary>
|
||||||
|
''' Sucht eine lokalisierte Zeichenfolge, die Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; ähnelt.
|
||||||
|
'''</summary>
|
||||||
|
Friend ReadOnly Property connStringFMZOLL_NEW() As String
|
||||||
|
Get
|
||||||
|
Return ResourceManager.GetString("connStringFMZOLL_NEW", resourceCulture)
|
||||||
|
End Get
|
||||||
|
End Property
|
||||||
|
|
||||||
'''<summary>
|
'''<summary>
|
||||||
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||||
'''</summary>
|
'''</summary>
|
||||||
|
|||||||
@@ -322,4 +322,7 @@
|
|||||||
<data name="MDM_IT_Verguetung" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="MDM_IT_Verguetung" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\MDM_IT_Verguetung.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>..\Resources\MDM_IT_Verguetung.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="connStringFMZOLL_NEW" xml:space="preserve">
|
||||||
|
<value>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
@@ -14,8 +14,15 @@ Public Class cSqlDb
|
|||||||
Return cn
|
Return cn
|
||||||
End Function
|
End Function
|
||||||
Public Shared Function GetNewOpenConnectionFMZOLL() As SqlConnection
|
Public Shared Function GetNewOpenConnectionFMZOLL() As SqlConnection
|
||||||
|
|
||||||
Dim cn As New SqlConnection()
|
Dim cn As New SqlConnection()
|
||||||
|
|
||||||
|
If VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED Then
|
||||||
|
cn.ConnectionString = My.Resources.connStringFMZOLL_NEW
|
||||||
|
Else
|
||||||
cn.ConnectionString = My.Resources.connStringFMZOLL
|
cn.ConnectionString = My.Resources.connStringFMZOLL
|
||||||
|
End If
|
||||||
|
|
||||||
cn.Open()
|
cn.Open()
|
||||||
Return cn
|
Return cn
|
||||||
End Function
|
End Function
|
||||||
|
|||||||
@@ -51,8 +51,8 @@ Public Class usrCntlDatenarchiv
|
|||||||
|
|
||||||
Function getDatenarchivwhere() As String
|
Function getDatenarchivwhere() As String
|
||||||
|
|
||||||
Dim sqlstr = ""
|
Dim sqlstr = " and Param_testsystem = " & IIf(cbxTestsystem.Checked, "1 ", "0 ")
|
||||||
If cboPartnersystem._value <> "" Then sqlstr &= " AND [Param_system] = '" & cboPartnersystem._value & "'"
|
If cboPartnersystem._value <> "" Then sqlstr &= " And [Param_system] = '" & cboPartnersystem._value & "'"
|
||||||
|
|
||||||
Return sqlstr
|
Return sqlstr
|
||||||
End Function
|
End Function
|
||||||
@@ -74,7 +74,7 @@ Public Class usrCntlDatenarchiv
|
|||||||
|
|
||||||
Private Sub cbxProduktivsystem_CheckedChanged(sender As Object, e As EventArgs) Handles cbxTestsystem.CheckedChanged
|
Private Sub cbxProduktivsystem_CheckedChanged(sender As Object, e As EventArgs) Handles cbxTestsystem.CheckedChanged
|
||||||
|
|
||||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
|
'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
|
||||||
|
|
||||||
DatenarchivBind = New cEasyBinding(BIND_DB)
|
DatenarchivBind = New cEasyBinding(BIND_DB)
|
||||||
|
|
||||||
|
|||||||
@@ -4043,22 +4043,22 @@ Public Class usrctlProcedures
|
|||||||
Dim STDOF As New cStandardofferten(currentRow(0), currentRow(1), currentRow(2), currentRow(3))
|
Dim STDOF As New cStandardofferten(currentRow(0), currentRow(1), currentRow(2), currentRow(3))
|
||||||
If STDOF.hasEntry Then
|
If STDOF.hasEntry Then
|
||||||
|
|
||||||
Dim save As Boolean = False
|
'Dim save As Boolean = False
|
||||||
|
|
||||||
If isleernothing(currentRow(12)) IsNot Nothing AndAlso isleernothing(currentRow(12)) <> "NULL" Then
|
'If isleernothing(currentRow(12)) IsNot Nothing AndAlso isleernothing(currentRow(12)) <> "NULL" Then
|
||||||
save = True
|
' save = True
|
||||||
STDOF.LeistungsBez_EN = isleernothing(currentRow(12))
|
' STDOF.LeistungsBez_EN = isleernothing(currentRow(12))
|
||||||
End If
|
'End If
|
||||||
If isleernothing(currentRow(13)) IsNot Nothing AndAlso isleernothing(currentRow(13)) <> "NULL" Then
|
'If isleernothing(currentRow(13)) IsNot Nothing AndAlso isleernothing(currentRow(13)) <> "NULL" Then
|
||||||
save = True
|
' save = True
|
||||||
STDOF.LeistungsBez_RO = isleernothing(currentRow(13))
|
' STDOF.LeistungsBez_RO = isleernothing(currentRow(13))
|
||||||
End If
|
'End If
|
||||||
If isleernothing(currentRow(14)) IsNot Nothing AndAlso isleernothing(currentRow(14)) <> "NULL" Then
|
'If isleernothing(currentRow(14)) IsNot Nothing AndAlso isleernothing(currentRow(14)) <> "NULL" Then
|
||||||
save = True
|
' save = True
|
||||||
STDOF.LeistungsBez_TR = isleernothing(currentRow(14))
|
' STDOF.LeistungsBez_TR = isleernothing(currentRow(14))
|
||||||
End If
|
'End If
|
||||||
|
|
||||||
If save Then STDOF.SAVE()
|
'If save Then STDOF.SAVE()
|
||||||
|
|
||||||
ElseIf currentRow(2) = 117 Or currentRow(2) = 118 Or currentRow(2) = 119 Then
|
ElseIf currentRow(2) = 117 Or currentRow(2) = 118 Or currentRow(2) = 119 Then
|
||||||
|
|
||||||
@@ -4068,6 +4068,18 @@ Public Class usrctlProcedures
|
|||||||
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
If (isleernothing(currentRow(1)) IsNot Nothing AndAlso isleernothing(currentRow(1)) <> "NULL") AndAlso (isleernothing(currentRow(2)) IsNot Nothing AndAlso isleernothing(currentRow(2)) <> "NULL") AndAlso (isleernothing(currentRow(3)) IsNot Nothing AndAlso isleernothing(currentRow(3)) <> "NULL") Then
|
||||||
|
|
||||||
|
Dim temp As cStandardofferten
|
||||||
|
'update ohne OffertenNr!
|
||||||
|
temp.updateBezeichnung_MULTILINGUAL(isleernothing(currentRow(1)), isleernothing(currentRow(2)), isleernothing(currentRow(3)), isleernothing(currentRow(12)), isleernothing(currentRow(13)), isleernothing(currentRow(14)))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
End If
|
||||||
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -91,8 +91,6 @@ Public Class cWorker_Verwahrung
|
|||||||
|
|
||||||
STATUS.SAVE()
|
STATUS.SAVE()
|
||||||
|
|
||||||
'NOCHT NICHT!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
||||||
If False Then
|
|
||||||
|
|
||||||
'LINKE SEITE BEI GESAMTSICHERHEITEN!!!!!!!!!!!!!
|
'LINKE SEITE BEI GESAMTSICHERHEITEN!!!!!!!!!!!!!
|
||||||
|
|
||||||
@@ -150,98 +148,64 @@ Public Class cWorker_Verwahrung
|
|||||||
If SND IsNot Nothing AndAlso SND.tblSnd_Abfertigungsart_ID = 44 Then
|
If SND IsNot Nothing AndAlso SND.tblSnd_Abfertigungsart_ID = 44 Then
|
||||||
|
|
||||||
Dim existingEntry As Integer = 0
|
Dim existingEntry As Integer = 0
|
||||||
existingEntry = CInt((New SQL).getValueTxtBySql("Select count(*) from [tblGesamtsicherheit] where [gs_ATBNr] = '" & RegistriernummerATLAS & "' order by gs_datum desc",,,, "0"))
|
existingEntry = CInt((New SQL).getValueTxtBySql("Select gs_gsnr from [tblGesamtsicherheit] where [gs_ATBNr] = '" & Vorpapiernummer & "' order by gs_datum desc", "AVISO",,,, "0"))
|
||||||
If existingEntry <> 0 Then GoTo Anzeige
|
If existingEntry = 0 Then
|
||||||
existingEntry = CInt((New SQL).getValueTxtBySql("Select count(*) from [tblGesamtsicherheit] where ([gs_filialenNr] = '" & SND.FilialenNr & "' and [gs_abfertigungsNr] = " & SND.AbfertigungsNr & " ) or gs_avisoId = '" & SND.tblSnd_AvisoID & "' order by gs_datum desc",,,, "0"))
|
existingEntry = CInt((New SQL).getValueTxtBySql("Select gs_gsnr from [tblGesamtsicherheit] where ([gs_filialenNr] = '" & SND.FilialenNr & "' and [gs_abfertigungsNr] = " & SND.AbfertigungsNr & ") or (gs_avisoId = " & SND.tblSnd_AvisoID & ") order by gs_datum desc", "AVISO",,, "0"))
|
||||||
If existingEntry <> 0 Then GoTo Anzeige
|
|
||||||
|
|
||||||
''sonderfälle lt. Mestan
|
|
||||||
If SND.tblSnd_Zollsystem_Land = "DE" Then
|
|
||||||
|
|
||||||
Select Case SND.FilialenNr
|
|
||||||
Case 5501, 4803, 4809, 5103
|
|
||||||
Standort = "VERAG GmbH"
|
|
||||||
End Select
|
|
||||||
|
|
||||||
ElseIf SND.tblSnd_Zollsystem_Land = "AT" Then
|
|
||||||
|
|
||||||
If SND.tblSnd_Abfertigungsart_ID = 1 Then 'ZA
|
|
||||||
Standort = "VERAG CS"
|
|
||||||
ElseIf SND.tblSnd_Abfertigungsart_ID = 38 Then 'EV-Verz
|
|
||||||
Select Case SND.FilialenNr
|
|
||||||
Case 4803, 5303, 4809, 5103
|
|
||||||
Standort = "VERAG CS"
|
|
||||||
End Select
|
|
||||||
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
End If
|
If existingEntry > 0 Then
|
||||||
|
|
||||||
|
Dim urspringsSicherheit As New cSicherheiten(existingEntry)
|
||||||
|
|
||||||
|
|
||||||
Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort)
|
Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz(urspringsSicherheit.gs_standort)
|
||||||
Dim saldo = GesSichRef.CalcSaldo()
|
Dim saldo = GesSichRef.CalcSaldo()
|
||||||
|
|
||||||
If SND.FilialenNr > 0 Then filiale = SND.FilialenNr
|
If SND.FilialenNr > 0 Then filiale = SND.FilialenNr
|
||||||
If SND.AbfertigungsNr > 0 Then abfertigungsnummer = SND.AbfertigungsNr
|
If SND.AbfertigungsNr > 0 Then abfertigungsnummer = SND.AbfertigungsNr
|
||||||
|
|
||||||
'Verwahrung ANSCHREIBUNG
|
'Verwahrung ANSCHREIBUNG
|
||||||
Dim ANSCHREIBUNG As New cSicherheiten()
|
|
||||||
Dim gsId As Integer
|
|
||||||
With ANSCHREIBUNG
|
|
||||||
.gs_ATBNr = RegistriernummerATLAS
|
|
||||||
.gs_posNr = 1
|
|
||||||
.gs_datum = gestellungsdatum
|
|
||||||
.gs_warenwert = IIf(SND.tblSnd_Warenwert IsNot Nothing AndAlso IsNumeric(SND.tblSnd_Warenwert), CDbl(SND.tblSnd_Warenwert), 0)
|
|
||||||
.gs_sicherheitsbetrag = IIf(SND.tblSnd_Warenwert IsNot Nothing AndAlso IsNumeric(SND.tblSnd_Warenwert), CDbl(SND.tblSnd_Warenwert) * (GesSichRef.brgakto_gs_zollsatz / 100), 0)
|
|
||||||
.gs_standort = Standort
|
|
||||||
.gs_art = "OPEN"
|
|
||||||
.gs_gsNr = AddNewGesamtSichNr()
|
|
||||||
.gs_erstellungsdatum = Now()
|
|
||||||
.gs_freitext = ""
|
|
||||||
.gs_saldo = saldo
|
|
||||||
.gs_atr = ""
|
|
||||||
.gs_filialenNr = filiale
|
|
||||||
.gs_abfertigungsnr = abfertigungsnummer
|
|
||||||
.gs_LKWKZ = SND.tblSnd_AvisoID
|
|
||||||
.gs_warenort = warenort
|
|
||||||
'.grenzstelle = AVISO.Grenzstelle.ToString.Replace("WO_", "")
|
|
||||||
.gs_systemuser = "DAKOSY-AUTO"
|
|
||||||
.gs_zollsatz = GesSichRef.brgakto_gs_zollsatz
|
|
||||||
.gs_avisoId = SND.tblSnd_AvisoID
|
|
||||||
|
|
||||||
End With
|
Dim gsId As Integer
|
||||||
|
|
||||||
|
urspringsSicherheit.gs_systemuser = "DAKOSY-AUTO"
|
||||||
|
urspringsSicherheit.gs_posNr = CInt(posGestellung.Rows(0).Item("PosNr"))
|
||||||
|
urspringsSicherheit.gs_freitext = RegistriernummerATLAS
|
||||||
|
urspringsSicherheit.gs_MRNNr = RegistriernummerATLAS
|
||||||
|
|
||||||
|
|
||||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
|
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
|
||||||
gsId = ANSCHREIBUNG.SAVEOBJECT()
|
gsId = urspringsSicherheit.SAVEOBJECT()
|
||||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
||||||
|
|
||||||
If posGestellung.Rows.Count > 1 Then
|
If posGestellung.Rows.Count > 1 Then
|
||||||
For i As Integer = 2 To posGestellung.Rows.Count
|
For i As Integer = 2 To posGestellung.Rows.Count - 1
|
||||||
|
|
||||||
Dim ANSCHREIBUNG_POS As New cSicherheiten()
|
Dim ANSCHREIBUNG_POS As New cSicherheiten()
|
||||||
With ANSCHREIBUNG_POS
|
With ANSCHREIBUNG_POS
|
||||||
|
|
||||||
.gs_gsNr = gsId
|
.gs_gsNr = gsId
|
||||||
.gs_ATBNr = RegistriernummerATLAS
|
.gs_ATBNr = urspringsSicherheit.gs_ATBNr
|
||||||
|
.gs_freitext = RegistriernummerATLAS
|
||||||
.gs_posNr = i
|
.gs_posNr = i
|
||||||
.gs_datum = gestellungsdatum
|
.gs_datum = gestellungsdatum
|
||||||
.gs_gsNr = ANSCHREIBUNG.gs_gsNr
|
.gs_gsNr = urspringsSicherheit.gs_gsNr
|
||||||
.gs_warenwert = 0
|
.gs_warenwert = 0
|
||||||
.gs_sicherheitsbetrag = 0
|
.gs_sicherheitsbetrag = 0
|
||||||
.gs_standort = Standort
|
.gs_standort = Standort
|
||||||
.gs_art = "OPEN"
|
.gs_art = "OPEN"
|
||||||
.gs_erstellungsdatum = DateTime.Now
|
.gs_erstellungsdatum = DateTime.Now
|
||||||
.gs_freitext = ""
|
.gs_MRNNr = RegistriernummerATLAS
|
||||||
.gs_saldo = saldo
|
.gs_saldo = saldo
|
||||||
.gs_atr = ""
|
.gs_atr = ""
|
||||||
.gs_systemuser = ANSCHREIBUNG.gs_systemuser
|
.gs_systemuser = urspringsSicherheit.gs_systemuser
|
||||||
.gs_zollsatz = GesSichRef.brgakto_gs_zollsatz
|
.gs_zollsatz = GesSichRef.gsr_zollsatz
|
||||||
.gs_avisoId = SND.tblSnd_AvisoID
|
.gs_avisoId = SND.tblSnd_AvisoID
|
||||||
.gs_warenort = ANSCHREIBUNG.gs_warenort
|
.gs_warenort = urspringsSicherheit.gs_warenort
|
||||||
|
|
||||||
End With
|
End With
|
||||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
|
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
|
||||||
ANSCHREIBUNG.SAVE()
|
ANSCHREIBUNG_POS.SAVE()
|
||||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
||||||
Next
|
Next
|
||||||
|
|
||||||
@@ -251,6 +215,9 @@ Public Class cWorker_Verwahrung
|
|||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
@@ -267,7 +234,6 @@ Anzeige:
|
|||||||
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
End If
|
|
||||||
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||||
@@ -399,29 +365,95 @@ Anzeige:
|
|||||||
|
|
||||||
'----------------------------------------------------------------
|
'----------------------------------------------------------------
|
||||||
|
|
||||||
'Verwahrung ABSCHREIBUNG - RECHTE Seite bei Gesamtsicherheiten
|
'Verwahrung ABSCHREIBUNG - rechte Seite bei Gesamtsicherheiten
|
||||||
|
|
||||||
If saveAbschreibung Then
|
If saveAbschreibung Then
|
||||||
|
|
||||||
If posErledigung IsNot Nothing AndAlso posErledigung.Rows.Count > 0 Then
|
If posErledigung IsNot Nothing AndAlso posErledigung.Rows.Count > 0 Then
|
||||||
|
|
||||||
|
If regNR <> "" Then
|
||||||
|
|
||||||
|
Dim dtGesamtsicherheit = SQL.loadDgvBySql("Select * From [tblGesamtsicherheit] where [gs_MRNNr] = '" & regNR & "' or [gs_ATBNr]= '" & regNR & "'", "AVISO")
|
||||||
|
|
||||||
|
If dtGesamtsicherheit.Rows.Count > 0 Then
|
||||||
|
|
||||||
For Each POS As DataRow In posErledigung.Rows
|
For Each POS As DataRow In posErledigung.Rows
|
||||||
|
|
||||||
Dim ATBNR As String = ""
|
Dim MRNNR As String = ""
|
||||||
Dim existingEntryID As Integer = 0
|
Dim existingEntryID As Integer = 0
|
||||||
Dim dtGesamtsicherheit As New DataTable
|
|
||||||
|
|
||||||
If Not IsDBNull(POS.Item("IDRegNrSumA")) AndAlso POS.Item("IDRegNrSumA") IsNot Nothing AndAlso POS.Item("IDRegNrSumA") <> "" Then
|
If Not IsDBNull(POS.Item("IDRegNrSumA")) AndAlso POS.Item("IDRegNrSumA") IsNot Nothing AndAlso POS.Item("IDRegNrSumA") <> "" Then
|
||||||
|
|
||||||
Dim POSNr = POS.Item("IDRegNrSumAPos")
|
Dim POSNr As Integer = CInt(POS.Item("IDRegNrSumAPos"))
|
||||||
|
|
||||||
If ATBNR <> POS.Item("IDRegNrSumA") Then
|
If MRNNR <> POS.Item("IDRegNrSumA") Then
|
||||||
ATBNR = POS.Item("IDRegNrSumA")
|
MRNNR = POS.Item("IDRegNrSumA")
|
||||||
|
|
||||||
dtGesamtsicherheit = SQL.loadDgvBySql("Select * From [tblGesamtsicherheit] where [gs_ATBNr] = '" & ATBNR & "'", "AVISO")
|
Dim firmaID = -1
|
||||||
|
|
||||||
|
'Select Case dtGesamtsicherheit.Rows(0).Item("gs_standort")
|
||||||
|
|
||||||
|
' Case "VERAG GmbH"
|
||||||
|
' firmaID = 23
|
||||||
|
' Case "Verag AG"
|
||||||
|
' firmaId = 1
|
||||||
|
' Case "Unisped GmbH"
|
||||||
|
' firmaId = 21
|
||||||
|
' Case "AMBAR GmbH"
|
||||||
|
' firmaId = 24
|
||||||
|
' Case "Verag CS"
|
||||||
|
' firmaId = 11
|
||||||
|
' Case "IMEX"
|
||||||
|
' firmaId = 20
|
||||||
|
|
||||||
|
|
||||||
|
'End Select
|
||||||
|
|
||||||
|
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
|
||||||
|
|
||||||
|
Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz(dtGesamtsicherheit.Rows(0).Item("gs_standort"))
|
||||||
|
Dim saldo As Double = GesSichRef.CalcSaldo()
|
||||||
|
|
||||||
|
Try
|
||||||
|
|
||||||
|
'innerhalb der gs_gsnr muss mithilfe der gs_gsid die richtige PosNr ermittelt werden!
|
||||||
|
|
||||||
|
Dim Warenwert As Double = 0
|
||||||
|
|
||||||
|
Dim dtSendungen = SQL.loadDgvBySql("SELECT")
|
||||||
|
|
||||||
|
Dim SicherheitsPos As New cGesamtsicherheitsPositionen()
|
||||||
|
With SicherheitsPos
|
||||||
|
.gsp_gsId = dtGesamtsicherheit.Rows(0).Item("gs_gsId")
|
||||||
|
'.gsp_gspPosId = CInt(POSNr)
|
||||||
|
.gsp_gspPosId = dtGesamtsicherheit.Rows(0).Item("gs_posNr")
|
||||||
|
.gsp_warenwert = 0
|
||||||
|
.gsp_sicherheitsbetrag = 0
|
||||||
|
.gsp_freitext = "DASKOY-IMPORT"
|
||||||
|
.gsp_filialenNr = dtGesamtsicherheit.Rows(0).Item("gs_filialenNr")
|
||||||
|
.gsp_art = "CLOSE"
|
||||||
|
.gsp_gsNr = dtGesamtsicherheit.Rows(0).Item("gs_gsnr")
|
||||||
|
.gsp_abfertigungsNr = dtGesamtsicherheit.Rows(0).Item("gs_abfertigungsnr")
|
||||||
|
.gsp_datum = DateTime.Now
|
||||||
|
.gsp_erstellungsdatum = DateTime.Now
|
||||||
|
.gsp_ust = dtGesamtsicherheit.Rows(0).Item("gs_ust")
|
||||||
|
.gsp_ATCNr = POS.Item("IDRegNrSumA")
|
||||||
|
.gsp_avisoId = dtGesamtsicherheit.Rows(0).Item("gs_avisoID")
|
||||||
|
.gsp_systemuser = "DAKOSY-AUTO"
|
||||||
|
End With
|
||||||
|
|
||||||
|
|
||||||
|
SicherheitsPos.SAVE()
|
||||||
|
|
||||||
|
GesSichRef.CalcSaldo()
|
||||||
|
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
||||||
|
|
||||||
|
Catch ex As Exception
|
||||||
|
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||||
|
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
||||||
|
End Try
|
||||||
|
|
||||||
End If
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -429,93 +461,15 @@ Anzeige:
|
|||||||
End If
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
End If
|
||||||
|
|
||||||
Next
|
Next
|
||||||
|
|
||||||
|
|
||||||
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
End If
|
||||||
' If existingEntryID > 0 Then GoTo Anzeige
|
|
||||||
' existingEntryID = CInt((New SQL).getValueTxtBySql("Select count(*) From [tblGesamtsicherheitsPositionen] inner join [tblGesamtsicherheit] on gs_gsId = gsp_gsId where ([gs_filialenNr] = '" & SND.FilialenNr & "' and [gs_abfertigungsNr] = " & SND.AbfertigungsNr & " ) or gs_avisoId = '" & SND.tblSnd_AvisoID & "' order by gs_datum desc"))
|
|
||||||
' If existingEntryID > 0 Then GoTo Anzeige
|
|
||||||
|
|
||||||
' Dim gsNr As Integer = 0
|
|
||||||
' gsNr = CInt((New SQL).getValueTxtBySql("Select gsNr From [tblGesamtsicherheit] where [gs_ATBNr] = '" & RegistriernummerATLAS & "' order by gs_datum desc"))
|
|
||||||
' If gsNr > 0 Then GoTo Insert
|
|
||||||
' gsNr = CInt((New SQL).getValueTxtBySql("Select gsNr From [tblGesamtsicherheit] where ([gs_filialenNr] = '" & SND.FilialenNr & "' and [gs_abfertigungsNr] = " & SND.AbfertigungsNr & " ) or gs_avisoId = '" & SND.tblSnd_AvisoID & "' order by gs_datum desc"))
|
|
||||||
' If gsNr > 0 Then
|
|
||||||
' GoTo Insert
|
|
||||||
' Else
|
|
||||||
' GoTo Anzeige
|
|
||||||
' End If
|
|
||||||
|
|
||||||
|
|
||||||
' ''sonderfälle lt. Mestan
|
|
||||||
' If SND.tblSnd_Zollsystem_Land = "DE" Then
|
|
||||||
|
|
||||||
' Select Case SND.FilialenNr
|
|
||||||
' Case 5501, 4803, 4809, 5103
|
|
||||||
' Standort = "VERAG GmbH"
|
|
||||||
' End Select
|
|
||||||
|
|
||||||
' ElseIf SND.tblSnd_Zollsystem_Land = "AT" Then
|
|
||||||
|
|
||||||
' If SND.tblSnd_Abfertigungsart_ID = 1 Then 'ZA
|
|
||||||
' Standort = "VERAG CS"
|
|
||||||
' ElseIf SND.tblSnd_Abfertigungsart_ID = 38 Then 'EV-Verz
|
|
||||||
' Select Case SND.FilialenNr
|
|
||||||
' Case 4803, 5303, 4809, 5103
|
|
||||||
' Standort = "VERAG CS"
|
|
||||||
' End Select
|
|
||||||
|
|
||||||
' End If
|
|
||||||
|
|
||||||
' End If
|
|
||||||
|
|
||||||
'Insert:
|
|
||||||
|
|
||||||
' Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort)
|
|
||||||
' Dim saldo = GesSichRef.CalcSaldo()
|
|
||||||
|
|
||||||
' Try
|
|
||||||
|
|
||||||
|
|
||||||
' Dim SicherheitsPos As New cGesamtsicherheitsPositionen()
|
|
||||||
' With SicherheitsPos
|
|
||||||
' '.gsp_gsId = gs_gsId
|
|
||||||
' ''.gsp_gspPosId = Me.getLatestPosNr(currentSicherheit.gs_gsNr, ) + 1
|
|
||||||
' '.gsp_gspPosId = OPEN.gs_posNr
|
|
||||||
' '.gsp_warenwert = Double.Parse(txtPosWarenwert.Text)
|
|
||||||
' '.gsp_sicherheitsbetrag = Double.Parse(txtPosSicherheitsbetrag.Text)
|
|
||||||
' '.gsp_freitext = txtPosFreitext.Text
|
|
||||||
' '.gsp_filialenNr = currentSicherheit.gs_filialenNr
|
|
||||||
' '.gsp_art = "CLOSE"
|
|
||||||
' .gsp_gsNr = gsNr
|
|
||||||
' '.gsp_abfertigungsNr = currentSicherheit.gs_abfertigungsnr
|
|
||||||
' .gsp_datum = 'DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text)
|
|
||||||
' .gsp_erstellungsdatum = DateTime.Now
|
|
||||||
' .gsp_ust = 'currentSicherheit.gs_ust
|
|
||||||
' .gsp_ATCNr = 'txtPositionenCRN.Text
|
|
||||||
' .gsp_avisoId = 'Me.avisoID'
|
|
||||||
' .gsp_systemuser = "DAKOSY-AUTO"
|
|
||||||
' End With
|
|
||||||
|
|
||||||
' 'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
|
|
||||||
' SicherheitsPos.SAVE()
|
|
||||||
' 'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
|
||||||
|
|
||||||
' Catch ex As Exception
|
|
||||||
|
|
||||||
|
|
||||||
' End Try
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
' End If
|
|
||||||
|
|
||||||
' End If
|
|
||||||
|
|
||||||
|
|
||||||
End If
|
End If
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
|
|||||||
Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||||
Me.btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
Me.btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||||
Me.btn.ForeColor = System.Drawing.Color.White
|
Me.btn.ForeColor = System.Drawing.Color.White
|
||||||
Me.btn.Location = New System.Drawing.Point(379, -1)
|
Me.btn.Location = New System.Drawing.Point(464, -1)
|
||||||
Me.btn.Margin = New System.Windows.Forms.Padding(0)
|
Me.btn.Margin = New System.Windows.Forms.Padding(0)
|
||||||
Me.btn.Name = "btn"
|
Me.btn.Name = "btn"
|
||||||
Me.btn.Size = New System.Drawing.Size(75, 22)
|
Me.btn.Size = New System.Drawing.Size(75, 22)
|
||||||
@@ -84,7 +84,7 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
|
|||||||
Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill
|
Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill
|
||||||
Me.pnl.Location = New System.Drawing.Point(0, 0)
|
Me.pnl.Location = New System.Drawing.Point(0, 0)
|
||||||
Me.pnl.Name = "pnl"
|
Me.pnl.Name = "pnl"
|
||||||
Me.pnl.Size = New System.Drawing.Size(456, 319)
|
Me.pnl.Size = New System.Drawing.Size(541, 319)
|
||||||
Me.pnl.TabIndex = 1
|
Me.pnl.TabIndex = 1
|
||||||
'
|
'
|
||||||
'lblFTP
|
'lblFTP
|
||||||
@@ -102,7 +102,7 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
|
|||||||
Me.lblTestsystem.AutoSize = True
|
Me.lblTestsystem.AutoSize = True
|
||||||
Me.lblTestsystem.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
Me.lblTestsystem.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||||
Me.lblTestsystem.ForeColor = System.Drawing.Color.Red
|
Me.lblTestsystem.ForeColor = System.Drawing.Color.Red
|
||||||
Me.lblTestsystem.Location = New System.Drawing.Point(274, 8)
|
Me.lblTestsystem.Location = New System.Drawing.Point(323, 4)
|
||||||
Me.lblTestsystem.Name = "lblTestsystem"
|
Me.lblTestsystem.Name = "lblTestsystem"
|
||||||
Me.lblTestsystem.Size = New System.Drawing.Size(89, 13)
|
Me.lblTestsystem.Size = New System.Drawing.Size(89, 13)
|
||||||
Me.lblTestsystem.TabIndex = 20
|
Me.lblTestsystem.TabIndex = 20
|
||||||
@@ -113,7 +113,7 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
|
|||||||
'
|
'
|
||||||
Me.lblDatenCnt.AutoSize = True
|
Me.lblDatenCnt.AutoSize = True
|
||||||
Me.lblDatenCnt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
Me.lblDatenCnt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||||
Me.lblDatenCnt.Location = New System.Drawing.Point(309, 132)
|
Me.lblDatenCnt.Location = New System.Drawing.Point(387, 132)
|
||||||
Me.lblDatenCnt.Name = "lblDatenCnt"
|
Me.lblDatenCnt.Name = "lblDatenCnt"
|
||||||
Me.lblDatenCnt.Size = New System.Drawing.Size(13, 13)
|
Me.lblDatenCnt.Size = New System.Drawing.Size(13, 13)
|
||||||
Me.lblDatenCnt.TabIndex = 19
|
Me.lblDatenCnt.TabIndex = 19
|
||||||
@@ -134,7 +134,7 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
|
|||||||
Me.dgvEinarbeitung.Location = New System.Drawing.Point(12, 164)
|
Me.dgvEinarbeitung.Location = New System.Drawing.Point(12, 164)
|
||||||
Me.dgvEinarbeitung.Name = "dgvEinarbeitung"
|
Me.dgvEinarbeitung.Name = "dgvEinarbeitung"
|
||||||
Me.dgvEinarbeitung.RowHeadersVisible = False
|
Me.dgvEinarbeitung.RowHeadersVisible = False
|
||||||
Me.dgvEinarbeitung.Size = New System.Drawing.Size(291, 145)
|
Me.dgvEinarbeitung.Size = New System.Drawing.Size(351, 145)
|
||||||
Me.dgvEinarbeitung.TabIndex = 18
|
Me.dgvEinarbeitung.TabIndex = 18
|
||||||
'
|
'
|
||||||
'clmnArt
|
'clmnArt
|
||||||
@@ -153,7 +153,7 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
|
|||||||
'
|
'
|
||||||
Me.Label9.AutoSize = True
|
Me.Label9.AutoSize = True
|
||||||
Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||||
Me.Label9.Location = New System.Drawing.Point(306, 103)
|
Me.Label9.Location = New System.Drawing.Point(384, 103)
|
||||||
Me.Label9.Name = "Label9"
|
Me.Label9.Name = "Label9"
|
||||||
Me.Label9.Size = New System.Drawing.Size(44, 13)
|
Me.Label9.Size = New System.Drawing.Size(44, 13)
|
||||||
Me.Label9.TabIndex = 17
|
Me.Label9.TabIndex = 17
|
||||||
@@ -163,7 +163,7 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
|
|||||||
'btnEinlesen
|
'btnEinlesen
|
||||||
'
|
'
|
||||||
Me.btnEinlesen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
Me.btnEinlesen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||||
Me.btnEinlesen.Location = New System.Drawing.Point(309, 50)
|
Me.btnEinlesen.Location = New System.Drawing.Point(387, 50)
|
||||||
Me.btnEinlesen.Name = "btnEinlesen"
|
Me.btnEinlesen.Name = "btnEinlesen"
|
||||||
Me.btnEinlesen.Size = New System.Drawing.Size(141, 50)
|
Me.btnEinlesen.Size = New System.Drawing.Size(141, 50)
|
||||||
Me.btnEinlesen.TabIndex = 16
|
Me.btnEinlesen.TabIndex = 16
|
||||||
@@ -185,13 +185,13 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
|
|||||||
Me.ListBox3.FormattingEnabled = True
|
Me.ListBox3.FormattingEnabled = True
|
||||||
Me.ListBox3.Location = New System.Drawing.Point(11, 50)
|
Me.ListBox3.Location = New System.Drawing.Point(11, 50)
|
||||||
Me.ListBox3.Name = "ListBox3"
|
Me.ListBox3.Name = "ListBox3"
|
||||||
Me.ListBox3.Size = New System.Drawing.Size(292, 95)
|
Me.ListBox3.Size = New System.Drawing.Size(352, 95)
|
||||||
Me.ListBox3.TabIndex = 12
|
Me.ListBox3.TabIndex = 12
|
||||||
'
|
'
|
||||||
'Label6
|
'Label6
|
||||||
'
|
'
|
||||||
Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||||
Me.Label6.Location = New System.Drawing.Point(306, 240)
|
Me.Label6.Location = New System.Drawing.Point(384, 240)
|
||||||
Me.Label6.Name = "Label6"
|
Me.Label6.Name = "Label6"
|
||||||
Me.Label6.Size = New System.Drawing.Size(144, 37)
|
Me.Label6.Size = New System.Drawing.Size(144, 37)
|
||||||
Me.Label6.TabIndex = 11
|
Me.Label6.TabIndex = 11
|
||||||
@@ -202,7 +202,7 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
|
|||||||
'
|
'
|
||||||
Me.Label5.AutoSize = True
|
Me.Label5.AutoSize = True
|
||||||
Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||||
Me.Label5.Location = New System.Drawing.Point(306, 217)
|
Me.Label5.Location = New System.Drawing.Point(384, 217)
|
||||||
Me.Label5.Name = "Label5"
|
Me.Label5.Name = "Label5"
|
||||||
Me.Label5.Size = New System.Drawing.Size(44, 13)
|
Me.Label5.Size = New System.Drawing.Size(44, 13)
|
||||||
Me.Label5.TabIndex = 10
|
Me.Label5.TabIndex = 10
|
||||||
@@ -212,7 +212,7 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
|
|||||||
'btnEinarbeiten
|
'btnEinarbeiten
|
||||||
'
|
'
|
||||||
Me.btnEinarbeiten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
Me.btnEinarbeiten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||||
Me.btnEinarbeiten.Location = New System.Drawing.Point(309, 164)
|
Me.btnEinarbeiten.Location = New System.Drawing.Point(387, 164)
|
||||||
Me.btnEinarbeiten.Name = "btnEinarbeiten"
|
Me.btnEinarbeiten.Name = "btnEinarbeiten"
|
||||||
Me.btnEinarbeiten.Size = New System.Drawing.Size(141, 50)
|
Me.btnEinarbeiten.Size = New System.Drawing.Size(141, 50)
|
||||||
Me.btnEinarbeiten.TabIndex = 9
|
Me.btnEinarbeiten.TabIndex = 9
|
||||||
@@ -222,7 +222,7 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
|
|||||||
'btnOK
|
'btnOK
|
||||||
'
|
'
|
||||||
Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||||
Me.btnOK.Location = New System.Drawing.Point(309, 280)
|
Me.btnOK.Location = New System.Drawing.Point(387, 280)
|
||||||
Me.btnOK.Name = "btnOK"
|
Me.btnOK.Name = "btnOK"
|
||||||
Me.btnOK.Size = New System.Drawing.Size(141, 29)
|
Me.btnOK.Size = New System.Drawing.Size(141, 29)
|
||||||
Me.btnOK.TabIndex = 9
|
Me.btnOK.TabIndex = 9
|
||||||
@@ -254,7 +254,7 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
|
|||||||
'
|
'
|
||||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||||
Me.ClientSize = New System.Drawing.Size(456, 319)
|
Me.ClientSize = New System.Drawing.Size(541, 319)
|
||||||
Me.Controls.Add(Me.pnl)
|
Me.Controls.Add(Me.pnl)
|
||||||
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
|
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
|
||||||
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
|
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
|
||||||
|
|||||||
1840
initATLASAufschubkonten/frmStartOptions.Designer.vb
generated
1840
initATLASAufschubkonten/frmStartOptions.Designer.vb
generated
File diff suppressed because it is too large
Load Diff
@@ -236,6 +236,102 @@
|
|||||||
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
|
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
|
||||||
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
|
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
|
||||||
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
|
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
|
||||||
|
</value>
|
||||||
|
</data>
|
||||||
|
<data name="PictureBox12.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>
|
||||||
|
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
|
||||||
|
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
|
||||||
|
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
|
||||||
|
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
|
||||||
|
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
|
||||||
|
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
|
||||||
|
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
|
||||||
|
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
|
||||||
|
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
|
||||||
|
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
|
||||||
|
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
|
||||||
|
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
|
||||||
|
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
|
||||||
|
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
|
||||||
|
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
|
||||||
|
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
|
||||||
|
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
|
||||||
|
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
|
||||||
|
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
|
||||||
|
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
|
||||||
|
</value>
|
||||||
|
</data>
|
||||||
|
<data name="PictureBox11.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>
|
||||||
|
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
|
||||||
|
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
|
||||||
|
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
|
||||||
|
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
|
||||||
|
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
|
||||||
|
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
|
||||||
|
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
|
||||||
|
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
|
||||||
|
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
|
||||||
|
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
|
||||||
|
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
|
||||||
|
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
|
||||||
|
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
|
||||||
|
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
|
||||||
|
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
|
||||||
|
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
|
||||||
|
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
|
||||||
|
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
|
||||||
|
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
|
||||||
|
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
|
||||||
|
</value>
|
||||||
|
</data>
|
||||||
|
<data name="PictureBox10.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>
|
||||||
|
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
|
||||||
|
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
|
||||||
|
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
|
||||||
|
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
|
||||||
|
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
|
||||||
|
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
|
||||||
|
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
|
||||||
|
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
|
||||||
|
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
|
||||||
|
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
|
||||||
|
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
|
||||||
|
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
|
||||||
|
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
|
||||||
|
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
|
||||||
|
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
|
||||||
|
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
|
||||||
|
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
|
||||||
|
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
|
||||||
|
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
|
||||||
|
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
|
||||||
|
</value>
|
||||||
|
</data>
|
||||||
|
<data name="PictureBox9.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>
|
||||||
|
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
|
||||||
|
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
|
||||||
|
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
|
||||||
|
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
|
||||||
|
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
|
||||||
|
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
|
||||||
|
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
|
||||||
|
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
|
||||||
|
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
|
||||||
|
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
|
||||||
|
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
|
||||||
|
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
|
||||||
|
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
|
||||||
|
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
|
||||||
|
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
|
||||||
|
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
|
||||||
|
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
|
||||||
|
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
|
||||||
|
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
|
||||||
|
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
|
||||||
</value>
|
</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="PictureBox26.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
<data name="PictureBox26.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
@@ -649,6 +745,9 @@
|
|||||||
<metadata name="clmnMRN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="clmnMRN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
<metadata name="clmnMRN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>True</value>
|
||||||
|
</metadata>
|
||||||
<data name="PictureBox18.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
<data name="PictureBox18.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
<value>
|
<value>
|
||||||
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
|
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
|
||||||
@@ -767,102 +866,6 @@
|
|||||||
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
|
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
|
||||||
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
|
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
|
||||||
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
|
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
|
||||||
</value>
|
|
||||||
</data>
|
|
||||||
<data name="PictureBox12.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
|
||||||
<value>
|
|
||||||
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
|
|
||||||
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
|
|
||||||
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
|
|
||||||
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
|
|
||||||
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
|
|
||||||
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
|
|
||||||
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
|
|
||||||
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
|
|
||||||
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
|
|
||||||
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
|
|
||||||
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
|
|
||||||
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
|
|
||||||
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
|
|
||||||
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
|
|
||||||
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
|
|
||||||
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
|
|
||||||
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
|
|
||||||
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
|
|
||||||
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
|
|
||||||
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
|
|
||||||
</value>
|
|
||||||
</data>
|
|
||||||
<data name="PictureBox11.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
|
||||||
<value>
|
|
||||||
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
|
|
||||||
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
|
|
||||||
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
|
|
||||||
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
|
|
||||||
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
|
|
||||||
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
|
|
||||||
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
|
|
||||||
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
|
|
||||||
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
|
|
||||||
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
|
|
||||||
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
|
|
||||||
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
|
|
||||||
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
|
|
||||||
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
|
|
||||||
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
|
|
||||||
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
|
|
||||||
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
|
|
||||||
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
|
|
||||||
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
|
|
||||||
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
|
|
||||||
</value>
|
|
||||||
</data>
|
|
||||||
<data name="PictureBox10.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
|
||||||
<value>
|
|
||||||
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
|
|
||||||
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
|
|
||||||
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
|
|
||||||
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
|
|
||||||
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
|
|
||||||
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
|
|
||||||
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
|
|
||||||
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
|
|
||||||
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
|
|
||||||
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
|
|
||||||
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
|
|
||||||
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
|
|
||||||
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
|
|
||||||
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
|
|
||||||
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
|
|
||||||
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
|
|
||||||
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
|
|
||||||
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
|
|
||||||
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
|
|
||||||
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
|
|
||||||
</value>
|
|
||||||
</data>
|
|
||||||
<data name="PictureBox9.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
|
||||||
<value>
|
|
||||||
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
|
|
||||||
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
|
|
||||||
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
|
|
||||||
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
|
|
||||||
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
|
|
||||||
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
|
|
||||||
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
|
|
||||||
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
|
|
||||||
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
|
|
||||||
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
|
|
||||||
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
|
|
||||||
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
|
|
||||||
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
|
|
||||||
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
|
|
||||||
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
|
|
||||||
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
|
|
||||||
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
|
|
||||||
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
|
|
||||||
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
|
|
||||||
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
|
|
||||||
</value>
|
</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
|||||||
@@ -690,7 +690,7 @@ Public Class frmStartOptions
|
|||||||
If fehler <> "" Then
|
If fehler <> "" Then
|
||||||
API.UPDTAE_ERR("Batch-Nr: " & batchrequestNr & "-" & totalPages, fehler, "getTransactionsFromBatchNrAndPage")
|
API.UPDTAE_ERR("Batch-Nr: " & batchrequestNr & "-" & totalPages, fehler, "getTransactionsFromBatchNrAndPage")
|
||||||
closeMe()
|
closeMe()
|
||||||
Exit Sub
|
Exit For
|
||||||
Else
|
Else
|
||||||
counTrans += dt.Rows.Count
|
counTrans += dt.Rows.Count
|
||||||
End If
|
End If
|
||||||
@@ -930,7 +930,24 @@ Public Class frmStartOptions
|
|||||||
|
|
||||||
End Try
|
End Try
|
||||||
End Function
|
End Function
|
||||||
Function importFileFromEZOLL(datum As Date) As Boolean
|
|
||||||
|
Private Sub addTODatatable(dtSPEDEintrageAusEinarbeitung_HISTORY As DataTable, Anhaenge As cDHF_Anhaenge, SPEDBUCH_TMP As cSpeditionsbuch, datumImport As Date)
|
||||||
|
|
||||||
|
If SPEDBUCH_TMP IsNot Nothing Then
|
||||||
|
Dim R As DataRow = dtSPEDEintrageAusEinarbeitung_HISTORY.NewRow
|
||||||
|
R("FilialNr") = SPEDBUCH_TMP.FilialenNr
|
||||||
|
R("AbfertigungsNr") = SPEDBUCH_TMP.AbfertigungsNr
|
||||||
|
R("Abfertigungsdatum") = SPEDBUCH_TMP.Abfertigungsdatum
|
||||||
|
R("LNR") = Anhaenge.LRN
|
||||||
|
R("CRN") = Anhaenge.CRN
|
||||||
|
R("Abfertigungsart") = R("AbfertigungsNr") = SPEDBUCH_TMP.Abfertigungsart
|
||||||
|
R("Firma") = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||||
|
R("AnhaengeAbDatum") = datumImport.ToShortDateString
|
||||||
|
dtSPEDEintrageAusEinarbeitung_HISTORY.Rows.Add(R)
|
||||||
|
End If
|
||||||
|
|
||||||
|
End Sub
|
||||||
|
Function importFileFromEZOLL(datum As Date, Optional sendMail As Boolean = True) As Boolean
|
||||||
Try
|
Try
|
||||||
Dim db = "EZOLL"
|
Dim db = "EZOLL"
|
||||||
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||||
@@ -938,7 +955,23 @@ Public Class frmStartOptions
|
|||||||
End Select
|
End Select
|
||||||
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
|
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
|
||||||
Dim dt As DataTable = sql.loadDgvBySql("SELECT [zzAktivitaet].LizenzNr,[zzAktivitaet].Operatorid,[zzAktivitaet].AnmID,MsgTyp,[zzAktivitaet].ErstelltAm,pfad,zsAnmRefs.LRN,zsAnmRefs.CRN ,[zzAktivitaet].VorgangID FROM [zzAktivitaet] INNER JOIN zsAnmRefs On zsAnmrefs.AnmID=zzAktivitaet.AnmID
|
Dim dt As DataTable = sql.loadDgvBySql("SELECT [zzAktivitaet].LizenzNr,[zzAktivitaet].Operatorid,[zzAktivitaet].AnmID,MsgTyp,[zzAktivitaet].ErstelltAm,pfad,zsAnmRefs.LRN,zsAnmRefs.CRN ,[zzAktivitaet].VorgangID FROM [zzAktivitaet] INNER JOIN zsAnmRefs On zsAnmrefs.AnmID=zzAktivitaet.AnmID
|
||||||
where MsgTyp IN ('EZ922','EZ923','TR109', 'EX431') and ErstelltAm>='" & datum.ToShortDateString & " 00:00:00' and pfad is not null", db, 200)
|
where MsgTyp IN ('EZ922','EZ923','TR109', 'EX431', 'CC529C', 'CC599C', 'CC029C') and ErstelltAm>='" & datum.ToShortDateString & " 00:00:00' and pfad is not null", db, 200)
|
||||||
|
|
||||||
|
Dim dtSPEDEintrageAusEinarbeitung_HISTORY As New DataTable
|
||||||
|
|
||||||
|
With dtSPEDEintrageAusEinarbeitung_HISTORY
|
||||||
|
.Columns.Add("FilialNr", GetType(Integer))
|
||||||
|
.Columns.Add("AbfertigungsNr", GetType(Integer))
|
||||||
|
.Columns.Add("Abfertigungsdatum", GetType(String))
|
||||||
|
.Columns.Add("LNR", GetType(String))
|
||||||
|
.Columns.Add("CRN", GetType(String))
|
||||||
|
.Columns.Add("Abfertigungsart", GetType(String))
|
||||||
|
.Columns.Add("AnhaengeAbDatum", GetType(String))
|
||||||
|
.Columns.Add("Firma", GetType(String))
|
||||||
|
End With
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
If dt IsNot Nothing Then
|
If dt IsNot Nothing Then
|
||||||
For Each row In dt.Rows
|
For Each row In dt.Rows
|
||||||
Dim cDHF_Anhaenge As New VERAG_PROG_ALLGEMEIN.cDHF_Anhaenge(row("AnmID"), row("MsgTyp"), row("LizenzNr"))
|
Dim cDHF_Anhaenge As New VERAG_PROG_ALLGEMEIN.cDHF_Anhaenge(row("AnmID"), row("MsgTyp"), row("LizenzNr"))
|
||||||
@@ -959,15 +992,16 @@ Public Class frmStartOptions
|
|||||||
Dim Bezeichnung = ""
|
Dim Bezeichnung = ""
|
||||||
Select Case row("MsgTyp")
|
Select Case row("MsgTyp")
|
||||||
Case "EZ922" : Bezeichnung = "STEUERBESCHEID"
|
Case "EZ922" : Bezeichnung = "STEUERBESCHEID"
|
||||||
Case "EZ923"
|
Case "EZ923", "CC529C"
|
||||||
Select Case row("VorgangID")
|
Select Case row("VorgangID")
|
||||||
Case "AF"
|
Case "AF" ' -> CC529C ist immer AF!
|
||||||
Bezeichnung = "ABD"
|
Bezeichnung = "ABD"
|
||||||
Case Else '"EF"
|
Case Else '"EF"
|
||||||
Bezeichnung = "STEUERBESCHEID_MITT"
|
Bezeichnung = "STEUERBESCHEID_MITT"
|
||||||
End Select
|
End Select
|
||||||
Case "TR109" : Bezeichnung = "VBD"
|
|
||||||
Case "EX431" : Bezeichnung = "AVM"
|
Case "TR109", "CC029C" : Bezeichnung = "VBD"
|
||||||
|
Case "EX431", "CC599C" : Bezeichnung = "AVM"
|
||||||
End Select
|
End Select
|
||||||
|
|
||||||
Try
|
Try
|
||||||
@@ -1003,7 +1037,10 @@ Public Class frmStartOptions
|
|||||||
If cDHF_Anhaenge.docID > 0 AndAlso cDHF_Anhaenge.LRN <> "" Then
|
If cDHF_Anhaenge.docID > 0 AndAlso cDHF_Anhaenge.LRN <> "" Then
|
||||||
Select Case row("MsgTyp")
|
Select Case row("MsgTyp")
|
||||||
Case "EZ922" 'STEUERBESCHEID
|
Case "EZ922" 'STEUERBESCHEID
|
||||||
DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "EZA", SPEDBUCH_TMP) 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
If DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "EZA", SPEDBUCH_TMP) And Not sendMail Then 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
||||||
|
'Eintrag aus Nacharbeitung -> Protokollieren
|
||||||
|
addTODatatable(dtSPEDEintrageAusEinarbeitung_HISTORY, cDHF_Anhaenge, SPEDBUCH_TMP, datum)
|
||||||
|
End If
|
||||||
|
|
||||||
'=====IMPORT IN VERAG DATENMODELL==========
|
'=====IMPORT IN VERAG DATENMODELL==========
|
||||||
Dim IMP As New DAKOSY_Worker.cImporter_DHFToVERAG
|
Dim IMP As New DAKOSY_Worker.cImporter_DHFToVERAG
|
||||||
@@ -1014,38 +1051,57 @@ Public Class frmStartOptions
|
|||||||
'==========================================
|
'==========================================
|
||||||
|
|
||||||
sql.doSQL("Update Speditionsbuch SET [DokumentId_Steuerbeleg]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND [DokumentId_Steuerbeleg] is null", "FMZOLL")
|
sql.doSQL("Update Speditionsbuch SET [DokumentId_Steuerbeleg]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND [DokumentId_Steuerbeleg] is null", "FMZOLL")
|
||||||
doMailZollbeleg(destFull, "STB", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
If sendMail Then doMailZollbeleg(destFull, "STB", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
||||||
Case "TR109"
|
Case "TR109", "CC029C"
|
||||||
DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "NCTS", SPEDBUCH_TMP) 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
If DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "NCTS", SPEDBUCH_TMP) And Not sendMail Then
|
||||||
sql.doSQL("Update Speditionsbuch SET [DokumentId_VBD]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND [DokumentId_VBD] is null", "FMZOLL")
|
addTODatatable(dtSPEDEintrageAusEinarbeitung_HISTORY, cDHF_Anhaenge, SPEDBUCH_TMP, datum)
|
||||||
|
End If 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
||||||
|
sql.doSQL("Update Speditionsbuch SET [DokumentId_VBD]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrNCTS='" & cDHF_Anhaenge.LRN & "' AND [DokumentId_VBD] is null", "FMZOLL")
|
||||||
' BEREITSTELLUNG DER DATEN AN FREMDSYSTEME
|
' BEREITSTELLUNG DER DATEN AN FREMDSYSTEME
|
||||||
|
If sendMail Then
|
||||||
cVERAG_out_ncts.copyFileFTP_VERAGncts_EZOLL(cDHF_Anhaenge.AnmID)
|
cVERAG_out_ncts.copyFileFTP_VERAGncts_EZOLL(cDHF_Anhaenge.AnmID)
|
||||||
doMailZollbeleg(destFull, "VBD", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
doMailZollbeleg(destFull, "VBD", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
||||||
Case "EZ923" ' STB/ABD
|
End If
|
||||||
|
|
||||||
|
Case "EZ923", "CC529C" ' STB/ABD
|
||||||
Select Case row("VorgangID")
|
Select Case row("VorgangID")
|
||||||
Case "AF" ' --> AUSFUHR --> ABD
|
Case "AF" ' --> AUSFUHR --> ABD
|
||||||
'AES Stuff....
|
'AES Stuff....
|
||||||
DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "AES", SPEDBUCH_TMP) 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
If DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "AES", SPEDBUCH_TMP) And Not sendMail Then 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
||||||
sql.doSQL("Update Speditionsbuch SET [DokumentId_ABD]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND DokumentId_ABD is null", "FMZOLL")
|
addTODatatable(dtSPEDEintrageAusEinarbeitung_HISTORY, cDHF_Anhaenge, SPEDBUCH_TMP, datum)
|
||||||
|
End If
|
||||||
|
sql.doSQL("Update Speditionsbuch SET [DokumentId_ABD]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrAES='" & cDHF_Anhaenge.LRN & "' AND DokumentId_ABD is null", "FMZOLL")
|
||||||
|
|
||||||
'Zeitspanne ? 3 Tage , älter nicht senden..
|
'Zeitspanne ? 3 Tage , älter nicht senden..
|
||||||
If destFull <> "" AndAlso SPEDBUCH_TMP IsNot Nothing AndAlso SPEDBUCH_TMP.SendungID IsNot Nothing Then
|
If destFull <> "" AndAlso SPEDBUCH_TMP IsNot Nothing AndAlso SPEDBUCH_TMP.SendungID IsNot Nothing Then
|
||||||
doMailZollbeleg(destFull, "ABD", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
If sendMail Then doMailZollbeleg(destFull, "ABD", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
||||||
End If
|
End If
|
||||||
Case Else '' --> EINFUHR --> 'Ergänzung STB - Mitteilung
|
Case Else '' --> EINFUHR --> 'Ergänzung STB - Mitteilung
|
||||||
|
|
||||||
DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "EZA", SPEDBUCH_TMP) 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
If DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "EZA", SPEDBUCH_TMP) And Not sendMail Then
|
||||||
|
addTODatatable(dtSPEDEintrageAusEinarbeitung_HISTORY, cDHF_Anhaenge, SPEDBUCH_TMP, datum)
|
||||||
|
End If 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
||||||
sql.doSQL("Update Speditionsbuch SET DokumentId_Mitteilung='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND DokumentId_Mitteilung is null", "FMZOLL")
|
sql.doSQL("Update Speditionsbuch SET DokumentId_Mitteilung='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND DokumentId_Mitteilung is null", "FMZOLL")
|
||||||
doMailZollbeleg(destFull, "STB", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
If sendMail Then doMailZollbeleg(destFull, "STB", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
||||||
|
|
||||||
End Select
|
End Select
|
||||||
|
|
||||||
Case "EX431" 'AVM --> EZoll Anhänge & Mail senden
|
|
||||||
|
'Select Case art
|
||||||
|
' Case "NCTS" : SPEDBUCH.AtlasBezNrNCTS = LRN
|
||||||
|
' Case "AES" : SPEDBUCH.AtlasBezNrAES = LRN
|
||||||
|
' Case Else : SPEDBUCH.AtlasBezNrEZA = LRN
|
||||||
|
'End Select
|
||||||
|
|
||||||
|
Case "EX431", "CC599C" '-> Ausgangsvermerk 'AVM --> EZoll Anhänge & Mail senden
|
||||||
'AES Stuff....
|
'AES Stuff....
|
||||||
DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "AES", SPEDBUCH_TMP) 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
If DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "AES", SPEDBUCH_TMP) And Not sendMail Then
|
||||||
sql.doSQL("Update Speditionsbuch SET [DokumentId_AVM]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND DokumentId_AVM is null", "FMZOLL")
|
addTODatatable(dtSPEDEintrageAusEinarbeitung_HISTORY, cDHF_Anhaenge, SPEDBUCH_TMP, datum)
|
||||||
|
End If 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
||||||
|
sql.doSQL("Update Speditionsbuch SET [DokumentId_AVM]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrAES='" & cDHF_Anhaenge.LRN & "' AND DokumentId_AVM is null", "FMZOLL")
|
||||||
|
|
||||||
If destFull <> "" AndAlso SPEDBUCH_TMP IsNot Nothing AndAlso SPEDBUCH_TMP.SendungID IsNot Nothing Then
|
If destFull <> "" AndAlso SPEDBUCH_TMP IsNot Nothing AndAlso SPEDBUCH_TMP.SendungID IsNot Nothing Then
|
||||||
doMailZollbeleg(destFull, "AVM", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
If sendMail Then doMailZollbeleg(destFull, "AVM", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
||||||
End If
|
End If
|
||||||
|
|
||||||
End Select
|
End Select
|
||||||
@@ -1055,6 +1111,18 @@ Public Class frmStartOptions
|
|||||||
End If
|
End If
|
||||||
Next
|
Next
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
If dtSPEDEintrageAusEinarbeitung_HISTORY.Rows.Count > 0 Then
|
||||||
|
|
||||||
|
Dim filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtSPEDEintrageAusEinarbeitung_HISTORY,,,,, False)
|
||||||
|
If filepath <> "" Then
|
||||||
|
Dim anhenge As New List(Of String)
|
||||||
|
anhenge.Add(filepath)
|
||||||
|
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("d.breimaier@verag.ag", "E-ZOLL nachträgliche Einarbeitung", "Im Anhang befinden sich die Speditionsbucheintrag, die bei der nachträglichen Einarbeitung angelegt wurden: " & vbNewLine & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag", anhenge)
|
||||||
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
End If
|
||||||
Return True
|
Return True
|
||||||
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
@@ -3932,10 +4000,6 @@ Public Class frmStartOptions
|
|||||||
Me.Visible = True
|
Me.Visible = True
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub LinkLabel25_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel25.LinkClicked
|
|
||||||
importFileFromEZOLL(If(CheckBox2.Checked, Now.AddDays(-7), If(CheckBox3.Checked, Now.AddMonths(-1), Now)))
|
|
||||||
End Sub
|
|
||||||
|
|
||||||
Private Sub Button1_Click(sender As Object, e As EventArgs)
|
Private Sub Button1_Click(sender As Object, e As EventArgs)
|
||||||
For Each d In System.IO.Directory.GetDirectories(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\Nachrichtendaten_Ablage\2019")
|
For Each d In System.IO.Directory.GetDirectories(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\Nachrichtendaten_Ablage\2019")
|
||||||
Dim fid As New FileInfo(d)
|
Dim fid As New FileInfo(d)
|
||||||
@@ -4475,11 +4539,25 @@ Public Class frmStartOptions
|
|||||||
|
|
||||||
Private Sub lblEZOLLDat_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles lblEZOLLDat.LinkClicked
|
Private Sub lblEZOLLDat_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles lblEZOLLDat.LinkClicked
|
||||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
||||||
Dim bool = importFileFromEZOLL(txtEZOLLAnhDat._value)
|
|
||||||
|
If cbxEZOLLUNISPED.Checked Then
|
||||||
|
|
||||||
|
Dim f = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||||
|
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED"
|
||||||
|
Dim bool = importFileFromEZOLL(txtEZOLLAnhDat._value, cbxSendEZOLL_INFO.Checked)
|
||||||
showPic(bool, piceZollAnh)
|
showPic(bool, piceZollAnh)
|
||||||
|
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = f
|
||||||
|
|
||||||
|
Else
|
||||||
|
Dim bool = importFileFromEZOLL(txtEZOLLAnhDat._value, cbxSendEZOLL_INFO.Checked)
|
||||||
|
showPic(bool, piceZollAnh)
|
||||||
|
|
||||||
|
End If
|
||||||
|
|
||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub CheckBox2_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox2.CheckedChanged
|
Private Sub CheckBox2_CheckedChanged(sender As Object, e As EventArgs)
|
||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
@@ -5097,13 +5175,6 @@ Public Class frmStartOptions
|
|||||||
Me.Cursor = Cursors.Default
|
Me.Cursor = Cursors.Default
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub LinkLabel48_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel48.LinkClicked
|
|
||||||
Dim f = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
|
||||||
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED"
|
|
||||||
importFileFromEZOLL(If(CheckBox2.Checked, Now.AddDays(-7), If(CheckBox3.Checked, Now.AddMonths(-1), Now)))
|
|
||||||
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = f
|
|
||||||
End Sub
|
|
||||||
|
|
||||||
Private Function checkTestsystemSettings() As Boolean
|
Private Function checkTestsystemSettings() As Boolean
|
||||||
Dim check As Boolean = False
|
Dim check As Boolean = False
|
||||||
If cbxTestFTP.Checked And Not cbxTestsystem.Checked Then
|
If cbxTestFTP.Checked And Not cbxTestsystem.Checked Then
|
||||||
@@ -7625,4 +7696,12 @@ repeatRequest:
|
|||||||
|
|
||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
Private Sub Button31_Click(sender As Object, e As EventArgs) Handles btnEZOLL_7days.Click
|
||||||
|
txtEZOLLAnhDat._value = Now().AddDays(-7).ToShortDateString
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
Private Sub Button32_Click(sender As Object, e As EventArgs) Handles btnEZOLL_1month.Click
|
||||||
|
txtEZOLLAnhDat._value = Now().AddMonths(-1).ToShortDateString
|
||||||
|
End Sub
|
||||||
End Class
|
End Class
|
||||||
Reference in New Issue
Block a user