Datumsabfrage, CBAM, etc.

SDL/SDL.vbproj

@@ -889,12 +889,6 @@
     <Compile Include="mdm\Besuchsberichte\usrCntlBesuchsberichte.vb">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="mdm\frmDatumsabfrage.Designer.vb">
-      <DependentUpon>frmDatumsabfrage.vb</DependentUpon>
-    </Compile>
-    <Compile Include="mdm\frmDatumsabfrage.vb">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="mdm\frmMDMLieferantenrechnungen.Designer.vb">
       <DependentUpon>frmMDMLieferantenrechnungen.vb</DependentUpon>
     </Compile>
@@ -3421,9 +3415,6 @@
     <EmbeddedResource Include="mdm\Besuchsberichte\usrCntlBesuchsberichte.resx">
       <DependentUpon>usrCntlBesuchsberichte.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="mdm\frmDatumsabfrage.resx">
-      <DependentUpon>frmDatumsabfrage.vb</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="mdm\frmMDMLieferantenrechnungen.resx">
       <DependentUpon>frmMDMLieferantenrechnungen.vb</DependentUpon>
     </EmbeddedResource>

SDL/kunden/usrCntlCBAM.vb

@@ -502,7 +502,7 @@
             SQLWhereMRN &= " AND BelegNr not in (" & MRNNr & ")"
 
 
-            Dim sqlNew = "select BelegNr from Speditionsbuch 
+            Dim sqlNew = "select * from Speditionsbuch 
                            inner join Kunden on Speditionsbuch.[VermittlerKundenNr] = Kunden.KundenNr OR  Speditionsbuch.[EmpfängerKundenNr]= Kunden.KundenNr OR Speditionsbuch.[VermittlerKundenNr] = Kunden.KundenNr OR Speditionsbuch.[EmpfängerKundenNr] = Kunden.KundenNr 
                             where 1 = 1 AND Kunden.EORITIN = '" & EORI & "' AND BelegNr <> '' AND (Speditionsbuch.[Abfertigungsdatum] BETWEEN '" & txtVon._value & "' and '" & txtBis._value & "' )" & SQLWhereMRN
 
@@ -518,11 +518,12 @@
 
             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.Enabled = True
-                btnCBAM_DS_DAKOSY_Spedb.Tag = path
+                    btnCBAM_DS_DAKOSY_Spedb.Tag = path
-                Me.Cursor = Cursors.Default
+                    Me.Cursor = Cursors.Default
-            End If
+                End If
 
 
 

VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj

@@ -362,6 +362,12 @@
     <Compile Include="Classes\cGrenzstelle.vb" />
     <Compile Include="Classes\cGVMS.vb" />
     <Compile Include="Classes\cHandlingssaetzeIntern.vb" />
+    <Compile Include="frmDatumsabfrage.Designer.vb">
+      <DependentUpon>frmDatumsabfrage.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmDatumsabfrage.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Schnittstellen\cHMRC.vb" />
     <Compile Include="Schnittstellen\HMRC\cHMRCToken.vb" />
     <Compile Include="Classes\cKundenAufschubkonten.vb" />
@@ -758,6 +764,9 @@
     <EmbeddedResource Include="DATENSERVER\frmVorlagenUpload.resx">
       <DependentUpon>frmVorlagenUpload.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmDatumsabfrage.resx">
+      <DependentUpon>frmDatumsabfrage.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmErrorMeldung.resx">
       <DependentUpon>frmErrorMeldung.vb</DependentUpon>
     </EmbeddedResource>

VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb

@@ -287,7 +287,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
     End Function
 
 
-    Public Shared Function genExcelFromDT_NEW(dt As DataTable, Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "", Optional openPDF As Boolean = True, Optional optFileName As String = "", Optional endung As String = ".xlsx", Optional autoAdjust As Boolean = True) As String
+    Public Shared Function genExcelFromDT_NEW(dt As DataTable, Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "", Optional openPDF As Boolean = True, Optional optFileName As String = "", Optional endung As String = ".xlsx", Optional autoAdjust As Boolean = False) As String
         Try
 
             Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\SDL\tmp\" ' My.Computer.FileSystem.GetTempFileName
@@ -330,7 +330,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
 
             End If
 
-                Dim filename As String = ""
+            Dim filename As String = ""
             If optFileName <> "" Then
                 filename = sPath & optFileName & endung '".xlsx"
                 While System.IO.File.Exists(filename)

VERAG_PROG_ALLGEMEIN/frmDatumsabfrage.Designer.vb

@@ -1,4 +1,6 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Imports System.Windows.Forms
+
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmDatumsabfrage
     Inherits System.Windows.Forms.Form
 
@@ -168,6 +170,6 @@ Partial Class frmDatumsabfrage
     Friend WithEvents Label1 As Label
     Friend WithEvents dtp_date As DateTimePicker
     Friend WithEvents pnlKunde As Panel
-    Friend WithEvents cboKundenkreis As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Public WithEvents cboKundenkreis As VERAG_PROG_ALLGEMEIN.MyComboBox
-    Friend WithEvents cbxKunden As CheckBox
+    Public WithEvents cbxKunden As CheckBox
 End Class

VERAG_PROG_ALLGEMEIN/frmDatumsabfrage.vb

@@ -1,4 +1,5 @@
-Imports GrapeCity.Viewer.Common.Model
+Imports System.Windows.Forms
+Imports GrapeCity.Viewer.Common.Model
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class frmDatumsabfrage