Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
Imports System.Data.OleDb
|
||||
Imports System.IO
|
||||
Imports com.sun.xml.internal.rngom
|
||||
Imports DocumentFormat.OpenXml.Drawing.Diagrams
|
||||
Imports itextsharp.text.pdf
|
||||
Imports MDM_Worker
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
@@ -76,22 +74,76 @@ Public Class frmMDMDatenverarbetiung
|
||||
txtAnzahl.Text = ""
|
||||
txtPruefsummeNetto.Text = ""
|
||||
Button1.Enabled = True
|
||||
pb_importOK.Visible = False
|
||||
|
||||
Select Case LIEFERANT
|
||||
Case "PLOSE" : initDgv_PLOSE()
|
||||
Case "PLOSE" : checkImport(LIEFERANT) : initDgv_PLOSE()
|
||||
btnDatenLaden.Text = "Daten laden"
|
||||
Case "UTA" : initDgv_UTA()
|
||||
Case "UTA" : checkImport(LIEFERANT) : initDgv_UTA()
|
||||
btnDatenLaden.Text = "Daten laden"
|
||||
Case "ASFINAG" : initDgv_ASFINAG(cbxASFINAGAbgerechnet.Checked, cbxBelegeerstellt.Checked)
|
||||
Case "ASFINAG" : checkImport(LIEFERANT) : initDgv_ASFINAG(cbxASFINAGAbgerechnet.Checked, cbxBelegeerstellt.Checked)
|
||||
btnDatenLaden.Text = "Daten laden"
|
||||
Case "IDS" : initDgv_IDS()
|
||||
Case "IDS" : checkImport(LIEFERANT) : initDgv_IDS()
|
||||
btnDatenLaden.Text = "Daten laden"
|
||||
Button1.Enabled = False
|
||||
Case "MSE" : initDgv_MSE()
|
||||
Case "MSE" : checkImport(LIEFERANT) : initDgv_MSE()
|
||||
btnDatenLaden.Text = "Daten laden"
|
||||
End Select
|
||||
End Sub
|
||||
|
||||
Private Sub checkImport(LIEFERANT As String)
|
||||
|
||||
'autom Import bei Asfinag, Plose und MSE
|
||||
'(noch) manueller Import bei UTA (weil immer so spät kommt) und IDS (wegen Nacharbeitung)
|
||||
|
||||
pb_importOK.Visible = True
|
||||
Dim Import_OK As Boolean = False
|
||||
|
||||
Dim sqlstr As String = ""
|
||||
|
||||
Select Case LIEFERANT
|
||||
Case "PLOSE"
|
||||
sqlstr = "SELECT * FROM [VERAG].[dbo].[tblMDMEinarbeitung] where supplier = '" & LIEFERANT & "' and invoicedate between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "'"
|
||||
Case "ASFINAG"
|
||||
sqlstr = "SELECT * FROM [VERAG].[dbo].[tblMDMEinarbeitung] where supplier = '" & LIEFERANT & "' and YEAR(invoicedate) = " & Today().Year
|
||||
Case Else
|
||||
sqlstr = "SELECT * FROM [VERAG].[dbo].[tblMDMEinarbeitung] where supplier = '" & LIEFERANT & "' and invoicedate ='" & DateTimePicker2.Text & "'"
|
||||
End Select
|
||||
|
||||
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
|
||||
|
||||
If dt.Rows.Count > 0 Then
|
||||
Dim hasImcompleIports As Boolean = dt.AsEnumerable().Any(Function(row) row.Field(Of Boolean)("completed") = False)
|
||||
If hasImcompleIports Then
|
||||
pb_importOK.BackgroundImage = SDL.My.Resources.Resources.del
|
||||
Else
|
||||
If LIEFERANT = "IDS" Then 'IDS Bedard aktuell noch einer Nachbearbeitung!
|
||||
Dim nacharbeitungNotCompleted As Boolean = dt.AsEnumerable().Any(Function(row) row.Field(Of Boolean)("nacharbeitung_completed") = False)
|
||||
|
||||
If nacharbeitungNotCompleted Then
|
||||
Import_OK = False
|
||||
Else
|
||||
Import_OK = True
|
||||
End If
|
||||
|
||||
Else
|
||||
Import_OK = True
|
||||
End If
|
||||
|
||||
End If
|
||||
Else
|
||||
Import_OK = False
|
||||
End If
|
||||
|
||||
|
||||
If Import_OK Then
|
||||
pb_importOK.BackgroundImage = SDL.My.Resources.Resources.ok
|
||||
Else
|
||||
pb_importOK.BackgroundImage = SDL.My.Resources.Resources.del
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub btnREerstellen_Click_1(sender As Object, e As EventArgs) Handles btnREerstellen.Click
|
||||
|
||||
Dim errorTmp = False
|
||||
@@ -120,7 +172,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
End If
|
||||
Case "IDS"
|
||||
If cbxIDSmitVerag.Checked Then
|
||||
MsgBox("Abrechnung ohne VERAG/VERAG360 !")
|
||||
MsgBox("Abrechnung ohne VERAG/VERAG360!")
|
||||
Exit Sub
|
||||
End If
|
||||
showIDSContextMenu()
|
||||
@@ -1049,6 +1101,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
cbxASFINAGAbgerechnet.Visible = True
|
||||
cbxBelegeerstellt.Visible = True
|
||||
pnlAsfinag.Visible = True
|
||||
checkImport(LIEFERANT)
|
||||
Exit Sub
|
||||
Case "IDS"
|
||||
Panel5.Visible = True
|
||||
@@ -1072,7 +1125,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
|
||||
|
||||
Function genRGAtt_PLOSE(ploseParam As cPLOSE) As Boolean
|
||||
Dim dt_Main As DataTable = SQL.loadDgvBySql_Param("SELECT [AdressenNr],PLOSEKundenNr FROM tblPLOSE_Details INNER JOIN Adressen ON plose_POLSEKundennummer=PLOSEKundenNr where plose_Fakturiert = 0 AND plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & " ) AND plose_DatumTransaktion between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "' AND AdressenNr = 401280 group by [AdressenNr],PLOSEKundenNr ", "FMZOLL")
|
||||
Dim dt_Main As DataTable = SQL.loadDgvBySql_Param("SELECT [AdressenNr],PLOSEKundenNr FROM tblPLOSE_Details INNER JOIN Adressen ON plose_POLSEKundennummer=PLOSEKundenNr where plose_Fakturiert = 0 AND plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & " ) AND plose_DatumTransaktion between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "' group by [AdressenNr],PLOSEKundenNr ", "FMZOLL")
|
||||
'MsgBox("Keine Daten!""SELECT [AdressenNr],PLOSEKundenNr FROM tblPLOSE_Details INNER JOIN Adressen ON plose_POLSEKundennummer=PLOSEKundenNr where AND plose_Fakturiert = 0 AND plose_DatumTransaktion between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "' group by [AdressenNr],PLOSEKundenNr ")
|
||||
If dt_Main Is Nothing OrElse dt_Main.Rows.Count = 0 Then
|
||||
MsgBox("Keine Daten!")
|
||||
@@ -1149,7 +1202,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
INNER JOIN (((Adressen INNER JOIN tblUTAImportNew ON Adressen.UTAKundenNr = tblUTAImportNew.Kundennummer)
|
||||
INNER JOIN Offertenpositionen ON Adressen.AdressenNr = Offertenpositionen.KundenNr)
|
||||
INNER JOIN tblUTALeistungen ON (tblUTALeistungen.VERAG_LeistungsNr = Offertenpositionen.LeistungsNr) AND (tblUTALeistungen.VERAG_OffertenNr = Offertenpositionen.OffertenNr) AND (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart
|
||||
where isnull(charged,0) = 0 and cast([Rechnungsdatum] as date) = '" & DateTimePicker2.Text & "' and Adressen.AdressenNr not in(756150, 711104) and KundenNr = 401280 " & IIf(test, " and KundenNr = 402352 or KundenNr = 402421 ", "") &
|
||||
where isnull(charged,0) = 0 and cast([Rechnungsdatum] as date) = '" & DateTimePicker2.Text & "' and Adressen.AdressenNr not in(756150, 711104) " & IIf(test, " and KundenNr = 402352 or KundenNr = 402421 ", "") &
|
||||
" group by Kundennummer, KundenNr, UTAExportCSV,Rechnungsdruck"
|
||||
|
||||
Dim dt_Main As DataTable = SQL.loadDgvBySql_Param(SQLStr, "FMZOLL", 1200)
|
||||
@@ -1448,8 +1501,8 @@ Public Class frmMDMDatenverarbetiung
|
||||
Dim top = ""
|
||||
Dim sqlWhere = ""
|
||||
Select Case art
|
||||
Case "IDS" : sqlWhere = " AND tblIDSTransactionsNew.OutletCountryCode<>740543" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, " AND Adressen.AdressenNr = 401280 ", "")
|
||||
Case "IDS_AT" : sqlWhere = " AND tblIDSTransactionsNew.OutletCountryCode=740543" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, " AND Adressen.AdressenNr = 401280 ", "")
|
||||
Case "IDS" : sqlWhere = " AND tblIDSTransactionsNew.OutletCountryCode<>740543" & IIf(Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, " AND Adressen.AdressenNr = 204055 ", "")
|
||||
Case "IDS_AT" : sqlWhere = " AND tblIDSTransactionsNew.OutletCountryCode=740543" & IIf(Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, " AND Adressen.AdressenNr = 204055 ", "")
|
||||
Case Else
|
||||
MsgBox("falscher Typ!") : Return False
|
||||
|
||||
@@ -4857,4 +4910,5 @@ RabattBerechnen:
|
||||
Private Sub cbxIDSmitVerag_CheckedChanged(sender As Object, e As EventArgs) Handles cbxIDSmitVerag.CheckedChanged
|
||||
initDgv_IDS()
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
Reference in New Issue
Block a user