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

Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

Browse Source
This commit is contained in:
Andreas Luxbauer
2025-09-05 08:54:31 +02:00
parent 167c250ee8 116a2c0ff0
commit a0d040d545
17 changed files with 701 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
SDL/Fakturierung/cFakturierung.vb
View File

@@ -1878,7 +1878,7 @@ Public Class cFakturierung
Dim Paramslist As New cParameterList(VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID)
Dim enableZugpferd = Paramslist.GET_PARAMETER_VALUE_BOOL("ZUGFeRD")
If enableZugpferd Then
tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.addAttachementToPDF(tmpPath, createZUGFeRD(True, RECHNUNG))
tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.addAttachementToPDF(tmpPath, createZUGFeRD(True, RECHNUNG,), "ZUGFeRD-invoice.xml")
Else
Dim Zugferdpath = createZUGFeRD(True, RECHNUNG)
@@ -2088,10 +2088,13 @@ Public Class cFakturierung
'--------------------------------EINZELRECHNUNG-----------------------------------
'---------------------------------------------------------------------------------
Dim RECHNUNG_AD As cAdressen
Dim RECHNUNG_KD As cKunde
If RECHNUNG.RechnungsKundenNr > 0 Then
Dim RECHNUNG_AD As New VERAG_PROG_ALLGEMEIN.cAdressen(RECHNUNG.RechnungsKundenNr)
Dim RECHNUNG_KD As New VERAG_PROG_ALLGEMEIN.cKunde(RECHNUNG.RechnungsKundenNr)
RECHNUNG_AD = New VERAG_PROG_ALLGEMEIN.cAdressen(RECHNUNG.RechnungsKundenNr)
RECHNUNG_KD = New VERAG_PROG_ALLGEMEIN.cKunde(RECHNUNG.RechnungsKundenNr)
If RECHNUNG_KD.Zahlungsziel IsNot Nothing AndAlso IsNumeric(RECHNUNG_KD.Zahlungsziel) Then
ZZTage = RECHNUNG_KD.Zahlungsziel
@@ -2115,9 +2118,21 @@ Public Class cFakturierung
If RECHNUNG.Text IsNot Nothing Then desc.AddNote(RECHNUNG.Text.ToString, SubjectCodes.AAI)
desc.AddNote("Es bestehen Rabatt- und Bonusvereinbarungen.", SubjectCodes.AAK)
desc.SetBuyer(RECHNUNG.RechnungsName_1, RECHNUNG.RechnungsOrt, RECHNUNG.RechnungsOrt, RECHNUNG.RechnungsStraße, GetCountryCodeFromLandKZ(RECHNUNG.RechnungsLandKz, vatBuyer), IIf(Not IsDBNull(RECHNUNG.KundenNrZentrale), RECHNUNG.KundenNrZentrale, ""))
desc.SetSeller(FIRMA.Firma_Bez, FIRMA.Firma_Ort, FIRMA.Firma_Ort, FIRMA.Firma_Straße, GetCountryCodeFromLandKZ(FIRMA.Firma_LandKz, vatSeller))
Dim KundePLZ As String = ""
Dim KundeOrt As String = ""
If RECHNUNG_AD IsNot Nothing AndAlso RECHNUNG_AD.Postfach IsNot Nothing AndAlso RECHNUNG_AD IsNot Nothing Then
KundePLZ = RECHNUNG_AD.Postfach
KundeOrt = RECHNUNG_AD.PLZ
End If
desc.SetBuyer(RECHNUNG.RechnungsName_1, IIf(KundePLZ <> "", KundePLZ, RECHNUNG.RechnungsOrt), IIf(KundeOrt <> "", KundeOrt, RECHNUNG.RechnungsOrt), RECHNUNG.RechnungsStraße, GetCountryCodeFromLandKZ(RECHNUNG.RechnungsLandKz, vatBuyer), IIf(Not IsDBNull(RECHNUNG.KundenNrZentrale), RECHNUNG.KundenNrZentrale, ""))
Dim FirmaOrt = FIRMA.Firma_Ort
FirmaOrt = FirmaOrt.Replace(FIRMA.Firma_LandKz & "-" & FIRMA.Firma_PLZ & " ", "")
desc.SetSeller(FIRMA.Firma_Bez, FIRMA.Firma_PLZ, FirmaOrt, FIRMA.Firma_Straße, GetCountryCodeFromLandKZ(FIRMA.Firma_LandKz, vatSeller))
desc.AddSellerTaxRegistration(FIRMA.Firma_UID.ToString.Replace("UID: ", ""), TaxRegistrationSchemeID.VA)
' Optionally, to support Peppol-----------------------------
@@ -2354,9 +2369,25 @@ Public Class cFakturierung
End If
Dim FirmaOrt = FIRMA.Firma_Ort
FirmaOrt = FirmaOrt.Replace(FIRMA.Firma_LandKz & "-" & FIRMA.Firma_PLZ & " ", "")
desc.SetBuyer(ROW("RechnungsName 1") & " " & Rechnugnsname2, RechnungsOrt, RechnungsOrt, RechnungsStraße, GetCountryCodeFromLandKZ(RechnungsLandKz, vatBuyer), IIf(Not IsDBNull(ROW("RechnungsKundenNr")), ROW("RechnungsKundenNr"), ""))
desc.SetSeller(FIRMA.Firma_Bez, FIRMA.Firma_Ort, FIRMA.Firma_Ort, FIRMA.Firma_Straße, GetCountryCodeFromLandKZ(FIRMA.Firma_LandKz, vatSeller))
Dim KundePLZ As String = ""
Dim KundeOrt As String = ""
If RECHNUNG_AD IsNot Nothing AndAlso RECHNUNG_AD.Postfach IsNot Nothing AndAlso RECHNUNG_AD.PLZ IsNot Nothing AndAlso RECHNUNG_AD.Postfach <> "" AndAlso RECHNUNG_AD.PLZ <> "" Then
KundePLZ = RECHNUNG_AD.Postfach
KundeOrt = RECHNUNG_AD.PLZ
Else
KundePLZ = RechnungsOrt
KundeOrt = RechnungsOrt
End If
desc.SetBuyer(ROW("RechnungsName 1") & " " & Rechnugnsname2, KundePLZ, KundeOrt, RechnungsStraße, GetCountryCodeFromLandKZ(RechnungsLandKz, vatBuyer), IIf(Not IsDBNull(ROW("RechnungsKundenNr")), ROW("RechnungsKundenNr"), ""))
desc.SetSeller(FIRMA.Firma_Bez, FIRMA.Firma_PLZ, FirmaOrt, FIRMA.Firma_Straße, GetCountryCodeFromLandKZ(FIRMA.Firma_LandKz, vatSeller))
If FIRMA.Firma_Steuernummer IsNot Nothing Then desc.AddSellerTaxRegistration(FIRMA.Firma_Steuernummer, TaxRegistrationSchemeID.FC)
desc.AddSellerTaxRegistration(FIRMA.Firma_UID.ToString.Replace("UID: ", ""), TaxRegistrationSchemeID.VA)
@@ -4213,7 +4244,7 @@ Public Class cFakturierung
Dim Paramslist As New cParameterList(VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID)
Dim enableZugpferd = Paramslist.GET_PARAMETER_VALUE_BOOL("ZUGFeRD")
If enableZugpferd Then
tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.addAttachementToPDF(tmpPath, createZUGFeRD(False, Nothing, SammelrechnungsDT, , rpt))
tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.addAttachementToPDF(tmpPath, createZUGFeRD(False, Nothing, SammelrechnungsDT, , rpt), "ZUGFeRD-invoice.xml")
Else
Dim Zugferdpath = createZUGFeRD(False, Nothing, SammelrechnungsDT,, rpt)
If Zugferdpath IsNot Nothing AndAlso Zugferdpath <> "" Then
@@ -4883,7 +4914,7 @@ Public Class cFakturierung
Dim Paramslist As New cParameterList(VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID)
Dim enableZugpferd = Paramslist.GET_PARAMETER_VALUE_BOOL("ZUGFeRD")
If enableZugpferd Then
tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.addAttachementToPDF(tmpPath, createZUGFeRD(False, Nothing, dt, rpt))
tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.addAttachementToPDF(tmpPath, createZUGFeRD(False, Nothing, dt, rpt), "ZUGFeRD-invoice.xml")
Else
Dim Zugferdpath = createZUGFeRD(False, Nothing, dt, rpt)
If Zugferdpath IsNot Nothing AndAlso Zugferdpath <> "" Then

4
SDL/My Project/AssemblyInfo.vb
View File

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

10
SDL/My Project/Resources.Designer.vb generated
View File

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

3
SDL/My Project/Resources.resx
View File

@@ -958,4 +958,7 @@
<data name="Detailauswertung_divers" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Detailauswertung_divers.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="CBAM_Auswertung_GP" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\CBAM_Auswertung_GP.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>

BIN
SDL/Resources/CBAM_Auswertung_GP.xlsx Normal file
View File

Binary file not shown.

BIN
SDL/Resources/CBAM_GP.xlsx Normal file
View File

Binary file not shown.

2
SDL/SDL.vbproj
View File

@@ -4661,6 +4661,8 @@
<None Include="ClassDiagram1.cd" />
<None Include="PrivateCodeSignaturDaniel20240131.pfx" />
<None Include="Resources\Auswertung_divers.xlsx" />
<None Include="Resources\CBAM_Auswertung_GP.xlsx" />
<None Include="Resources\CBAM_GP.xlsx" />
<None Include="Resources\Detailauswertung_divers.xlsx" />
<None Include="Resources\FA_Graz_EV-Veranlagung_Muster.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

30
SDL/kunden/frmBonitätsverlauf.vb
View File

@@ -43,9 +43,10 @@ Public Class frmBonitätsverlauf
If KdSearchBox1.KdNr_value > 0 Then
With MyDatagridview1
Dim sqlstr As String = ""
Dim KD_ERW As New cKundenErweitert(KdSearchBox1.KdNr_value)
If KD_ERW.kde_CreditSaveId IsNot Nothing AndAlso KD_ERW.kde_CreditSaveId <> "" AndAlso newView Then
If KD_ERW.kde_CreditSaveId IsNot Nothing AndAlso KD_ERW.kde_CreditSaveId <> "" Then
Dim sqlIndex As String = ""
@@ -55,23 +56,18 @@ Public Class frmBonitätsverlauf
sqlIndex = "ba_CreditSaveBonitaetsIndex"
End If
sqlstr &= "SELECT *
FROM (
SELECT ba_Datum," & sqlIndex & " ,ba_GruendundsDatum,ba_Umsatz,ba_Mitarbeiter,ba_Hoechstkredit,ba_Sachbearbeiter,ba_Zahlungsweise,ba_GFName,ba_Risikostufe,ba_CreditSaveRisikoklasse,ba_Pruefungstool,ba_GSName,ba_Geschaeftszweck,ba_datenarchivId
FROM tblBonitaetsauskunft
WHERE ba_KundenNr = " & KdSearchBox1.KdNr_value & "
UNION ALL
Dim sqlNewViewAdd As String = " UNION ALL
SELECT
CAST(e.eventDate AS DATE) AS ba_Datum,MAX(e.crValue) AS " & sqlIndex & ",NULL AS ba_GruendundsDatum,NULL AS ba_Umsatz,NULL AS ba_Mitarbeiter,MAX(e.clValue) AS ba_Hoechstkredit,MAX(e.sachbearbeiter) AS ba_Sachbearbeiter,NULL AS ba_Zahlungsweise,NULL AS ba_GFName,NULL AS ba_Risikostufe,NULL AS ba_CreditSaveRisikoklasse,Source AS ba_Pruefungstool,NULL AS ba_GSName,NULL AS ba_Geschaeftszweck,NULL AS ba_datenarchivId
CAST(e.eventDate AS DATE) AS ba_Datum,MAX(e.crValue) AS " & sqlIndex & ",NULL AS ba_GruendundsDatum,NULL AS ba_Umsatz,NULL AS ba_Mitarbeiter,MAX(e.clValue) AS ba_Hoechstkredit,MAX(e.sachbearbeiter) AS ba_Sachbearbeiter,NULL AS ba_Zahlungsweise,NULL AS ba_GFName,NULL AS ba_Risikostufe,MAX(e.newRiskClass) AS ba_CreditSaveRisikoklasse,Source AS ba_Pruefungstool,NULL AS ba_GSName,NULL AS ba_Geschaeftszweck,NULL AS ba_datenarchivId
FROM (
SELECT
e.companyId,
e.portfolioId,
e.eventDate,
e.sachbearbeiter,
CASE WHEN e.localEventCode = 'CR' OR e.globalEventCode = 'CR' THEN e.newValueCR ELSE 0 END AS crValue,
e.newRiskClass,
CASE WHEN e.localEventCode = 'CR' OR e.globalEventCode = 'CR' THEN " & IIf(Not KD_ERW.kde_CreditSaveId.ToLower.Contains("at"), "e.newValueCRIndex", "e.newValueCR") & " ELSE 0 END AS crValue,
CASE WHEN e.localEventCode = 'CL' OR e.globalEventCode = 'CL' THEN e.newValueCL ELSE 0 END AS clValue,
'creditsafe API' AS Source
FROM [VERAG].[dbo].[tblCreditsafeEvents] e
@@ -81,10 +77,20 @@ Public Class frmBonitätsverlauf
AND b.ba_Pruefungstool = 'creditsafe API'
AND (e.localEventCode IN ('CL','CR') OR e.globalEventCode IN ('CL','CR'))
) e
GROUP BY e.companyId, e.portfolioId, CAST(e.eventDate AS DATE), Source
) AS Temp
GROUP BY e.companyId, e.portfolioId, CAST(e.eventDate AS DATE), Source"
sqlstr &= "SELECT *
FROM (
SELECT ba_Datum," & sqlIndex & " ,ba_GruendundsDatum,ba_Umsatz,ba_Mitarbeiter,ba_Hoechstkredit,ba_Sachbearbeiter,ba_Zahlungsweise,ba_GFName,ba_Risikostufe,ba_CreditSaveRisikoklasse,ba_Pruefungstool,ba_GSName,ba_Geschaeftszweck,ba_datenarchivId
FROM tblBonitaetsauskunft
WHERE ba_KundenNr = " & KdSearchBox1.KdNr_value & IIf(newView, sqlNewViewAdd, "") & ") AS Temp
ORDER BY Temp.ba_Datum DESC;"
Else
sqlstr = "SELECT * FROM [tblBonitaetsauskunft] where ba_KundenNr=" & KdSearchBox1.KdNr_value & " ORDER BY ba_Datum DESC"
End If

194
SDL/kunden/usrCntlCBAM.Designer.vb generated
View File

@@ -44,12 +44,12 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DHF_VERAG = New System.Windows.Forms.Button()
Me.btnCBAM_DS_DAKOSY = New System.Windows.Forms.Button()
Me.Label3 = New System.Windows.Forms.Label()
Me.btnCBAM_DS_DAKOSY_Deteil = New System.Windows.Forms.Button()
Me.btnCBAM_DS_DAKOSY_Detail = New System.Windows.Forms.Button()
Me.btnCBAM_DS_DAKOSY_Summe = New System.Windows.Forms.Button()
Me.btnCBAM_DS_DHF_VERAG_Summe = New System.Windows.Forms.Button()
Me.btnCBAM_DS_DHF_VERAG_Deteil = New System.Windows.Forms.Button()
Me.btnCBAM_DS_DHF_VERAG_Detail = New System.Windows.Forms.Button()
Me.btnCBAM_DS_DHF_UNISPED_Summe = New System.Windows.Forms.Button()
Me.btnCBAM_DS_DHF_UNISPED_Deteil = New System.Windows.Forms.Button()
Me.btnCBAM_DS_DHF_UNISPED_Detail = New System.Windows.Forms.Button()
Me.btnCBAM_DS_TELOTEC_Summe = New System.Windows.Forms.Button()
Me.btnCBAM_DS_TELOTEC_Detail = New System.Windows.Forms.Button()
Me.Label6 = New System.Windows.Forms.Label()
@@ -70,6 +70,10 @@ Partial Class usrCntlCBAM
Me.txtEori = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Button1 = New System.Windows.Forms.Button()
Me.btnCBAM_DS_DAKOSY_Spedb = New System.Windows.Forms.Button()
Me.btnCBAM_DS_DAKOSY_GP = New System.Windows.Forms.Button()
Me.btnCBAM_DS_DHF_VERAG_GP = New System.Windows.Forms.Button()
Me.btnCBAM_DS_DHF_UNISPED_GP = New System.Windows.Forms.Button()
Me.btnCBAM_DS_TELOTEC_GP = New System.Windows.Forms.Button()
Me.cntxtAddSdl.SuspendLayout()
Me.MyPanel1.SuspendLayout()
Me.SuspendLayout()
@@ -244,7 +248,7 @@ Partial Class usrCntlCBAM
'btnCBAM_DS_DHF_UNISPED
'
Me.btnCBAM_DS_DHF_UNISPED.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DHF_UNISPED.Location = New System.Drawing.Point(454, 168)
Me.btnCBAM_DS_DHF_UNISPED.Location = New System.Drawing.Point(454, 167)
Me.btnCBAM_DS_DHF_UNISPED.Name = "btnCBAM_DS_DHF_UNISPED"
Me.btnCBAM_DS_DHF_UNISPED.Size = New System.Drawing.Size(168, 42)
Me.btnCBAM_DS_DHF_UNISPED.TabIndex = 24
@@ -254,7 +258,7 @@ Partial Class usrCntlCBAM
'btnCBAM_DS_TELOTEC
'
Me.btnCBAM_DS_TELOTEC.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_TELOTEC.Location = New System.Drawing.Point(628, 168)
Me.btnCBAM_DS_TELOTEC.Location = New System.Drawing.Point(628, 167)
Me.btnCBAM_DS_TELOTEC.Name = "btnCBAM_DS_TELOTEC"
Me.btnCBAM_DS_TELOTEC.Size = New System.Drawing.Size(168, 42)
Me.btnCBAM_DS_TELOTEC.TabIndex = 23
@@ -264,7 +268,7 @@ Partial Class usrCntlCBAM
'btnCBAM_DS_DHF_VERAG
'
Me.btnCBAM_DS_DHF_VERAG.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DHF_VERAG.Location = New System.Drawing.Point(280, 168)
Me.btnCBAM_DS_DHF_VERAG.Location = New System.Drawing.Point(280, 167)
Me.btnCBAM_DS_DHF_VERAG.Name = "btnCBAM_DS_DHF_VERAG"
Me.btnCBAM_DS_DHF_VERAG.Size = New System.Drawing.Size(168, 42)
Me.btnCBAM_DS_DHF_VERAG.TabIndex = 22
@@ -274,7 +278,7 @@ Partial Class usrCntlCBAM
'btnCBAM_DS_DAKOSY
'
Me.btnCBAM_DS_DAKOSY.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DAKOSY.Location = New System.Drawing.Point(106, 168)
Me.btnCBAM_DS_DAKOSY.Location = New System.Drawing.Point(106, 167)
Me.btnCBAM_DS_DAKOSY.Name = "btnCBAM_DS_DAKOSY"
Me.btnCBAM_DS_DAKOSY.Size = New System.Drawing.Size(168, 42)
Me.btnCBAM_DS_DAKOSY.TabIndex = 21
@@ -284,25 +288,25 @@ Partial Class usrCntlCBAM
'Label3
'
Me.Label3.AutoSize = True
Me.Label3.Location = New System.Drawing.Point(5, 183)
Me.Label3.Location = New System.Drawing.Point(5, 182)
Me.Label3.Name = "Label3"
Me.Label3.Size = New System.Drawing.Size(64, 13)
Me.Label3.TabIndex = 25
Me.Label3.Text = "Datensätze:"
'
'btnCBAM_DS_DAKOSY_Deteil
'btnCBAM_DS_DAKOSY_Detail
'
Me.btnCBAM_DS_DAKOSY_Deteil.Enabled = False
Me.btnCBAM_DS_DAKOSY_Deteil.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DAKOSY_Deteil.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_DAKOSY_Deteil.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_DAKOSY_Deteil.Location = New System.Drawing.Point(144, 216)
Me.btnCBAM_DS_DAKOSY_Deteil.Name = "btnCBAM_DS_DAKOSY_Deteil"
Me.btnCBAM_DS_DAKOSY_Deteil.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DAKOSY_Deteil.TabIndex = 26
Me.btnCBAM_DS_DAKOSY_Deteil.Text = "Detailbericht"
Me.btnCBAM_DS_DAKOSY_Deteil.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnCBAM_DS_DAKOSY_Deteil.UseVisualStyleBackColor = True
Me.btnCBAM_DS_DAKOSY_Detail.Enabled = False
Me.btnCBAM_DS_DAKOSY_Detail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DAKOSY_Detail.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_DAKOSY_Detail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_DAKOSY_Detail.Location = New System.Drawing.Point(144, 215)
Me.btnCBAM_DS_DAKOSY_Detail.Name = "btnCBAM_DS_DAKOSY_Detail"
Me.btnCBAM_DS_DAKOSY_Detail.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DAKOSY_Detail.TabIndex = 26
Me.btnCBAM_DS_DAKOSY_Detail.Text = "Detailbericht"
Me.btnCBAM_DS_DAKOSY_Detail.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnCBAM_DS_DAKOSY_Detail.UseVisualStyleBackColor = True
'
'btnCBAM_DS_DAKOSY_Summe
'
@@ -310,7 +314,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DAKOSY_Summe.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DAKOSY_Summe.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_DAKOSY_Summe.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_DAKOSY_Summe.Location = New System.Drawing.Point(144, 264)
Me.btnCBAM_DS_DAKOSY_Summe.Location = New System.Drawing.Point(144, 301)
Me.btnCBAM_DS_DAKOSY_Summe.Name = "btnCBAM_DS_DAKOSY_Summe"
Me.btnCBAM_DS_DAKOSY_Summe.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DAKOSY_Summe.TabIndex = 27
@@ -324,7 +328,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DHF_VERAG_Summe.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DHF_VERAG_Summe.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_DHF_VERAG_Summe.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_DHF_VERAG_Summe.Location = New System.Drawing.Point(318, 264)
Me.btnCBAM_DS_DHF_VERAG_Summe.Location = New System.Drawing.Point(318, 301)
Me.btnCBAM_DS_DHF_VERAG_Summe.Name = "btnCBAM_DS_DHF_VERAG_Summe"
Me.btnCBAM_DS_DHF_VERAG_Summe.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DHF_VERAG_Summe.TabIndex = 29
@@ -332,19 +336,19 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DHF_VERAG_Summe.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnCBAM_DS_DHF_VERAG_Summe.UseVisualStyleBackColor = True
'
'btnCBAM_DS_DHF_VERAG_Deteil
'btnCBAM_DS_DHF_VERAG_Detail
'
Me.btnCBAM_DS_DHF_VERAG_Deteil.Enabled = False
Me.btnCBAM_DS_DHF_VERAG_Deteil.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DHF_VERAG_Deteil.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_DHF_VERAG_Deteil.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_DHF_VERAG_Deteil.Location = New System.Drawing.Point(318, 216)
Me.btnCBAM_DS_DHF_VERAG_Deteil.Name = "btnCBAM_DS_DHF_VERAG_Deteil"
Me.btnCBAM_DS_DHF_VERAG_Deteil.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DHF_VERAG_Deteil.TabIndex = 28
Me.btnCBAM_DS_DHF_VERAG_Deteil.Text = "Detailbericht"
Me.btnCBAM_DS_DHF_VERAG_Deteil.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnCBAM_DS_DHF_VERAG_Deteil.UseVisualStyleBackColor = True
Me.btnCBAM_DS_DHF_VERAG_Detail.Enabled = False
Me.btnCBAM_DS_DHF_VERAG_Detail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DHF_VERAG_Detail.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_DHF_VERAG_Detail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_DHF_VERAG_Detail.Location = New System.Drawing.Point(318, 215)
Me.btnCBAM_DS_DHF_VERAG_Detail.Name = "btnCBAM_DS_DHF_VERAG_Detail"
Me.btnCBAM_DS_DHF_VERAG_Detail.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DHF_VERAG_Detail.TabIndex = 28
Me.btnCBAM_DS_DHF_VERAG_Detail.Text = "Detailbericht"
Me.btnCBAM_DS_DHF_VERAG_Detail.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnCBAM_DS_DHF_VERAG_Detail.UseVisualStyleBackColor = True
'
'btnCBAM_DS_DHF_UNISPED_Summe
'
@@ -352,7 +356,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DHF_UNISPED_Summe.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DHF_UNISPED_Summe.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_DHF_UNISPED_Summe.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_DHF_UNISPED_Summe.Location = New System.Drawing.Point(492, 264)
Me.btnCBAM_DS_DHF_UNISPED_Summe.Location = New System.Drawing.Point(492, 301)
Me.btnCBAM_DS_DHF_UNISPED_Summe.Name = "btnCBAM_DS_DHF_UNISPED_Summe"
Me.btnCBAM_DS_DHF_UNISPED_Summe.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DHF_UNISPED_Summe.TabIndex = 31
@@ -360,19 +364,19 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DHF_UNISPED_Summe.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnCBAM_DS_DHF_UNISPED_Summe.UseVisualStyleBackColor = True
'
'btnCBAM_DS_DHF_UNISPED_Deteil
'btnCBAM_DS_DHF_UNISPED_Detail
'
Me.btnCBAM_DS_DHF_UNISPED_Deteil.Enabled = False
Me.btnCBAM_DS_DHF_UNISPED_Deteil.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DHF_UNISPED_Deteil.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_DHF_UNISPED_Deteil.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_DHF_UNISPED_Deteil.Location = New System.Drawing.Point(492, 216)
Me.btnCBAM_DS_DHF_UNISPED_Deteil.Name = "btnCBAM_DS_DHF_UNISPED_Deteil"
Me.btnCBAM_DS_DHF_UNISPED_Deteil.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DHF_UNISPED_Deteil.TabIndex = 30
Me.btnCBAM_DS_DHF_UNISPED_Deteil.Text = "Detailbericht"
Me.btnCBAM_DS_DHF_UNISPED_Deteil.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnCBAM_DS_DHF_UNISPED_Deteil.UseVisualStyleBackColor = True
Me.btnCBAM_DS_DHF_UNISPED_Detail.Enabled = False
Me.btnCBAM_DS_DHF_UNISPED_Detail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DHF_UNISPED_Detail.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_DHF_UNISPED_Detail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_DHF_UNISPED_Detail.Location = New System.Drawing.Point(492, 215)
Me.btnCBAM_DS_DHF_UNISPED_Detail.Name = "btnCBAM_DS_DHF_UNISPED_Detail"
Me.btnCBAM_DS_DHF_UNISPED_Detail.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DHF_UNISPED_Detail.TabIndex = 30
Me.btnCBAM_DS_DHF_UNISPED_Detail.Text = "Detailbericht"
Me.btnCBAM_DS_DHF_UNISPED_Detail.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnCBAM_DS_DHF_UNISPED_Detail.UseVisualStyleBackColor = True
'
'btnCBAM_DS_TELOTEC_Summe
'
@@ -380,7 +384,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_TELOTEC_Summe.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_TELOTEC_Summe.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_TELOTEC_Summe.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_TELOTEC_Summe.Location = New System.Drawing.Point(666, 264)
Me.btnCBAM_DS_TELOTEC_Summe.Location = New System.Drawing.Point(666, 301)
Me.btnCBAM_DS_TELOTEC_Summe.Name = "btnCBAM_DS_TELOTEC_Summe"
Me.btnCBAM_DS_TELOTEC_Summe.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_TELOTEC_Summe.TabIndex = 33
@@ -394,7 +398,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_TELOTEC_Detail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_TELOTEC_Detail.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_TELOTEC_Detail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_TELOTEC_Detail.Location = New System.Drawing.Point(666, 216)
Me.btnCBAM_DS_TELOTEC_Detail.Location = New System.Drawing.Point(666, 215)
Me.btnCBAM_DS_TELOTEC_Detail.Name = "btnCBAM_DS_TELOTEC_Detail"
Me.btnCBAM_DS_TELOTEC_Detail.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_TELOTEC_Detail.TabIndex = 32
@@ -416,7 +420,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DAKOSY_Copy.Enabled = False
Me.btnCBAM_DS_DAKOSY_Copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DAKOSY_Copy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_DAKOSY_Copy.Location = New System.Drawing.Point(144, 360)
Me.btnCBAM_DS_DAKOSY_Copy.Location = New System.Drawing.Point(144, 394)
Me.btnCBAM_DS_DAKOSY_Copy.Name = "btnCBAM_DS_DAKOSY_Copy"
Me.btnCBAM_DS_DAKOSY_Copy.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DAKOSY_Copy.TabIndex = 35
@@ -428,7 +432,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DHF_VERAG_Copy.Enabled = False
Me.btnCBAM_DS_DHF_VERAG_Copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DHF_VERAG_Copy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_DHF_VERAG_Copy.Location = New System.Drawing.Point(318, 312)
Me.btnCBAM_DS_DHF_VERAG_Copy.Location = New System.Drawing.Point(318, 347)
Me.btnCBAM_DS_DHF_VERAG_Copy.Name = "btnCBAM_DS_DHF_VERAG_Copy"
Me.btnCBAM_DS_DHF_VERAG_Copy.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DHF_VERAG_Copy.TabIndex = 36
@@ -440,7 +444,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DHF_UNISPED_Copy.Enabled = False
Me.btnCBAM_DS_DHF_UNISPED_Copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DHF_UNISPED_Copy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_DHF_UNISPED_Copy.Location = New System.Drawing.Point(492, 312)
Me.btnCBAM_DS_DHF_UNISPED_Copy.Location = New System.Drawing.Point(492, 347)
Me.btnCBAM_DS_DHF_UNISPED_Copy.Name = "btnCBAM_DS_DHF_UNISPED_Copy"
Me.btnCBAM_DS_DHF_UNISPED_Copy.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DHF_UNISPED_Copy.TabIndex = 37
@@ -452,7 +456,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_TELOTEC_Copy.Enabled = False
Me.btnCBAM_DS_TELOTEC_Copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_TELOTEC_Copy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_TELOTEC_Copy.Location = New System.Drawing.Point(666, 312)
Me.btnCBAM_DS_TELOTEC_Copy.Location = New System.Drawing.Point(666, 347)
Me.btnCBAM_DS_TELOTEC_Copy.Name = "btnCBAM_DS_TELOTEC_Copy"
Me.btnCBAM_DS_TELOTEC_Copy.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_TELOTEC_Copy.TabIndex = 38
@@ -465,7 +469,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DAKOSY_XML.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DAKOSY_XML.Image = Global.SDL.My.Resources.Resources.xml
Me.btnCBAM_DS_DAKOSY_XML.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_DAKOSY_XML.Location = New System.Drawing.Point(144, 477)
Me.btnCBAM_DS_DAKOSY_XML.Location = New System.Drawing.Point(144, 485)
Me.btnCBAM_DS_DAKOSY_XML.Name = "btnCBAM_DS_DAKOSY_XML"
Me.btnCBAM_DS_DAKOSY_XML.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DAKOSY_XML.TabIndex = 40
@@ -477,7 +481,7 @@ Partial Class usrCntlCBAM
Me.Button2.Enabled = False
Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button2.Location = New System.Drawing.Point(144, 525)
Me.Button2.Location = New System.Drawing.Point(144, 532)
Me.Button2.Name = "Button2"
Me.Button2.Size = New System.Drawing.Size(130, 42)
Me.Button2.TabIndex = 42
@@ -631,7 +635,7 @@ Partial Class usrCntlCBAM
'Button1
'
Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button1.Location = New System.Drawing.Point(106, 429)
Me.Button1.Location = New System.Drawing.Point(106, 438)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(168, 42)
Me.Button1.TabIndex = 44
@@ -644,7 +648,7 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DAKOSY_Spedb.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DAKOSY_Spedb.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_DAKOSY_Spedb.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_DAKOSY_Spedb.Location = New System.Drawing.Point(144, 312)
Me.btnCBAM_DS_DAKOSY_Spedb.Location = New System.Drawing.Point(144, 347)
Me.btnCBAM_DS_DAKOSY_Spedb.Name = "btnCBAM_DS_DAKOSY_Spedb"
Me.btnCBAM_DS_DAKOSY_Spedb.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DAKOSY_Spedb.TabIndex = 45
@@ -652,11 +656,71 @@ Partial Class usrCntlCBAM
Me.btnCBAM_DS_DAKOSY_Spedb.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnCBAM_DS_DAKOSY_Spedb.UseVisualStyleBackColor = True
'
'btnCBAM_DS_DAKOSY_GP
'
Me.btnCBAM_DS_DAKOSY_GP.Enabled = False
Me.btnCBAM_DS_DAKOSY_GP.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DAKOSY_GP.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_DAKOSY_GP.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_DAKOSY_GP.Location = New System.Drawing.Point(144, 258)
Me.btnCBAM_DS_DAKOSY_GP.Name = "btnCBAM_DS_DAKOSY_GP"
Me.btnCBAM_DS_DAKOSY_GP.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DAKOSY_GP.TabIndex = 46
Me.btnCBAM_DS_DAKOSY_GP.Text = "GP Detailbericht"
Me.btnCBAM_DS_DAKOSY_GP.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnCBAM_DS_DAKOSY_GP.UseVisualStyleBackColor = True
'
'btnCBAM_DS_DHF_VERAG_GP
'
Me.btnCBAM_DS_DHF_VERAG_GP.Enabled = False
Me.btnCBAM_DS_DHF_VERAG_GP.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DHF_VERAG_GP.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_DHF_VERAG_GP.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_DHF_VERAG_GP.Location = New System.Drawing.Point(318, 258)
Me.btnCBAM_DS_DHF_VERAG_GP.Name = "btnCBAM_DS_DHF_VERAG_GP"
Me.btnCBAM_DS_DHF_VERAG_GP.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DHF_VERAG_GP.TabIndex = 47
Me.btnCBAM_DS_DHF_VERAG_GP.Text = "GP Detailbericht"
Me.btnCBAM_DS_DHF_VERAG_GP.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnCBAM_DS_DHF_VERAG_GP.UseVisualStyleBackColor = True
'
'btnCBAM_DS_DHF_UNISPED_GP
'
Me.btnCBAM_DS_DHF_UNISPED_GP.Enabled = False
Me.btnCBAM_DS_DHF_UNISPED_GP.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_DHF_UNISPED_GP.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_DHF_UNISPED_GP.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_DHF_UNISPED_GP.Location = New System.Drawing.Point(492, 258)
Me.btnCBAM_DS_DHF_UNISPED_GP.Name = "btnCBAM_DS_DHF_UNISPED_GP"
Me.btnCBAM_DS_DHF_UNISPED_GP.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_DHF_UNISPED_GP.TabIndex = 48
Me.btnCBAM_DS_DHF_UNISPED_GP.Text = "GP Detailbericht"
Me.btnCBAM_DS_DHF_UNISPED_GP.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnCBAM_DS_DHF_UNISPED_GP.UseVisualStyleBackColor = True
'
'btnCBAM_DS_TELOTEC_GP
'
Me.btnCBAM_DS_TELOTEC_GP.Enabled = False
Me.btnCBAM_DS_TELOTEC_GP.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCBAM_DS_TELOTEC_GP.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnCBAM_DS_TELOTEC_GP.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnCBAM_DS_TELOTEC_GP.Location = New System.Drawing.Point(666, 258)
Me.btnCBAM_DS_TELOTEC_GP.Name = "btnCBAM_DS_TELOTEC_GP"
Me.btnCBAM_DS_TELOTEC_GP.Size = New System.Drawing.Size(130, 42)
Me.btnCBAM_DS_TELOTEC_GP.TabIndex = 49
Me.btnCBAM_DS_TELOTEC_GP.Text = "GP Detailbericht"
Me.btnCBAM_DS_TELOTEC_GP.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnCBAM_DS_TELOTEC_GP.UseVisualStyleBackColor = True
'
'usrCntlCBAM
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.White
Me.Controls.Add(Me.btnCBAM_DS_TELOTEC_GP)
Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_GP)
Me.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_GP)
Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_GP)
Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_Spedb)
Me.Controls.Add(Me.Button1)
Me.Controls.Add(Me.Button2)
@@ -670,11 +734,11 @@ Partial Class usrCntlCBAM
Me.Controls.Add(Me.btnCBAM_DS_TELOTEC_Summe)
Me.Controls.Add(Me.btnCBAM_DS_TELOTEC_Detail)
Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_Summe)
Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_Deteil)
Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_Detail)
Me.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_Summe)
Me.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_Deteil)
Me.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_Detail)
Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_Summe)
Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_Deteil)
Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_Detail)
Me.Controls.Add(Me.Label3)
Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED)
Me.Controls.Add(Me.btnCBAM_DS_TELOTEC)
@@ -735,12 +799,12 @@ Partial Class usrCntlCBAM
Friend WithEvents btnCBAM_DS_DHF_VERAG As Button
Friend WithEvents btnCBAM_DS_DAKOSY As Button
Friend WithEvents Label3 As Label
Friend WithEvents btnCBAM_DS_DAKOSY_Deteil As Button
Friend WithEvents btnCBAM_DS_DAKOSY_Detail As Button
Friend WithEvents btnCBAM_DS_DAKOSY_Summe As Button
Friend WithEvents btnCBAM_DS_DHF_VERAG_Summe As Button
Friend WithEvents btnCBAM_DS_DHF_VERAG_Deteil As Button
Friend WithEvents btnCBAM_DS_DHF_VERAG_Detail As Button
Friend WithEvents btnCBAM_DS_DHF_UNISPED_Summe As Button
Friend WithEvents btnCBAM_DS_DHF_UNISPED_Deteil As Button
Friend WithEvents btnCBAM_DS_DHF_UNISPED_Detail As Button
Friend WithEvents btnCBAM_DS_TELOTEC_Summe As Button
Friend WithEvents btnCBAM_DS_TELOTEC_Detail As Button
Friend WithEvents Label6 As Label
@@ -756,4 +820,8 @@ Partial Class usrCntlCBAM
Friend WithEvents cbxIMEX As CheckBox
Friend WithEvents cbxUNISPED As CheckBox
Friend WithEvents btnCBAM_DS_DAKOSY_Spedb As Button
Friend WithEvents btnCBAM_DS_DAKOSY_GP As Button
Friend WithEvents btnCBAM_DS_DHF_VERAG_GP As Button
Friend WithEvents btnCBAM_DS_DHF_UNISPED_GP As Button
Friend WithEvents btnCBAM_DS_TELOTEC_GP As Button
End Class

232
SDL/kunden/usrCntlCBAM.vb
View File

@@ -1,7 +1,9 @@
Public Class usrCntlCBAM
Imports DocumentFormat.OpenXml.Spreadsheet
Public Class usrCntlCBAM
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Public kdnr = -1
Public kdnr As Integer = -1
Dim AD As VERAG_PROG_ALLGEMEIN.cAdressen = Nothing
Dim KD As VERAG_PROG_ALLGEMEIN.cKunde = Nothing
@@ -396,11 +398,13 @@
End Sub
Private Sub btnCBAM_DS_DAKOSY_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DAKOSY.Click
btnCBAM_DS_DAKOSY_Deteil.Enabled = False
btnCBAM_DS_DAKOSY_Detail.Enabled = False
btnCBAM_DS_DAKOSY_Copy.Enabled = False
btnCBAM_DS_DAKOSY_Spedb.Enabled = False
btnCBAM_DS_DAKOSY_Deteil.Tag = ""
btnCBAM_DS_DAKOSY_GP.Enabled = False
btnCBAM_DS_DAKOSY_Detail.Tag = ""
btnCBAM_DS_DAKOSY_Spedb.Tag = ""
btnCBAM_DS_DAKOSY_GP.Tag = ""
Dim SQLSTR_WHERE_FIRMEN = ""
@@ -416,9 +420,40 @@
If txtBis._value = "" Then MsgBox("Datum bis eingeben!") : Exit Sub
Me.Cursor = Cursors.WaitCursor
Dim SQLSTR = "
SELECT
Dim SQL_GP As String = "SELECT [Registriernummer_MRN] as 'declaration no'
,max(Überlassungsdatum) as 'declaration date'
,isnull(max(Empfänger_CN_EORI),'') as 'importer identification number'
,'' as 'exporter identification number'
, max(Warentarifnummer) as 'commodity code'
,max([VersendungsLand]) as 'origin country code'
,Left(max(Verfahren2),2) as 'requested procedure'
,'' as 'previous procedure'
,(max(Eigenmasse) / 1000) as 'net mass'
,'TONNES' as 'type of measurement unit'
,'' as 'invoice numbers'
,'' as 'invoice date'
,'' as 'member state auth'
,'' as 'discharge bill waiver'
,'' as 'authorisation'
,'' as 'start time'
,'' as 'end time'
,'' as 'deadline'
,isnull(max(Empfänger_CN_EORI),'') as 'reporting declarant EORI number'
,'' as 'type of representation'
,isnull(max(CN_Name), '') as 'importer title'
,'' as 'importer email'
,'' as 'importer phone'
,isnull(max(CN_Ländercode), '') as 'importer country code or member state'
,'' as 'importer subdivision'
,'' as 'importer city'
,'' as 'importer street'
,'' as 'importer street additional'
,'' as 'importer address number'
,'' as 'importer post code'
,'' as 'importer po box'
,'' as 'importer coordinate longitude (x)'
,'' as 'importer coordinate latitude (y)'"
Dim SQL_DAKOSY As String = "SELECT
[Registriernummer_MRN] RegistriernummerATLAS
,PositionNo PositionsNummer
,max(Überlassungsdatum) Anmeldedatum
@@ -433,9 +468,9 @@
,isnull(max(Empfänger_CN_EORI),'') as EmpfängerEORI
,isnull(max(CN_Name), '') as Empfänger
,isnull(max(Versender_CZ_EORI),'') as AbsenderEORI
,isnull(max(CZ_Name), '') as Absender
FROM [tbl_DY_Zollmeldungen_Import]
,isnull(max(CZ_Name), '') as Absender"
Dim SQLSTR = " FROM [tbl_DY_Zollmeldungen_Import]
where
Überlassungsdatum between '" & txtVon._value & "' and '" & txtBis._value & "'
and
@@ -458,8 +493,6 @@
"
If SQLSTR_WHERE_FIRMEN <> "" Then
SQLSTR &= " and Teilnehmer in ( " & SQLSTR_WHERE_FIRMEN & ")"
SQLSTR &= "
@@ -479,10 +512,12 @@
SQLSTR &= " group by Registriernummer_MRN,PositionNo"
SQLSTR &= " order by Absender,Registriernummer_MRN, PositionNo"
SQLSTR &= " order by isnull(max(CZ_Name), ''), Registriernummer_MRN, PositionNo"
Dim dt = SQL.loadDgvBySql(SQLSTR, "AVISO", 600)
Dim dt = SQL.loadDgvBySql(SQL_DAKOSY & SQLSTR, "AVISO", 600)
Dim dtGP = SQL.loadDgvBySql(SQL_GP & SQLSTR, "AVISO", 600)
@@ -509,21 +544,30 @@
' MsgBox(SQLSTR)
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value)
btnCBAM_DS_DAKOSY_Deteil.Tag = path
btnCBAM_DS_DAKOSY_Deteil.Enabled = True
btnCBAM_DS_DAKOSY_Copy.Enabled = True
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value)
btnCBAM_DS_DAKOSY_Detail.Tag = path
btnCBAM_DS_DAKOSY_Detail.Enabled = True
btnCBAM_DS_DAKOSY_Copy.Enabled = True
End If
End If
Dim dtNew = SQL.loadDgvBySql(sqlNew, "FMZOLL", 600)
If dtNew IsNot Nothing AndAlso dtNew.Rows.Count > 0 Then
If dtNew.Columns.Contains("Packstücke") Then dtNew.Columns.Remove("Packstücke")
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtNew,,,,, False, EORI & "_Unterschiede zum Sped-Buch_" & txtVon._value & "-" & txtBis._value)
btnCBAM_DS_DAKOSY_Spedb.Enabled = True
btnCBAM_DS_DAKOSY_Spedb.Tag = path
Me.Cursor = Cursors.Default
End If
If dtGP IsNot Nothing AndAlso dt.Rows.Count > 0 Then
btnCBAM_DS_DAKOSY_GP.Tag = ""
btnCBAM_DS_DAKOSY_GP.Tag = createExcelForGreenPulse(dtGP, EORI, IIf(AD.Ort <> "", AD.Ort, ""))
btnCBAM_DS_DAKOSY_GP.Enabled = True
End If
Dim dtNew = SQL.loadDgvBySql(sqlNew, "FMZOLL", 600)
If dtNew IsNot Nothing AndAlso dtNew.Rows.Count > 0 Then
If dtNew.Columns.Contains("Packstücke") Then dtNew.Columns.Remove("Packstücke")
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtNew,,,,, False, EORI & "_Unterschiede zum Sped-Buch_" & txtVon._value & "-" & txtBis._value)
btnCBAM_DS_DAKOSY_Spedb.Enabled = True
btnCBAM_DS_DAKOSY_Spedb.Tag = path
Me.Cursor = Cursors.Default
End If
@@ -1057,9 +1101,9 @@
End Sub
Private Sub btnCBAM_DS_DAKOSY_Deteil_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DAKOSY_Deteil.Click, btnCBAM_DS_DAKOSY_Summe.Click, btnCBAM_DS_DHF_VERAG_Deteil.Click,
btnCBAM_DS_DHF_VERAG_Summe.Click, btnCBAM_DS_DHF_UNISPED_Deteil.Click, btnCBAM_DS_DHF_UNISPED_Summe.Click, btnCBAM_DS_TELOTEC_Detail.Click, btnCBAM_DS_TELOTEC_Summe.Click,
btnCBAM_DS_DAKOSY_XML.Click, btnCBAM_DS_DAKOSY_Spedb.Click
Private Sub btnCBAM_DS_DAKOSY_Deteil_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DAKOSY_Detail.Click, btnCBAM_DS_DAKOSY_Summe.Click, btnCBAM_DS_DHF_VERAG_Detail.Click,
btnCBAM_DS_DHF_VERAG_Summe.Click, btnCBAM_DS_DHF_UNISPED_Detail.Click, btnCBAM_DS_DHF_UNISPED_Summe.Click, btnCBAM_DS_TELOTEC_Detail.Click, btnCBAM_DS_TELOTEC_Summe.Click,
btnCBAM_DS_DAKOSY_XML.Click, btnCBAM_DS_DAKOSY_Spedb.Click, btnCBAM_DS_DAKOSY_GP.Click, btnCBAM_DS_DHF_UNISPED_GP.Click, btnCBAM_DS_DHF_VERAG_GP.Click, btnCBAM_DS_TELOTEC_GP.Click
If sender.tag <> "" Then
Try : Process.Start(sender.tag) : Catch : End Try
@@ -1068,7 +1112,7 @@
Private Sub btnCBAM_DS_DAKOSY_Copy_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DAKOSY_Copy.Click
Dim f As New List(Of String)
If btnCBAM_DS_DAKOSY_Deteil.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Deteil.Tag)
If btnCBAM_DS_DAKOSY_Detail.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Detail.Tag)
If btnCBAM_DS_DAKOSY_Summe.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Summe.Tag)
If f.Count > 0 Then
@@ -1081,7 +1125,7 @@
Private Sub btnCBAM_DS_DHF_VERAG_Copy_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DHF_VERAG_Copy.Click
Dim f As New List(Of String)
If btnCBAM_DS_DHF_VERAG_Deteil.Tag <> "" Then f.Add(btnCBAM_DS_DHF_VERAG_Deteil.Tag)
If btnCBAM_DS_DHF_VERAG_Detail.Tag <> "" Then f.Add(btnCBAM_DS_DHF_VERAG_Detail.Tag)
If btnCBAM_DS_DHF_VERAG_Summe.Tag <> "" Then f.Add(btnCBAM_DS_DHF_VERAG_Summe.Tag)
If f.Count > 0 Then
@@ -1094,7 +1138,7 @@
Private Sub btnCBAM_DS_DHF_UNISPED_Copy_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DHF_UNISPED_Copy.Click
Dim f As New List(Of String)
If btnCBAM_DS_DHF_UNISPED_Deteil.Tag <> "" Then f.Add(btnCBAM_DS_DHF_UNISPED_Deteil.Tag)
If btnCBAM_DS_DHF_UNISPED_Detail.Tag <> "" Then f.Add(btnCBAM_DS_DHF_UNISPED_Detail.Tag)
If btnCBAM_DS_DHF_UNISPED_Summe.Tag <> "" Then f.Add(btnCBAM_DS_DHF_UNISPED_Summe.Tag)
If f.Count > 0 Then
@@ -1121,14 +1165,14 @@
Private Sub btnCBAM_DS_DHF_VERAG_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DHF_VERAG.Click, btnCBAM_DS_DHF_UNISPED.Click
Dim EZOLL_SQL = "EZOLL"
If sender Is btnCBAM_DS_DHF_VERAG Then
btnCBAM_DS_DHF_VERAG_Deteil.Enabled = False
btnCBAM_DS_DHF_VERAG_Detail.Enabled = False
btnCBAM_DS_DHF_VERAG_Copy.Enabled = False
btnCBAM_DS_DHF_VERAG_Deteil.Tag = ""
btnCBAM_DS_DHF_VERAG_Detail.Tag = ""
End If
If sender Is btnCBAM_DS_DHF_UNISPED Then
btnCBAM_DS_DHF_UNISPED_Deteil.Enabled = False
btnCBAM_DS_DHF_UNISPED_Detail.Enabled = False
btnCBAM_DS_DHF_UNISPED_Copy.Enabled = False
btnCBAM_DS_DHF_UNISPED_Deteil.Tag = ""
btnCBAM_DS_DHF_UNISPED_Detail.Tag = ""
EZOLL_SQL = "EZOLL_UNISPED"
End If
@@ -1193,13 +1237,13 @@
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value)
If sender Is btnCBAM_DS_DHF_VERAG Then
btnCBAM_DS_DHF_VERAG_Deteil.Tag = path
btnCBAM_DS_DHF_VERAG_Deteil.Enabled = True
btnCBAM_DS_DHF_VERAG_Detail.Tag = path
btnCBAM_DS_DHF_VERAG_Detail.Enabled = True
btnCBAM_DS_DHF_VERAG_Copy.Enabled = True
End If
If sender Is btnCBAM_DS_DHF_UNISPED Then
btnCBAM_DS_DHF_UNISPED_Deteil.Tag = path
btnCBAM_DS_DHF_UNISPED_Deteil.Enabled = True
btnCBAM_DS_DHF_UNISPED_Detail.Tag = path
btnCBAM_DS_DHF_UNISPED_Detail.Enabled = True
btnCBAM_DS_DHF_UNISPED_Copy.Enabled = True
End If
Me.Cursor = Cursors.Default
@@ -1329,7 +1373,7 @@
Private Sub Button3_Click(sender As Object, e As EventArgs)
Dim f As New List(Of String)
If btnCBAM_DS_DAKOSY_Deteil.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Deteil.Tag)
If btnCBAM_DS_DAKOSY_Detail.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Detail.Tag)
If btnCBAM_DS_DAKOSY_Summe.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Summe.Tag)
If btnCBAM_DS_DAKOSY_XML.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_XML.Tag)
@@ -1532,4 +1576,108 @@
End Sub
Public Function createExcelForGreenPulse(dt As DataTable, EORI As String, Importer_City As String)
Dim EORI_Ort As String = ""
If AD IsNot Nothing Then
EORI_Ort = AD.Ort
End If
Dim Path_GP = ""
Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\SR\"
If Not My.Computer.FileSystem.DirectoryExists(sPath) Then
My.Computer.FileSystem.CreateDirectory(sPath)
End If
Dim exclApp As Object 'as Application
Dim Datei As Object 'Workbook
Dim Blatt As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet
exclApp = CreateObject("Excel.Application")
With exclApp
.Visible = False
Try
Path_GP = sPath & EORI & "_Detailbericht_GP_" & txtVon._value & "-" & txtBis._value & " .xlsx"
While System.IO.File.Exists(Path_GP)
Path_GP = sPath & EORI & "_Detailbericht_GP_" & txtVon._value & "-" & txtBis._value & Now.ToString("ddMMyyyyHHmmss") & ".xlsx"
End While
My.Computer.FileSystem.WriteAllBytes(Path_GP, My.Resources.CBAM_Auswertung_GP, False)
System.Threading.Thread.Sleep(200)
GC.Collect()
GC.WaitForPendingFinalizers()
Catch ex As System.Exception
' MsgBox(ex.Message)
MsgBox("ERROR 01: " & ex.Message & vbNewLine & ex.StackTrace)
Me.Cursor = Cursors.Default
Return ""
End Try
Datei = .Workbooks.Open(Path_GP)
Blatt = Datei.Worksheets(1)
Dim cnt = 3
Dim rowcounter As Integer = 0
For Each row As DataRow In dt.Rows
Blatt.Range("A" & cnt).Value = row("declaration no")
Blatt.Range("B" & cnt).Value = row("declaration date")
Blatt.Range("C" & cnt).Value = row("importer identification number")
Blatt.Range("D" & cnt).Value = row("exporter identification number")
Blatt.Range("E" & cnt).Value = row("commodity code")
Blatt.Range("F" & cnt).Value = row("origin country code")
Blatt.Range("G" & cnt).Value = row("requested procedure")
Blatt.Range("H" & cnt).Value = row("previous procedure")
Blatt.Range("J" & cnt).Value = row("net mass")
Blatt.Range("J" & cnt).Value = row("type of measurement unit")
Blatt.Range("K" & cnt).Value = row("invoice numbers")
Blatt.Range("L" & cnt).Value = row("invoice date")
Blatt.Range("M" & cnt).Value = row("member state auth")
Blatt.Range("N" & cnt).Value = row("discharge bill waiver")
Blatt.Range("O" & cnt).Value = row("authorisation")
Blatt.Range("P" & cnt).Value = row("start time")
Blatt.Range("Q" & cnt).Value = row("end time")
Blatt.Range("R" & cnt).Value = row("deadline")
Blatt.Range("S" & cnt).Value = row("reporting declarant EORI number")
Blatt.Range("T" & cnt).Value = row("type of representation")
Blatt.Range("U" & cnt).Value = row("importer title")
Blatt.Range("V" & cnt).Value = row("importer email")
Blatt.Range("W" & cnt).Value = row("importer phone")
Blatt.Range("X" & cnt).Value = row("importer country code or member state")
Blatt.Range("Y" & cnt).Value = row("importer subdivision")
Blatt.Range("Z" & cnt).Value = IIf(Importer_City <> "", Importer_City, row("importer city"))
Blatt.Range("AA" & cnt).Value = row("importer street")
Blatt.Range("AB" & cnt).Value = row("importer street additional")
Blatt.Range("AC" & cnt).Value = row("importer address number")
Blatt.Range("AD" & cnt).Value = row("importer post code")
Blatt.Range("AE" & cnt).Value = row("importer po box")
Blatt.Range("AF" & cnt).Value = row("importer coordinate longitude (x)")
Blatt.Range("AG" & cnt).Value = row("importer coordinate latitude (y)")
cnt += 1
rowcounter += 1
Next
Datei.Save()
Datei.Close(SaveChanges:=True)
Datei = Nothing
End With
exclApp.Quit()
exclApp = Nothing
Return Path_GP
End Function
End Class

37
SDL/kunden/usrCntlKundenuebersicht.vb
View File

@@ -3185,6 +3185,7 @@ Public Class usrCntlKundenuebersicht
Exit Sub
End If
'#wenn PDF und JSON in einem geht, dann folgende Zeile auskommentieren!
pdfObject = cs.getPDF(company, failureDesc)
'cs.AddCompanyToPortfolio(company)
@@ -3352,14 +3353,16 @@ Public Class usrCntlKundenuebersicht
If cs.authenticate() = "200" Then
Dim company As New cCreditSafeAPI.Company("", "", "", "", KUNDE_ERW.kde_CreditSaveNo, KUNDE_ERW.kde_CreditSaveId, Nothing, "", "", "", "", "", "", "", "", "", KUNDE.KundenNr)
company.lastChecked = IIf(IsDate(lastChecked), lastChecked, Today().AddDays(-1))
company.lastChecked = IIf(IsDate(lastChecked), lastChecked, Today().AddDays(-30))
Dim currentBonID As Integer = SQL.getValueTxtBySql("Select Top(1) isnull(ba_id, -1) FROM [tblBonitaetsauskunft] where ba_KundenNr = " & KUNDE.KundenNr & " AND [ba_Pruefungstool] = 'creditsafe API' ORDER BY ba_Datum DESC", "FMZOLL")
If currentBonID > 0 Then company.csBonID = currentBonID
Dim dt As New DataTable()
cs.getCompanyEvents(company, dt, checklastDate)
If cs.getCompanyEvents(company, dt, checklastDate, True) = "Error" Then
Exit Sub
End If
If dt.Rows.Count > 0 Then
Dim frm As New Form
@@ -3376,22 +3379,30 @@ Public Class usrCntlKundenuebersicht
dgv.DataSource = dt
If dgv IsNot Nothing Then
If dgv IsNot Nothing Then
frm.Size = New Size(750, 500)
dgv.Size = New Size(frm.Size.Width - 10, frm.Size.Height - 10)
dgv.Dock = DockStyle.Fill
dgv.Anchor = AnchorStyles.Left
dgv.Anchor = AnchorStyles.Top
dgv.ReadOnly = True
frm.Controls.Add(dgv)
frm.StartPosition = FormStartPosition.CenterScreen
frm.Size = New Size(750, 500)
dgv.Size = New Size(frm.Size.Width - 10, frm.Size.Height - 10)
dgv.Dock = DockStyle.Fill
dgv.Anchor = AnchorStyles.Left
dgv.Anchor = AnchorStyles.Top
dgv.ReadOnly = True
frm.Controls.Add(dgv)
frm.StartPosition = FormStartPosition.CenterScreen
frm.ShowDialog()
If frm.ShowDialog().Cancel Then
initCreditsave()
setKD(kdNr)
End If
Else
End If
MsgBox("Creditsafe-Daten wurden aktualisiert!")
Else
MsgBox("Keine Creditsafe-Änderungen seit " & lastChecked.ToShortDateString)
End If

2
SDL/mdm/frmMDMDatenverarbetiung.vb
View File

@@ -2056,7 +2056,7 @@ Public Class frmMDMDatenverarbetiung
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL", 60)