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

neu

Browse Source
This commit is contained in:
Andreas Luxbauer
2019-09-10 13:51:31 +02:00
parent 8f8b0f4252
commit 021cce6f04
48 changed files with 6001 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb
View File

@@ -293,6 +293,10 @@ Public Class cADMIN
End Using
Return "0"
End Function
Public Function getPwdFromUsrname(ByVal user As String, ByVal firma As String) As String
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Return SQL.getValueTxtBySql("SELECT mit_pwd FROM tblMitarbeiter where mit_username='" & user & "' COLLATE Latin1_General_CS_AS AND (mit_firma='" & firma & "' OR mit_firma='ALL' ) ", "ADMIN")
End Function
Public Function checkLogin(ByVal user As String, ByVal pwd As String, ByVal firma As String) As Boolean
@@ -381,6 +385,12 @@ Public Class cADMIN
Public Function getUstName_ByAD(Domain As String, User As String) As String
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Return SQL.getValueTxtBySql("SELECT TOP 1 [mit_username] FROM [tblMitarbeiter] WHERE [mit_AliasAD_Domain]='" & Domain & "' AND [mit_AliasAD_Username]='" & User & "'", "ADMIN")
End Function
Public Function getBezById(id As Integer) As String
Dim sql As String = "SELECT Firma_Bez FROM tblFirma WHERE Firma_ID=@id "

12
VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/frmPDFScanList.Designer.vb generated
View File

@@ -53,7 +53,7 @@ Partial Class frmPDFScanList
Me.FlowLayoutPanel.Margin = New System.Windows.Forms.Padding(1)
Me.FlowLayoutPanel.MaximumSize = New System.Drawing.Size(200, 500)
Me.FlowLayoutPanel.Name = "FlowLayoutPanel"
Me.FlowLayoutPanel.Size = New System.Drawing.Size(200, 24)
Me.FlowLayoutPanel.Size = New System.Drawing.Size(200, 14)
Me.FlowLayoutPanel.TabIndex = 1
'
'cntxtMulti
@@ -114,7 +114,7 @@ Partial Class frmPDFScanList
Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top
Me.pnlTop.Location = New System.Drawing.Point(0, 0)
Me.pnlTop.Name = "pnlTop"
Me.pnlTop.Size = New System.Drawing.Size(205, 20)
Me.pnlTop.Size = New System.Drawing.Size(222, 20)
Me.pnlTop.TabIndex = 4
'
'lblDateien
@@ -135,7 +135,7 @@ Partial Class frmPDFScanList
Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.FlatButton1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.FlatButton1.ForeColor = System.Drawing.Color.White
Me.FlatButton1.Location = New System.Drawing.Point(177, 0)
Me.FlatButton1.Location = New System.Drawing.Point(194, 0)
Me.FlatButton1.Name = "FlatButton1"
Me.FlatButton1.Size = New System.Drawing.Size(26, 20)
Me.FlatButton1.TabIndex = 0
@@ -148,7 +148,7 @@ Partial Class frmPDFScanList
Me.listlOld.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.listlOld.Dock = System.Windows.Forms.DockStyle.Bottom
Me.listlOld.FlowDirection = System.Windows.Forms.FlowDirection.TopDown
Me.listlOld.Location = New System.Drawing.Point(0, 59)
Me.listlOld.Location = New System.Drawing.Point(0, 49)
Me.listlOld.Margin = New System.Windows.Forms.Padding(1)
Me.listlOld.MaximumSize = New System.Drawing.Size(200, 200)
Me.listlOld.MinimumSize = New System.Drawing.Size(2, 10)
@@ -163,9 +163,9 @@ Partial Class frmPDFScanList
Me.pnlOldHeader.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.pnlOldHeader.Controls.Add(Me.Label1)
Me.pnlOldHeader.Dock = System.Windows.Forms.DockStyle.Bottom
Me.pnlOldHeader.Location = New System.Drawing.Point(0, 44)
Me.pnlOldHeader.Location = New System.Drawing.Point(0, 34)
Me.pnlOldHeader.Name = "pnlOldHeader"
Me.pnlOldHeader.Size = New System.Drawing.Size(205, 15)
Me.pnlOldHeader.Size = New System.Drawing.Size(222, 15)
Me.pnlOldHeader.TabIndex = 6
Me.pnlOldHeader.Visible = False
'

2
VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb
View File

@@ -154,7 +154,7 @@ Public Class cAdressen
Return False
End If
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM Adressen /*WITH(updlock,serializable)*/ WHERE AdressenNr=@AdressenNr) " &
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM Adressen WHERE AdressenNr=@AdressenNr) " &
" BEGIN " & getUpdateCmd() & " END " &
" Else " &
" BEGIN " & getInsertCmd() & " END " &

163
VERAG_PROG_ALLGEMEIN/Classes/cAvisoAnhaenge.vb Normal file
View File

@@ -0,0 +1,163 @@
Imports System.Data.SqlClient
Imports System.Reflection
Public Class cAvisoAnhaenge
Property anh_id As Integer
Property anh_AvisoId As Integer
Property anh_SendungsId As Object = Nothing
Property anh_Name As String
Property anh_docId As Integer
Property anh_Art As Object = Nothing
Property anh_Typ As String
Property anh_Reihenfolge As Integer = 99
Public hasEntry As Boolean = False
Dim SQL As New SQL
Sub New()
End Sub
Sub New(anh_id)
If anh_id IsNot Nothing Then
Me.anh_id = anh_id
LOAD()
End If
End Sub
Sub New(anh_AvisoId, anh_Name, anh_docId, anh_Art, anh_Typ, Optional anh_SendungsId = Nothing, Optional anh_Reihenfolge = 99)
Me.anh_AvisoId = anh_AvisoId
Me.anh_SendungsId = anh_SendungsId
Me.anh_Name = anh_Name
Me.anh_docId = anh_docId
Me.anh_Art = anh_Art
Me.anh_Typ = anh_Typ
Me.anh_Reihenfolge = anh_Reihenfolge
End Sub
Public Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_id", anh_id, , True, True))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_AvisoId", anh_AvisoId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_SendungsId", anh_SendungsId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_Name", anh_Name))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_docId", anh_docId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_Art", anh_Art))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_Typ", anh_Typ))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_Reihenfolge", anh_Reihenfolge))
Return list
End Function
Shared Sub LOAD_LIST_ByAviso(ByRef ANH_LIST As List(Of cAvisoAnhaenge), anh_AvisoId As Integer)
If ANH_LIST Is Nothing Then ANH_LIST = New List(Of cAvisoAnhaenge)
ANH_LIST.Clear()
Dim SQL As New SQL
For Each r In SQL.loadDgvBySql("SELECT anh_id FROM tblAvisoAnhaenge WHERE anh_AvisoId=" & anh_AvisoId & " ORDER BY anh_Reihenfolge,anh_Name,anh_id", "AVISO").Rows
ANH_LIST.Add(New VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge(r("anh_id")))
Next
' If allowchangeCurrIndex Then CURRENT_INDEX = IIf(ANH_LIST.Count > 0, 0, -1)
End Sub
Shared Sub LOAD_LIST_BySendung(ByRef ANH_LIST As List(Of cAvisoAnhaenge), anh_SendungsId As Integer)
If ANH_LIST Is Nothing Then ANH_LIST = New List(Of cAvisoAnhaenge)
ANH_LIST.Clear()
Dim SQL As New SQL
For Each r In SQL.loadDgvBySql("SELECT anh_id FROM tblAvisoAnhaenge WHERE anh_SendungsId=" & anh_SendungsId & " ORDER BY anh_Reihenfolge,anh_Name,anh_id", "AVISO").Rows
ANH_LIST.Add(New VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge(r("anh_id")))
Next
' If allowchangeCurrIndex Then CURRENT_INDEX = IIf(ANH_LIST.Count > 0, 0, -1)
End Sub
Public Function SAVE(Optional errHinweis = "") As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblAvisoAnhaenge WITH(updlock,serializable) WHERE anh_id=@anh_id) " &
" BEGIN " & getUpdateCmd() & " END " &
" Else " &
" BEGIN " & getInsertCmd() & " END " &
" commit tran "
anh_id = SQL.doSQLVarListID(anh_id, sqlstr, "AVISO", , list,, errHinweis)
Return anh_id > 0
End Function
Public Sub LOAD()
Try
Using conn As SqlConnection = SQL.GetNewOpenConnectionAVISO()
Using cmd As New SqlCommand("SELECT * FROM tblAvisoAnhaenge WHERE anh_id=@anh_id ", conn)
cmd.Parameters.AddWithValue("@anh_id", anh_id)
Dim dr = cmd.ExecuteReader()
If dr.Read Then
For Each l In getParameterList()
Dim propInfo As PropertyInfo = Me.GetType.GetProperty(l.Scalarvariable)
If dr.Item(l.Text) Is DBNull.Value Then
propInfo.SetValue(Me, Nothing)
Else
propInfo.SetValue(Me, dr.Item(l.Text))
End If
hasEntry = True
Next
End If
dr.Close()
End Using
End Using
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
End Sub
Public Function getUpdateCmd() As String
Try
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim str As String = ""
For Each i In list
If Not i.isPrimaryParam Then
str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
End If
Next
str = str.Substring(0, str.Length - 1) 'wg. ','
Return (" UPDATE [tblAvisoAnhaenge] SET " & str & " WHERE anh_id=@anh_id ")
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
Return ""
End Function
Public Function getInsertCmd() As String
Try
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim str As String = ""
Dim values As String = ""
For Each i In list
If Not i.isPrimaryParam Then
str &= "[" & i.Text & "],"
values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
End If
Next
str = str.Substring(0, str.Length - 1) 'wg. ','
values = values.Substring(0, values.Length - 1) 'wg. ','
Return (" INSERT INTO tblAvisoAnhaenge (" & str & ") VALUES(" & values & ") ")
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
Return ""
End Function
Public Function DELETE() As Boolean 'obj As Object, tablename As String, where As String) As Boolean
Dim sqlstr = " DELETE FROM [tblAvisoAnhaenge] WITH(updlock,serializable) WHERE anh_id=" & Me.anh_id
Return SQL.doSQL(sqlstr, "AVISO")
End Function
Public Shared Function DELETE(id As Integer) As Boolean 'obj As Object, tablename As String, where As String) As Boolean
Dim sqlstr = " DELETE FROM [tblAvisoAnhaenge] WITH(updlock,serializable) WHERE anh_id=" & id
Return (New VERAG_PROG_ALLGEMEIN.SQL).doSQL(sqlstr, "AVISO")
End Function
End Class

3
VERAG_PROG_ALLGEMEIN/Classes/cBonitaetsauskunft.vb
View File

@@ -24,7 +24,7 @@ Public Class cBonitaetsauskunft
Property ba_Zahlungsweise As Object = Nothing
Property ba_GFName As Object = Nothing
Property ba_Sonstiges As Object = Nothing
Property ba_Risikostufe As Object = Nothing
Dim SQL As New SQL
@@ -59,6 +59,7 @@ Public Class cBonitaetsauskunft
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_Zahlungsweise", ba_Zahlungsweise))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_GFName", ba_GFName))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_Sonstiges", ba_Sonstiges))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_Risikostufe", ba_Risikostufe))
Return list
End Function

2
VERAG_PROG_ALLGEMEIN/Classes/cKunde.vb
View File

@@ -235,7 +235,7 @@ Public Class cKunde
MsgBox("Fehler: KundenNr <= 0!")
Return False
End If
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM Kunden /*WITH(updlock,serializable)*/ WHERE KundenNr=@KundenNr) " &
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM Kunden WHERE KundenNr=@KundenNr) " &
" BEGIN " & getUpdateCmd() & " END " &
" Else " &
" BEGIN " & getInsertCmd() & " END " &

4
VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
View File

@@ -42,6 +42,7 @@ Public Class cKundenErweitert
Property Zahlungsziel3 As Object = Nothing
Property EmailAnkunft_Export As Boolean = False
Property EmailFreigabe_Export As Boolean = False
Property kde_BonitaetsStufe As Object = Nothing
@@ -88,6 +89,7 @@ Public Class cKundenErweitert
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Zahlungsziel3", Zahlungsziel3))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("EmailAnkunft_Export", EmailAnkunft_Export))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("EmailFreigabe_Export", EmailFreigabe_Export))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_BonitaetsStufe", kde_BonitaetsStufe))
Return list
End Function
@@ -97,7 +99,7 @@ Public Class cKundenErweitert
Public Function SAVE() As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblKundenErweitert WITH(updlock,serializable) WHERE kde_KundenNr=@kde_KundenNr) " &
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblKundenErweitert WHERE kde_KundenNr=@kde_KundenNr) " &
" BEGIN " & getUpdateCmd() & " END " &
" Else " &
" BEGIN " & getInsertCmd() & " END " &

20
VERAG_PROG_ALLGEMEIN/Classes/cKundenKontakte.vb
View File

@@ -163,7 +163,7 @@ Public Class cKundenKontakte
Public Function SAVE() As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblKundenKontakt WITH(updlock,serializable) WHERE kkd_id=@kkd_id) " &
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblKundenKontakt WHERE kkd_id=@kkd_id) " &
" BEGIN " & getUpdateCmd() & " END " &
" Else " &
" BEGIN " & getInsertCmd() & " END " &
@@ -237,4 +237,22 @@ Public Class cKundenKontakte
End If
Return ""
End Function
Shared Function getKdNrFromMailAdress(KMail As String, Optional serchInKd As Boolean = True) As Integer
getKdNrFromMailAdress = -1
If KMail = "" Then Return -1
If Not KMail.Contains("@") Then Return -1
Dim SQL As New SQL
getKdNrFromMailAdress = SQL.getValueTxtBySql("SELECT TOP 1 [kkd_KundenNr] FROM [tblKundenKontakt] where kkd_Email LIKE ('%" & KMail & "%') AND kkd_kkaBez='OUTLOOK_AVISO_Eingang'", "FMZOLL",,, -1)
If serchInKd AndAlso getKdNrFromMailAdress < 0 Then
getKdNrFromMailAdress = SQL.getValueTxtBySql("SELECT TOP 1 AdressenNr FROM Adressen WHERE [E-Mail] LIKE ('%" & KMail & "%') ", "FMZOLL",,, -1)
If getKdNrFromMailAdress < 0 Then
Dim sp = KMail.Split("@")
getKdNrFromMailAdress = SQL.getValueTxtBySql("SELECT TOP 1 AdressenNr FROM Adressen WHERE [E-Mail] LIKE ('%" & sp(1) & "%') ", "FMZOLL",,, -1)
End If
End If
End Function
End Class

4
VERAG_PROG_ALLGEMEIN/Classes/cKundenVermerk.vb
View File

@@ -191,7 +191,7 @@ Public Class cKundenVermerkItem
Public Function SAVE() As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblKundenVermerke WITH(updlock,serializable) WHERE kvm_id=@kvm_id) " &
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblKundenVermerke WHERE kvm_id=@kvm_id) " &
" BEGIN " & getUpdateCmd() & " END " &
" Else " &
" BEGIN " & getInsertCmd() & " END " &
@@ -203,7 +203,7 @@ Public Class cKundenVermerkItem
Public Function DELETE() As Boolean 'obj As Object, tablename As String, where As String) As Boolean
Dim sqlstr = " DELETE FROM [tblKundenVermerke] WITH(updlock,serializable) WHERE kvm_id=" & Me.kvm_id
Dim sqlstr = " DELETE FROM [tblKundenVermerke] WHERE kvm_id=" & Me.kvm_id
Return SQL.doSQL(sqlstr, "FMZOLL")
End Function

5
VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb
View File

@@ -48,6 +48,9 @@ Public Class cMitarbeiter
Property mit_TELOTEC_SB As Object = Nothing
Property mit_AliasAD_Domain As Object = Nothing
Property mit_AliasAD_Username As Object = Nothing
Sub New()
End Sub
@@ -116,6 +119,8 @@ Public Class cMitarbeiter
If Not dr.Item("mit_FirmenDatenAnzeige") Is DBNull.Value Then Me.mit_FirmenDatenAnzeige = dr.Item("mit_FirmenDatenAnzeige")
If Not dr.Item("mit_TELOTEC_SB") Is DBNull.Value Then Me.mit_TELOTEC_SB = dr.Item("mit_TELOTEC_SB")
If Not dr.Item("mit_AliasAD_Domain") Is DBNull.Value Then Me.mit_AliasAD_Domain = dr.Item("mit_AliasAD_Domain")
If Not dr.Item("mit_AliasAD_Username") Is DBNull.Value Then Me.mit_AliasAD_Username = dr.Item("mit_AliasAD_Username")

173
VERAG_PROG_ALLGEMEIN/Classes/cZollArtikel.vb Normal file
View File

@@ -0,0 +1,173 @@

Imports System.Data.SqlClient
Imports System.Reflection
Public Class cZollArtikel
Property zollArt_id As Integer
Property KundenNr As Integer
Property zollArt_Teilsatzschluessel As Object = Nothing
Property zollArt_Verarbeitungskennzeichen As Object = Nothing
Property zollArt_Artikelnummer As Object = Nothing
Property zollArt_Dynamische_Ergaenzung_1 As Object = Nothing
Property zollArt_Dynamische_Ergaenzung_2 As Object = Nothing
Property zollArt_Kundennummer As Object = Nothing
Property zollArt_Warencodenummer As Object = Nothing
Property zollArt_Zusatzcode_1 As Object = Nothing
Property zollArt_Zusatzcode_2 As Object = Nothing
Property zollArt_Kennzeichen_Gueltig As Object = Nothing
Property zollArt_Kurzbezeichnung As Object = Nothing
Property zollArt_Warenbeschreibung As Object = Nothing
Property zollArt_Statistische_Maßeinheit As Object = Nothing
Property zollArt_Statistische_Maßeinheit_Qualifikator As Object = Nothing
Property zollArt_Besondere_Maßeinheit As Object = Nothing
Property zollArt_Besondere_Maßeinheit_Qualifikator As Object = Nothing
Property zollArt_Gewicht As Object = Nothing
Property zollArt_Menge As Object = Nothing
Property Erfassungsdatum As Object = Nothing
Property Aenderungsdatum As Object = Nothing
Property Sachbearbeiter As Object = Nothing
Property zollArt_Status As Object = Nothing
Public hasEntry As Boolean = False
Dim SQL As New SQL
Sub New()
End Sub
Sub New(zollArt_id)
If zollArt_id IsNot Nothing Then
Me.zollArt_id = zollArt_id
LOAD()
End If
End Sub
Public Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_id", zollArt_id, , True, True))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KundenNr", KundenNr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_Teilsatzschluessel", zollArt_Teilsatzschluessel))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_Verarbeitungskennzeichen", zollArt_Verarbeitungskennzeichen))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_Artikelnummer", zollArt_Artikelnummer))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_Dynamische_Ergaenzung_1", zollArt_Dynamische_Ergaenzung_1))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_Dynamische_Ergaenzung_2", zollArt_Dynamische_Ergaenzung_2))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_Kundennummer", zollArt_Kundennummer))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_Warencodenummer", zollArt_Warencodenummer))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_Zusatzcode_1", zollArt_Zusatzcode_1))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_Zusatzcode_2", zollArt_Zusatzcode_2))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_Kennzeichen_Gueltig", zollArt_Kennzeichen_Gueltig))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_Kurzbezeichnung", zollArt_Kurzbezeichnung))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_Warenbeschreibung", zollArt_Warenbeschreibung))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_Statistische_Maßeinheit", zollArt_Statistische_Maßeinheit))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_Statistische_Maßeinheit_Qualifikator", zollArt_Statistische_Maßeinheit_Qualifikator))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_Besondere_Maßeinheit", zollArt_Besondere_Maßeinheit))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_Besondere_Maßeinheit_Qualifikator", zollArt_Besondere_Maßeinheit_Qualifikator))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_Gewicht", zollArt_Gewicht))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_Menge", zollArt_Menge))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Erfassungsdatum", Erfassungsdatum))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Aenderungsdatum", Aenderungsdatum))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Sachbearbeiter", Sachbearbeiter))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zollArt_Status", zollArt_Status))
Return list
End Function
Public Function SAVE(Optional errHinweis = "") As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblZollArtikel WHERE zollArt_id=@zollArt_id) " &
" BEGIN " & getUpdateCmd() & " End " &
" Else " &
" BEGIN " & getInsertCmd() & " End " &
" commit tran "
zollArt_id = SQL.doSQLVarListID(zollArt_id, sqlstr, "FMZOLL", , list,, errHinweis)
Return zollArt_id > 0
End Function
Public Sub LOAD()
Try
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("Select * FROM tblZollArtikel WHERE zollArt_id=@zollArt_id ", conn)
cmd.Parameters.AddWithValue("@zollArt_id", zollArt_id)
Dim dr = cmd.ExecuteReader()
If dr.Read Then
For Each l In getParameterList()
Dim propInfo As PropertyInfo = Me.GetType.GetProperty(l.Scalarvariable)
If dr.Item(l.Text) Is DBNull.Value Then
propInfo.SetValue(Me, Nothing)
Else
propInfo.SetValue(Me, dr.Item(l.Text))
End If
hasEntry = True
Next
End If
dr.Close()
End Using
End Using
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
End Sub
Public Function getUpdateCmd() As String
Try
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim str As String = ""
For Each i In list
If Not i.isPrimaryParam Then
str &= "" & i.Text & " = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
End If
Next
str = str.Substring(0, str.Length - 1) 'wg. ','
Return (" UPDATE tblZollArtikel SET " & str & " WHERE zollArt_id=@zollArt_id ")
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
Return ""
End Function
Public Function getInsertCmd() As String
Try
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim str As String = ""
Dim values As String = ""
For Each i In list
If Not i.isPrimaryParam Then
str &= "" & i.Text & ","
values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
End If
Next
str = str.Substring(0, str.Length - 1) 'wg. ','
values = values.Substring(0, values.Length - 1) 'wg. ','
Return (" INSERT INTO tblZollArtikel (" & str & ") VALUES(" & values & ") ")
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
Return ""
End Function
Public Function DELETE() As Boolean 'obj As Object, tablename As String, where As String) As Boolean
Dim sqlstr = " DELETE FROM tblZollArtikel WITH(updlock,serializable) WHERE zollArt_id=" & Me.zollArt_id
Return SQL.doSQL(sqlstr, "FMZOLL")
End Function
Public Shared Function DELETE(id As Integer) As Boolean
Dim SQL As New SQL
Dim sqlstr = " DELETE FROM tblZollArtikel WHERE zollArt_id=" & id
Return SQL.doSQL(sqlstr, "FMZOLL")
End Function
End Class

15
VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
View File

@@ -212,7 +212,6 @@ Public Class cDATENSERVER
Return (destpath <> "")
End If
Return ""
End Function
Public Function insertDataToDATENSERVER(srcPath, Optional bezeichnung = "", Optional endung = "", Optional allowMsg = True, Optional coll_archiv = False) As Boolean
@@ -443,7 +442,7 @@ Public Class cDATENSERVER
' End Try
'End Function
Public Sub DELETE_COMPLETE()
Public Function DELETE_COMPLETE() As Boolean
Try
If DATA_LIST.DELETE_ALL() Then
' Dim path = SQL.getValueTxtBySql("SELECT TOP 1 isnull([coll_pfad],'') FROM [tblDatenarchiv] INNER JOIN [tblDatenarchiv_Collection] ON [da_id]=[coll_daId] WHERE da_id='" & da_id & "' ", "FMZOLL")
@@ -455,8 +454,11 @@ Public Class cDATENSERVER
'SQL.doSQL("DELETE FROM [tblDatenarchiv_Collection] WHERE [coll_daId]=" & id & " ", "FMZOLL")
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
Return False
End Try
End Sub
Return True
End Function
@@ -1156,7 +1158,9 @@ Public Class cDatenarchiv_Collection
If coll_pfad.Contains("\\192.168.0.91\DATENARCHIV\") Then 'Um sicher zu gehen, dass der pfad im richtigem VZ ist.
If My.Computer.FileSystem.FileExists(coll_pfad) Then
saveFileToDel(coll_pfad)
IO.File.Delete(coll_pfad)
Try
IO.File.Delete(coll_pfad)
Catch : End Try
Return SQL.doSQL("DELETE FROM [tblDatenarchiv_Collection] WHERE [coll_id]=" & coll_id & " ", "FMZOLL")
Else
Return True
@@ -1286,7 +1290,7 @@ Public Class cDatenserverIDCollectionList
LIST.Clear()
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
'Using cmd As New SqlCommand("SELECT coll_id, coll_daId, da_pfad, da_name FROM tblDatenarchiv_Collection INNER JOIN tblDatenarchiv ON coll_daId=da_id WHERE coll_id=@coll_id ", conn)
Using cmd As New SqlCommand("SELECT coll_id, coll_daId, coll_pfad, coll_bezeichnung,coll_info,coll_archiv FROM tblDatenarchiv_Collection WHERE coll_daId=@coll_daId ", conn)
Using cmd As New SqlCommand("SELECT coll_id, coll_daId, coll_pfad, coll_bezeichnung,coll_info,coll_archiv FROM tblDatenarchiv_Collection WHERE coll_daId=@coll_daId order by coll_bezeichnung ", conn)
cmd.Parameters.AddWithValue("@coll_daId", Me.coll_daId)
Dim dr = cmd.ExecuteReader()
'LIST = New List(Of cDatenarchiv_Collection)
@@ -1423,6 +1427,7 @@ Public Class DATENVERVER_OPTIONS
Shared Function getTMPPath(name As String, extension As String, Optional special As Boolean = False, Optional delete As Boolean = True, Optional unterOrdner As String = "") As String
Dim TMP_PATH2 = TMP_PATH & If(unterOrdner <> "", "\" & unterOrdner & "\", "")
TMP_PATH2 = TMP_PATH2.replace("\\", "\")
If Not My.Computer.FileSystem.DirectoryExists(TMP_PATH2) Then
My.Computer.FileSystem.CreateDirectory(TMP_PATH2)
End If

2694
VERAG_PROG_ALLGEMEIN/Schnittstellen/VERAG/OUT_NCTS/VERAG_out_ncts.Designer.vb generated Normal file
View File

File diff suppressed because it is too large Load Diff

130
VERAG_PROG_ALLGEMEIN/Schnittstellen/VERAG/OUT_NCTS/VERAG_out_ncts.xsd Normal file
View File

@@ -0,0 +1,130 @@
<?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_out_ncts">
<xs:complexType>
<xs:sequence>
<xs:element name="Version"/>
<xs:element name="Company"/>
<xs:element name="Department" minOccurs="0"/>
<xs:element name="InternalReference" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="OfficeCode"/>
<xs:element name="PositionNumber"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ProcessData">
<xs:complexType>
<xs:sequence>
<xs:element name="Status"/>
<xs:element name="TransactionDate"/>
<xs:element name="MRN"/>
<xs:element name="ReferenzNumber"/>
<xs:element name="ProcedureCode"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="NCTS_Data">
<xs:complexType>
<xs:sequence>
<xs:element name="DatDeterminationLimit" type="xs:date"/>
<xs:element name="LicensePlate"/>
<xs:element name="DepartureCustomsOffice"/>
<xs:element name="DestinationCustomsOffice"/>
<xs:element name="DepartureCountry"/>
<xs:element name="DestinationCountry"/>
<xs:element name="Sender" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="Name"/>
<xs:element name="Adress" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="Country" minOccurs="0"/>
<xs:element name="Postcode" minOccurs="0"/>
<xs:element name="City" minOccurs="0"/>
<xs:element name="Street" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="EORI"/>
<xs:element name="EORI_NL"/>
<xs:element name="UID_Nr" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Consignee" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="Name"/>
<xs:element name="Adress" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="Country" minOccurs="0"/>
<xs:element name="Postcode" minOccurs="0"/>
<xs:element name="City" minOccurs="0"/>
<xs:element name="Street" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="EORI"/>
<xs:element name="EORI_NL"/>
<xs:element name="UID_Nr" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Carrier" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="Name"/>
<xs:element name="Adress" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="Country" minOccurs="0"/>
<xs:element name="Postcode" minOccurs="0"/>
<xs:element name="City" minOccurs="0"/>
<xs:element name="Street" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="EORI"/>
<xs:element name="EORI_NL"/>
<xs:element name="UID_Nr" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Garantee" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="GRN"/>
<xs:element name="Amount"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="SumGrossWeight" type="xs:decimal" minOccurs="0"/>
<xs:element name="Position" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="Position" maxOccurs="999">
<xs:complexType>
<xs:sequence>
<xs:element name="PosNr"/>
<xs:element name="Quantity" minOccurs="0"/>
<xs:element name="Packaging" minOccurs="0"/>
<xs:element name="GoodsDescription" minOccurs="0"/>
<xs:element name="GrossWeight" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>

7
VERAG_PROG_ALLGEMEIN/Schnittstellen/VERAG/cVERAG_OUT_NCTS.vb Normal file
View File

@@ -0,0 +1,7 @@
Public Class cVERAG_OUT_NCTS
Shared Function genVERAG_OUT_NCTS_FromDAKOSY(DY_BezugsNr)
Dim OUT As New cVERAG_OUT_NCTS
Dim DY As New DateTimeKind
End Function
End Class

16
VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
View File

@@ -73,7 +73,8 @@
<Reference Include="Ghostscript.NET">
<HintPath>..\..\..\dll\Ghostscript.NET.dll</HintPath>
</Reference>
<Reference Include="itextsharp">
<Reference Include="itextsharp, Version=5.5.5.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\dll\itextsharp.dll</HintPath>
</Reference>
<Reference Include="McDull.Windows.Forms">
@@ -105,6 +106,12 @@
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Viscomsoft.PDFViewer">
<HintPath>C:\Program Files (x86)\Viscomsoft .NET PDF Viewer SDK\Examples\VB.NET2010\Viewer\lib\Viscomsoft.PDFViewer.dll</HintPath>
</Reference>
<Reference Include="ViscomsoftPDFCore">
<HintPath>C:\Program Files (x86)\Viscomsoft .NET PDF Viewer SDK\Examples\VB.NET2010\Viewer\lib\ViscomsoftPDFCore.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Import Include="Microsoft.VisualBasic" />
@@ -271,6 +278,7 @@
<Compile Include="cErrorHandler.vb" />
<Compile Include="Classes\cAbfertigungsarten.vb" />
<Compile Include="Classes\cAbgaben.vb" />
<Compile Include="Classes\cAvisoAnhaenge.vb" />
<Compile Include="Classes\cBonitaetsauskunft.vb" />
<Compile Include="Classes\cDHF_Anhaenge.vb" />
<Compile Include="Classes\cEZB_Waehrungskurse.vb" />
@@ -298,6 +306,7 @@
<Compile Include="Classes\cVorauskasse.vb" />
<Compile Include="Classes\cWarenbezeichnungBegriffe.vb" />
<Compile Include="Classes\cZkteing.vb" />
<Compile Include="Classes\cZollArtikel.vb" />
<Compile Include="Classes\SendFileTo.vb" />
<Compile Include="cProgramFunktions.vb" />
<Compile Include="DATENSERVER\cDATENSERVER.vb" />
@@ -372,6 +381,8 @@
</Compile>
<Compile Include="Schnittstellen\cDVO_Interface.vb" />
<Compile Include="Schnittstellen\cSyska_Interface.vb" />
<Compile Include="Schnittstellen\VERAG\cVERAG_OUT_NCTS.vb" />
<Compile Include="Schnittstellen\VERAG\OUT_NCTS\VERAG_out_ncts.Designer.vb" />
<Compile Include="Web References\UIDPruefung\Reference.vb">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -446,6 +457,9 @@
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
</None>
<None Include="App.config" />
<None Include="Schnittstellen\VERAG\OUT_NCTS\VERAG_out_ncts.xsd">
<SubType>Designer</SubType>
</None>
<None Include="Web References\UIDPruefung\checkVatService.wsdl" />
<None Include="Web References\UIDPruefung\matchCode.datasource">
<DependentUpon>Reference.map</DependentUpon>

29
VERAG_PROG_ALLGEMEIN/frmScan.Designer.vb generated
View File

@@ -22,6 +22,7 @@ Partial Class frmScan
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmScan))
Me.dsViewer = New Dynamsoft.Forms.DSViewer()
Me.btn = New System.Windows.Forms.Button()
@@ -56,6 +57,7 @@ Partial Class frmScan
Me.tbxCurrentImageIndex = New System.Windows.Forms.Label()
Me.tbxTotalImageNum = New System.Windows.Forms.Label()
Me.pnl = New System.Windows.Forms.Panel()
Me.UsrcntlPDFScan1 = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
Me.grpFarbe.SuspendLayout()
Me.grpTyp.SuspendLayout()
Me.pnl.SuspendLayout()
@@ -67,7 +69,7 @@ Partial Class frmScan
Me.dsViewer.Location = New System.Drawing.Point(8, 11)
Me.dsViewer.Name = "dsViewer"
Me.dsViewer.RightToLeft = System.Windows.Forms.RightToLeft.No
Me.dsViewer.SelectionRectAspectRatio = 0.0R
Me.dsViewer.SelectionRectAspectRatio = 0R
Me.dsViewer.Size = New System.Drawing.Size(463, 626)
Me.dsViewer.TabIndex = 0
'
@@ -274,12 +276,16 @@ Partial Class frmScan
'
'tbxSaveFileName
'
Me.tbxSaveFileName._DateTimeOnly = False
Me.tbxSaveFileName._numbersOnly = False
Me.tbxSaveFileName._numbersOnlyKommastellen = ""
Me.tbxSaveFileName._Prozent = False
Me.tbxSaveFileName._ShortDateNew = False
Me.tbxSaveFileName._ShortDateOnly = False
Me.tbxSaveFileName._TimeOnly = False
Me.tbxSaveFileName._value = Nothing
Me.tbxSaveFileName._Waehrung = False
Me.tbxSaveFileName._WaehrungZeichen = True
Me.tbxSaveFileName.ForeColor = System.Drawing.Color.Black
Me.tbxSaveFileName.Location = New System.Drawing.Point(536, 563)
Me.tbxSaveFileName.MaxLineLength = -1
@@ -426,6 +432,7 @@ Partial Class frmScan
'
'pnl
'
Me.pnl.Controls.Add(Me.UsrcntlPDFScan1)
Me.pnl.Controls.Add(Me.Label2)
Me.pnl.Controls.Add(Me.dsViewer)
Me.pnl.Controls.Add(Me.Button3)
@@ -454,6 +461,25 @@ Partial Class frmScan
Me.pnl.Size = New System.Drawing.Size(741, 683)
Me.pnl.TabIndex = 21
'
'UsrcntlPDFScan1
'
Me.UsrcntlPDFScan1._ARCHIV = False
Me.UsrcntlPDFScan1._DATENSERVER_KATEGORIE = "DOKUMENTE"
Me.UsrcntlPDFScan1._DATENSERVER_ORDNER = ""
Me.UsrcntlPDFScan1._DATENSERVER_UOrdner1 = ""
Me.UsrcntlPDFScan1._DATENSERVER_UOrdner2 = ""
Me.UsrcntlPDFScan1._DATENSERVER_UOrdner3 = ""
Me.UsrcntlPDFScan1._MULTI_FILES = False
Me.UsrcntlPDFScan1._TEXT_PDF = Nothing
Me.UsrcntlPDFScan1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
Me.UsrcntlPDFScan1.BackColor = System.Drawing.Color.White
Me.UsrcntlPDFScan1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.UsrcntlPDFScan1.Cursor = System.Windows.Forms.Cursors.Hand
Me.UsrcntlPDFScan1.Location = New System.Drawing.Point(344, 349)
Me.UsrcntlPDFScan1.Name = "UsrcntlPDFScan1"
Me.UsrcntlPDFScan1.Size = New System.Drawing.Size(8, 8)
Me.UsrcntlPDFScan1.TabIndex = 21
'
'frmScan
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -507,4 +533,5 @@ Partial Class frmScan
Friend WithEvents tbxCurrentImageIndex As System.Windows.Forms.Label
Friend WithEvents tbxTotalImageNum As System.Windows.Forms.Label
Friend WithEvents pnl As System.Windows.Forms.Panel
Friend WithEvents UsrcntlPDFScan1 As usrcntlPDFScan
End Class

4
VERAG_PROG_ALLGEMEIN/frmScan.vb
View File

@@ -557,7 +557,6 @@ Public Class frmScan
InitDefaultValueForTWAIN()
cboResolution.Text = 150
tbxSaveFileName.Text = DefaultFileName
Select Case ART
Case "DirectScan"
grpTyp.Visible = False
@@ -623,7 +622,10 @@ Public Class frmScan
btnScan.Enabled = True
cboSource.SelectedIndex = 0
End If
tbxSaveFileName.Text = DefaultFileName
End Sub
End Class