div. Änderungen, etc.

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -1,6 +1,8 @@
 Imports System.Data.OleDb
 Imports System.IO
+Imports com.sun.xml.internal.rngom
 Imports itextsharp.text.pdf
+Imports jdk.nashorn.internal.objects.annotations
 Imports MDM_Worker
 Imports VERAG_PROG_ALLGEMEIN
 
@@ -4918,7 +4920,7 @@ LEFT JOIN VERAG.dbo.tbl_IDS_Länder land
     End Sub
 
     Sub setBillingDateCompleted(Lieferant_ As String, date_ As Date)
-        SQL.doSQL("UPDATE tblMDMEinarbeitung SET billingdate ='" & date_.ToShortDateString & "' WHERE supplier = '" & Lieferant_ & "'  AND billingdate is null ", "FMZOLL")
+        SQL.doSQL("UPDATE tblMDMEinarbeitung SET billingdate ='" & date_.ToShortDateString & "',  WHERE supplier = '" & Lieferant_ & "'  AND billingdate is null ", "FMZOLL")
     End Sub
 
 
@@ -5545,5 +5547,49 @@ RabattBerechnen:
 
     Private Sub btnImportdet_Click(sender As Object, e As EventArgs) Handles btnImportdet.Click
 
+        Dim SQLWHere As String = "where 1 = 1 "
+
+        Dim rechnungsdatumVon As Date = Nothing
+        Dim rechnungsdatumBis As Date = Nothing
+
+        Select Case Me.LIEFERANT
+            Case "ASFINAG"
+                rechnungsdatumVon = CDate(DateTimePicker2.Value).AddDays(-1)
+                'SQLWHere = "where cast(invoicedate as Date) = '" & rechnungsdatumVon.ToShortDateString & "' supplier like '" & Me.LIEFERANT & "%' "
+            Case "PLOSE"
+                rechnungsdatumVon = CDate(DateTimePicker2.Value)
+                rechnungsdatumBis = CDate(dat_Sum_Bis.Value)
+                'SQLWHere &= "and cast(invoicedate as Date) between '" & rechnungsdatumVon.ToShortDateString & "' and '" & rechnungsdatumBis.ToShortDateString & "' supplier like '" & Me.LIEFERANT & "%' "
+            Case Else
+                rechnungsdatumVon = CDate(DateTimePicker2.Value)
+                'SQLWHere &= "and cast(invoicedate as Date) = '" & rechnungsdatumVon.ToShortDateString & "' supplier like '" & Me.LIEFERANT & "%' "
+        End Select
+
+        SQLWHere &= " and isnull(billing_completed,0) <> 1 and supplier <> 'UTA_VERAG' "
+
+        Dim sqlStr = "Select [supplier], [completed], sum(ds_total) As DS, sum(ds_count) As DS_importiert  FROM [VERAG].[dbo].[tblMDMEinarbeitung]
+                            " & SQLWHere & "
+                            group by [supplier], completed"
+
+        Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
+
+
+
+
+        Using frm As New frmAbrechnungHandling(dt, Nothing, "importierte und nicht abgerechnete Lieferantendaten")
+
+
+            frm.btnPreisliste.Visible = False
+            frm.Button2.Visible = False
+            Button1.Visible = False
+
+            If frm.ShowDialog() = DialogResult.OK Then
+
+
+            End If
+
+
+        End Using
+
     End Sub
 End Class