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

Merge branch 'ADMIN' of https://verag.visualstudio.com/ADMIN/_git/ADMIN into ADMIN

Browse Source
This commit is contained in:
d.breimaier
2024-03-05 15:49:34 +01:00
parent 75e6debff0 18f5a1b799
commit 48684e1790
3 changed files with 110 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -1349,6 +1349,16 @@ Public Class frmStartOptions
If outletGroug.Contains("4486") Then Return 0.042
Return 0.048
End Function
Function getPlattsAufschlag_SONDER_Lukenda(outletGroug As String) As Double
If outletGroug.Contains("4473") Then Return 0.032 - 0.015
If outletGroug.Contains("4474") Then Return 0.032 - 0.015
If outletGroug.Contains("4493") Then Return 0.032 - 0.015
If outletGroug.Contains("4485") Then Return 0.032 - 0.015
If outletGroug.Contains("4486") Then Return 0.032 - 0.015
Return 0.048 '-0.015
End Function
Sub doIDSPlatts()
Try
@@ -1375,6 +1385,7 @@ Public Class frmStartOptions
DT_PLATTS.Columns.Add("NetpriceNEW")
Dim DT_PLATTS_SONDER = DT_PLATTS.Clone
Dim DT_PLATTS_SONDER_Lukenda = DT_PLATTS.Clone
':::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
' EXCEL AUSLESEN:::::::
@@ -1386,11 +1397,19 @@ Public Class frmStartOptions
Dim FILE_NEW = IDS_FILE.Replace("\NEW\", "\" & Now.Year & "\").Replace(".xls", "_ORIG.xls")
While IO.File.Exists(FILE_NEW)
FILE_NEW = IDS_FILE.Replace("\NEW\", "\" & Now.Year & "\").Replace(".xls", Now.ToString("_ddMMyy.HHmmss") & "_ORIG.xls")
End While
IO.File.Move(IDS_FILE, FILE_NEW)
Dim FILE_NEW_Lukenda = FILE_NEW.Replace("_ORIG.xls", "_special_Lukenda_ORIG.xls")
IO.File.Copy(FILE_NEW, FILE_NEW_Lukenda)
'IDS_FILE = ZIEL_PFAD.Replace("\NEW\", "\" & Now.Year & "\").Replace(".xls", "_ORIG.xls")
Dim Excel1 As Object 'New Microsoft.Office.Interop.Excel.Application
@@ -1436,6 +1455,12 @@ Public Class frmStartOptions
NetpriceNEW_SOND += CDbl(Blatt.Range("I" & zeile).Value) ' Aufschalg + NETTO
DT_PLATTS_SONDER.Rows.Add({Blatt.Range("A" & zeile).Value, Blatt.Range("B" & zeile).Value, Blatt.Range("C" & zeile).Value, Blatt.Range("D" & zeile).Value, Blatt.Range("E" & zeile).Value, Blatt.Range("F" & zeile).Value, Blatt.Range("H" & zeile).Value, Blatt.Range("I" & zeile).Value, Blatt.Range("J" & zeile).Value, NetpriceNEW_SOND})
End If
'SONDERKONDITION Lukenda
NetpriceNEW_SOND = getPlattsAufschlag_SONDER_Lukenda(Blatt.Range("B" & zeile).Value)
If NetpriceNEW_SOND > 0 Then
NetpriceNEW_SOND += CDbl(Blatt.Range("I" & zeile).Value) ' Aufschalg + NETTO
DT_PLATTS_SONDER_Lukenda.Rows.Add({Blatt.Range("A" & zeile).Value, Blatt.Range("B" & zeile).Value, Blatt.Range("C" & zeile).Value, Blatt.Range("D" & zeile).Value, Blatt.Range("E" & zeile).Value, Blatt.Range("F" & zeile).Value, Blatt.Range("H" & zeile).Value, Blatt.Range("I" & zeile).Value, Blatt.Range("J" & zeile).Value, NetpriceNEW_SOND})
End If
End If
zeile += 1
@@ -1489,11 +1514,11 @@ Public Class frmStartOptions
End Try
'ALLGEMEIN
genXLS_NewPrice(DT_PLATTS, FILE_NEW) '--> Send XLS Mail
genXLS_NewPrice(DT_PLATTS, FILE_NEW, "IDSPRD: Platts Price Report", "z.batinic@verag.ag;n.ljubas@verag.ag;s.vidovic@verag.ag;ma@verag.ag;alex@verag.ag;ft@verag.ag", "sales@verag.ag;al@verag.ag;sb@verag.ag", "") '--> Send XLS Mail
'SONDERKONDITION
' genXLS_NewPrice(DT_PLATTS_SONDER, FILE_NEW.Replace("_ORIG.xls", "_special_ORIG.xls")) '--> Send XLS Mail
genXLS_NewPrice(DT_PLATTS_SONDER_Lukenda, FILE_NEW_Lukenda, "IDSPRD: Platts Price Report - Lukenda", "sales@verag.ag", "al@verag.ag", "") '--> Send XLS Mail
Next
End If
@@ -1503,7 +1528,7 @@ Public Class frmStartOptions
End Sub
Sub genXLS_NewPrice(DT_PLATTS As DataTable, FILE_NEW As String)
Sub genXLS_NewPrice(DT_PLATTS As DataTable, FILE_NEW As String, MAIL_SUBJ As String, MAIL_TO As String, MAIL_CC As String, MAIL_BCC As String)
':::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
'NEUES EXCEL ERSTELLEN:::::::
':::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
@@ -1571,7 +1596,7 @@ Public Class frmStartOptions
Dim MAIL_attach As New List(Of String)
MAIL_attach.Add(FIN_FILE)
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("z.batinic@verag.ag;n.ljubas@verag.ag;s.vidovic@verag.ag;ma@verag.ag;alex@verag.ag;ft@verag.ag", "IDSPRD: Platts Price Report", "*AUTO*",,,, "sales@verag.ag;al@verag.ag;sb@verag.ag",, MAIL_attach)
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(MAIL_TO, MAIL_SUBJ, "*AUTO*",,,, MAIL_CC, MAIL_BCC, MAIL_attach)
':::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
@@ -3467,7 +3492,7 @@ Public Class frmStartOptions
End Sub
Private Sub LinkLabel33_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel33.LinkClicked
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
Dim bool = getUID_Pruefung(MyTextBox1.Text, "AMBAR", "UID Prüfung AMBAR", "as@verag.ag", "al@verag.ag",, MyTextBox2._value, cbxVermerk.Checked)
Dim bool = getUID_Pruefung(MyTextBox1.Text, "AMBAR", "UID Prüfung AMBAR", "io@ambarlog.de", , "al@verag.ag;as@verag.ag", MyTextBox2._value, cbxVermerk.Checked)
showPic(bool, PictureBox12)
End Sub