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

offertenNr

Browse Source
This commit is contained in:
d.breimaier
2025-03-17 08:20:21 +01:00
parent 14e040d14b
commit adb2969fe6
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SDL/My Project/AssemblyInfo.vb
View File

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

26
SDL/kunden/usrCntlOfferte.vb
View File

@@ -847,13 +847,15 @@ Public Class usrCntlOfferte
Dim ExcelBez = "Kostenkalkulation" Dim ExcelBez = "Kostenkalkulation"
Dim offertenNr As Integer = dtKostenkalk.Rows(0).Item("OffertenNr")
If offertenNr = 26 Or offertenNr = 38 Then FIRMA_TMP = "CS"
Select Case FIRMA_TMP Select Case FIRMA_TMP
Case "IMEX" : ExcelBez &= "_IMEX " Case "IMEX" : ExcelBez &= "_IMEX "
Case "VERAG" : ExcelBez &= "_AG " Case "VERAG" : ExcelBez &= "_AG "
Case Else : ExcelBez &= " " Case Else : ExcelBez &= " "
End Select End Select
With exclApp With exclApp
.Visible = False .Visible = False
@@ -863,6 +865,8 @@ Public Class usrCntlOfferte
Path = sPath & ExcelBez & kdNr & "_" & Now.ToString("ddMMyyyyHHmmss") & ".xlsx" Path = sPath & ExcelBez & kdNr & "_" & Now.ToString("ddMMyyyyHHmmss") & ".xlsx"
End While End While
Select Case FIRMA_TMP Select Case FIRMA_TMP
Case "IMEX" : My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.Kostenkalkulation_IMEX, False) Case "IMEX" : My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.Kostenkalkulation_IMEX, False)
Case "VERAG" : My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.Kostenkalkulation_AG, False) Case "VERAG" : My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.Kostenkalkulation_AG, False)
@@ -885,20 +889,32 @@ Public Class usrCntlOfferte
Blatt.Range("B8").Value = ADR.Name_1 Blatt.Range("B8").Value = ADR.Name_1
Blatt.Range("B9").Value = ADR.AdressenNr Blatt.Range("B9").Value = ADR.AdressenNr
Blatt.Range("H11").Value = "Tarif für " & Today().Year Blatt.Range("H11").Value = "Tarif für " & Today().Year
Dim currentRow As Integer = 13 Dim currentRow As Integer = 13
Dim dtkeineMdtKostenkalk_mitPreise As DataTable = dtKostenkalk.Select("Preis <> ''", "Preis desc").CopyToDataTable Dim dtkeineMdtKostenkalk_mitPreise As DataTable = dtKostenkalk.Select("Preis <> ''").CopyToDataTable
dtkeineMdtKostenkalk_mitPreise.Columns.Add("price_new", System.Type.GetType("System.Int32"))
Dim DatumDerZollabf As String = dtkeineMdtKostenkalk_mitPreise.Rows(0).Item("Geändert am")
If DatumDerZollabf = "" Then DatumDerZollabf = dtkeineMdtKostenkalk_mitPreise.Rows(0).Item("Eingegeben am")
If IsDate(DatumDerZollabf) Then Blatt.Range("B11").Value = "aktueller Tarif " & CDate(DatumDerZollabf).Year
For Each row In dtkeineMdtKostenkalk_mitPreise.Rows
row("price_new") = CDbl(row("Preis"))
Next
dtkeineMdtKostenkalk_mitPreise.DefaultView.Sort = "price_new desc"
dtkeineMdtKostenkalk_mitPreise = dtkeineMdtKostenkalk_mitPreise.DefaultView.ToTable
For Each row In dtkeineMdtKostenkalk_mitPreise.Rows For Each row In dtkeineMdtKostenkalk_mitPreise.Rows
Blatt.Range("A" & currentRow).Value = row("LeistungsBez") Blatt.Range("A" & currentRow).Value = row("LeistungsBez")
Blatt.Range("B" & currentRow).Value = CDbl(row("Preis")) Blatt.Range("B" & currentRow).Value = CDbl(row("Preis"))
Dim DatumDerZollabf As String = dtkeineMdtKostenkalk_mitPreise.Rows(0).Item("Geändert am")
If DatumDerZollabf = "" Then DatumDerZollabf = dtkeineMdtKostenkalk_mitPreise.Rows(0).Item("Eingegeben am")
If IsDate(DatumDerZollabf) Then If IsDate(DatumDerZollabf) Then