This commit is contained in:
Digital Data - Marlon Schreiber 2018-08-08 17:02:33 +02:00
parent 586461e0e9
commit dbe2ef34ec
16 changed files with 74 additions and 86 deletions

View File

@ -30,12 +30,6 @@ Partial Class frmAbschluss
Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
Me.VWAbschlussDataGridView = New System.Windows.Forms.DataGridView()
Me.Auswahl = New System.Windows.Forms.DataGridViewCheckBoxColumn()
Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.VWAbschlussBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.MyDataset = New KommiCollo.MyDataset()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.Label1 = New System.Windows.Forms.Label()
Me.cmbMandant = New System.Windows.Forms.ComboBox()
@ -43,12 +37,18 @@ Partial Class frmAbschluss
Me.btnAbschluss = New System.Windows.Forms.Button()
Me.Panel2 = New System.Windows.Forms.Panel()
Me.VWKOMMCOLLI_UEBERSICHTDataGridView = New System.Windows.Forms.DataGridView()
Me.VWKOMMCOLLI_UEBERSICHTBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.DSMercator = New KommiCollo.DSMercator()
Me.VKKOPFBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.VKKOPFTableAdapter = New KommiCollo.DSMercatorTableAdapters.VKKOPFTableAdapter()
Me.TableAdapterManager1 = New KommiCollo.DSMercatorTableAdapters.TableAdapterManager()
Me.bw_Tagesabschluss = New System.ComponentModel.BackgroundWorker()
Me.VWKOMMCOLLI_UEBERSICHTBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.MyDataset = New KommiCollo.MyDataset()
Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.VWAbschlussBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.VWHUP_REPORT1BindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.VWAbschlussTableAdapter = New KommiCollo.MyDatasetTableAdapters.VWKOMMCOLLI_ABSCHLUSS_PAKETTableAdapter()
Me.TableAdapterManager = New KommiCollo.MyDatasetTableAdapters.TableAdapterManager()
@ -62,7 +62,6 @@ Partial Class frmAbschluss
Me.TBKOMMCOLLI_PAKET_POS_LSTableAdapter = New KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_PAKET_POS_LSTableAdapter()
Me.VWHUP_REPORT1TableAdapter = New KommiCollo.MyDatasetTableAdapters.VWHUP_REPORT1TableAdapter()
Me.VWKOMMCOLLI_UEBERSICHTTableAdapter = New KommiCollo.MyDatasetTableAdapters.VWKOMMCOLLI_UEBERSICHTTableAdapter()
Me.DataGridViewCheckBoxColumn2 = New System.Windows.Forms.DataGridViewCheckBoxColumn()
Me.SELECTED = New System.Windows.Forms.DataGridViewCheckBoxColumn()
Me.UEBERTRAGEN = New System.Windows.Forms.DataGridViewCheckBoxColumn()
Me.GUID = New System.Windows.Forms.DataGridViewTextBoxColumn()
@ -76,14 +75,14 @@ Partial Class frmAbschluss
Me.FERTIGDataGridViewCheckBoxColumn = New System.Windows.Forms.DataGridViewCheckBoxColumn()
Me.ToolStrip1.SuspendLayout()
CType(Me.VWAbschlussDataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.VWAbschlussBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
Me.Panel2.SuspendLayout()
CType(Me.VWKOMMCOLLI_UEBERSICHTDataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.VWKOMMCOLLI_UEBERSICHTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.DSMercator, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.VKKOPFBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.VWKOMMCOLLI_UEBERSICHTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.VWAbschlussBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.VWHUP_REPORT1BindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBKOMMCOLLI_MANDANTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBKOMMCOLLI_PAKET_POSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
@ -146,44 +145,6 @@ Partial Class frmAbschluss
Me.Auswahl.Name = "Auswahl"
Me.Auswahl.Width = 60
'
'DataGridViewTextBoxColumn1
'
Me.DataGridViewTextBoxColumn1.DataPropertyName = "GUID"
Me.DataGridViewTextBoxColumn1.HeaderText = "ID"
Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1"
Me.DataGridViewTextBoxColumn1.ReadOnly = True
Me.DataGridViewTextBoxColumn1.Width = 60
'
'DataGridViewTextBoxColumn2
'
Me.DataGridViewTextBoxColumn2.DataPropertyName = "Mandant"
Me.DataGridViewTextBoxColumn2.HeaderText = "Mandant"
Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
'
'DataGridViewTextBoxColumn3
'
Me.DataGridViewTextBoxColumn3.DataPropertyName = "PAKET_ID"
Me.DataGridViewTextBoxColumn3.HeaderText = "Paket-ID"
Me.DataGridViewTextBoxColumn3.Name = "DataGridViewTextBoxColumn3"
Me.DataGridViewTextBoxColumn3.Width = 130
'
'DataGridViewTextBoxColumn4
'
Me.DataGridViewTextBoxColumn4.DataPropertyName = "Gepackt"
Me.DataGridViewTextBoxColumn4.HeaderText = "Gepackt"
Me.DataGridViewTextBoxColumn4.Name = "DataGridViewTextBoxColumn4"
Me.DataGridViewTextBoxColumn4.Width = 150
'
'VWAbschlussBindingSource
'
Me.VWAbschlussBindingSource.DataMember = "VWKOMMCOLLI_ABSCHLUSS_PAKET"
Me.VWAbschlussBindingSource.DataSource = Me.MyDataset
'
'MyDataset
'
Me.MyDataset.DataSetName = "MyDataset"
Me.MyDataset.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
'
'Panel1
'
Me.Panel1.Controls.Add(Me.Label1)
@ -256,7 +217,7 @@ Partial Class frmAbschluss
Me.VWKOMMCOLLI_UEBERSICHTDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
Me.VWKOMMCOLLI_UEBERSICHTDataGridView.AutoGenerateColumns = False
Me.VWKOMMCOLLI_UEBERSICHTDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.VWKOMMCOLLI_UEBERSICHTDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewCheckBoxColumn2, Me.SELECTED, Me.UEBERTRAGEN, Me.GUID, Me.ABHOLDATUM, Me.SDG_GEWICHT, Me.BORDERONR, Me.EMP, Me.EMP_ZUSATZ, Me.EMP_PLZ_STR, Me.EMP_ORT, Me.FERTIGDataGridViewCheckBoxColumn})
Me.VWKOMMCOLLI_UEBERSICHTDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.SELECTED, Me.UEBERTRAGEN, Me.GUID, Me.ABHOLDATUM, Me.SDG_GEWICHT, Me.BORDERONR, Me.EMP, Me.EMP_ZUSATZ, Me.EMP_PLZ_STR, Me.EMP_ORT, Me.FERTIGDataGridViewCheckBoxColumn})
Me.VWKOMMCOLLI_UEBERSICHTDataGridView.DataSource = Me.VWKOMMCOLLI_UEBERSICHTBindingSource
Me.VWKOMMCOLLI_UEBERSICHTDataGridView.Location = New System.Drawing.Point(40, 130)
Me.VWKOMMCOLLI_UEBERSICHTDataGridView.Name = "VWKOMMCOLLI_UEBERSICHTDataGridView"
@ -264,11 +225,6 @@ Partial Class frmAbschluss
Me.VWKOMMCOLLI_UEBERSICHTDataGridView.TabIndex = 2
Me.VWKOMMCOLLI_UEBERSICHTDataGridView.Visible = False
'
'VWKOMMCOLLI_UEBERSICHTBindingSource
'
Me.VWKOMMCOLLI_UEBERSICHTBindingSource.DataMember = "VWKOMMCOLLI_UEBERSICHT"
Me.VWKOMMCOLLI_UEBERSICHTBindingSource.DataSource = Me.MyDataset
'
'DSMercator
'
Me.DSMercator.DataSetName = "DSMercator"
@ -292,6 +248,49 @@ Partial Class frmAbschluss
'bw_Tagesabschluss
'
'
'VWKOMMCOLLI_UEBERSICHTBindingSource
'
Me.VWKOMMCOLLI_UEBERSICHTBindingSource.DataMember = "VWKOMMCOLLI_UEBERSICHT"
Me.VWKOMMCOLLI_UEBERSICHTBindingSource.DataSource = Me.MyDataset
'
'MyDataset
'
Me.MyDataset.DataSetName = "MyDataset"
Me.MyDataset.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
'
'DataGridViewTextBoxColumn1
'
Me.DataGridViewTextBoxColumn1.DataPropertyName = "GUID"
Me.DataGridViewTextBoxColumn1.HeaderText = "ID"
Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1"
Me.DataGridViewTextBoxColumn1.ReadOnly = True
Me.DataGridViewTextBoxColumn1.Width = 60
'
'DataGridViewTextBoxColumn2
'
Me.DataGridViewTextBoxColumn2.DataPropertyName = "Mandant"
Me.DataGridViewTextBoxColumn2.HeaderText = "Mandant"
Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
'
'DataGridViewTextBoxColumn3
'
Me.DataGridViewTextBoxColumn3.DataPropertyName = "PAKET_ID"
Me.DataGridViewTextBoxColumn3.HeaderText = "Paket-ID"
Me.DataGridViewTextBoxColumn3.Name = "DataGridViewTextBoxColumn3"
Me.DataGridViewTextBoxColumn3.Width = 130
'
'DataGridViewTextBoxColumn4
'
Me.DataGridViewTextBoxColumn4.DataPropertyName = "Gepackt"
Me.DataGridViewTextBoxColumn4.HeaderText = "Gepackt"
Me.DataGridViewTextBoxColumn4.Name = "DataGridViewTextBoxColumn4"
Me.DataGridViewTextBoxColumn4.Width = 150
'
'VWAbschlussBindingSource
'
Me.VWAbschlussBindingSource.DataMember = "VWKOMMCOLLI_ABSCHLUSS_PAKET"
Me.VWAbschlussBindingSource.DataSource = Me.MyDataset
'
'VWHUP_REPORT1BindingSource
'
Me.VWHUP_REPORT1BindingSource.DataMember = "VWHUP_REPORT1"
@ -356,14 +355,6 @@ Partial Class frmAbschluss
'
Me.VWKOMMCOLLI_UEBERSICHTTableAdapter.ClearBeforeFill = True
'
'DataGridViewCheckBoxColumn2
'
Me.DataGridViewCheckBoxColumn2.FalseValue = "False"
Me.DataGridViewCheckBoxColumn2.Frozen = True
Me.DataGridViewCheckBoxColumn2.HeaderText = "Löschen"
Me.DataGridViewCheckBoxColumn2.Name = "DataGridViewCheckBoxColumn2"
Me.DataGridViewCheckBoxColumn2.TrueValue = "True"
'
'SELECTED
'
Me.SELECTED.DataPropertyName = "SELECTED"
@ -452,15 +443,15 @@ Partial Class frmAbschluss
Me.ToolStrip1.ResumeLayout(False)
Me.ToolStrip1.PerformLayout()
CType(Me.VWAbschlussDataGridView, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.VWAbschlussBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit()
Me.Panel1.ResumeLayout(False)
Me.Panel1.PerformLayout()
Me.Panel2.ResumeLayout(False)
CType(Me.VWKOMMCOLLI_UEBERSICHTDataGridView, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.VWKOMMCOLLI_UEBERSICHTBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.DSMercator, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.VKKOPFBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.VWKOMMCOLLI_UEBERSICHTBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.VWAbschlussBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.VWHUP_REPORT1BindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBKOMMCOLLI_MANDANTBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBKOMMCOLLI_PAKET_POSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
@ -509,7 +500,6 @@ Partial Class frmAbschluss
Friend WithEvents VWKOMMCOLLI_UEBERSICHTDataGridView As DataGridView
Friend WithEvents VWKOMMCOLLI_UEBERSICHTBindingSource As BindingSource
Friend WithEvents VWKOMMCOLLI_UEBERSICHTTableAdapter As MyDatasetTableAdapters.VWKOMMCOLLI_UEBERSICHTTableAdapter
Friend WithEvents DataGridViewCheckBoxColumn2 As DataGridViewCheckBoxColumn
Friend WithEvents SELECTED As DataGridViewCheckBoxColumn
Friend WithEvents UEBERTRAGEN As DataGridViewCheckBoxColumn
Friend WithEvents GUID As DataGridViewTextBoxColumn

View File

@ -129,9 +129,6 @@
<metadata name="MyDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="DataGridViewCheckBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="SELECTED.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>

View File

@ -686,9 +686,9 @@ Partial Class frmMain
Me.pnlHuP.Controls.Add(Me.btnSendungFertig)
Me.pnlHuP.Controls.Add(Me.txtScanHUP)
Me.pnlHuP.Controls.Add(Me.Label9)
Me.pnlHuP.Location = New System.Drawing.Point(3, 3)
Me.pnlHuP.Location = New System.Drawing.Point(157, 3)
Me.pnlHuP.Name = "pnlHuP"
Me.pnlHuP.Size = New System.Drawing.Size(1049, 553)
Me.pnlHuP.Size = New System.Drawing.Size(895, 553)
Me.pnlHuP.TabIndex = 14
Me.pnlHuP.Visible = False
'
@ -1078,7 +1078,7 @@ Partial Class frmMain
Me.txtScanHUP.Font = New System.Drawing.Font("Segoe UI", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtScanHUP.Location = New System.Drawing.Point(185, 61)
Me.txtScanHUP.Name = "txtScanHUP"
Me.txtScanHUP.Size = New System.Drawing.Size(855, 33)
Me.txtScanHUP.Size = New System.Drawing.Size(701, 33)
Me.txtScanHUP.TabIndex = 1
'
'Label9

View File

@ -414,7 +414,7 @@ Public Class frmMain
btnAddPaket.Enabled = True
tsinfolabel.Text = "Vorgang abgebrochen"
tsinfolabel.Visible = True
ListBoxFortras.ResetText()
ListBoxFortras.Items.Clear()
txtFreitext.Text = ""
txtHinweistext.Text = ""
Catch ex As Exception
@ -668,7 +668,7 @@ Public Class frmMain
btnAddPaket.Enabled = True
tsinfolabel.Text = "Vorgang abgebrochen"
tsinfolabel.Visible = True
ListBoxFortras.ResetText()
ListBoxFortras.Items.Clear()
frmPrintOptions.ShowDialog()
GridControlLHM.DataSource = Nothing
@ -826,11 +826,11 @@ Public Class frmMain
End Sub
Private Sub pnlHuP_VisibleChanged(sender As Object, e As EventArgs) Handles pnlHuP.VisibleChanged
If pnlHuP.Visible = True Then
txtFreitext.Text = ""
txtFreitext.Text = ""
txtHinweistext.Text = ""
ListBoxFortras.ResetText()
End If
ListBoxFortras.Items.Clear()
End Sub
Private Sub txtFreitext_TextChanged(sender As Object, e As EventArgs) Handles txtFreitext.TextChanged

View File

@ -1146,3 +1146,4 @@ E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.exe
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.xml
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.pdb
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.vbprojAssemblyReference.cache

File diff suppressed because one or more lines are too long

View File

@ -1,2 +1,2 @@
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.0.msi
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.0.wixpdb
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.1.msi
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.1.wixpdb

View File

@ -1,2 +1,2 @@
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.0.msi
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.0.wixpdb
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.1.msi
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.1.wixpdb

View File

@ -2,9 +2,9 @@ E:\JenneJ\Visual Studio\SchaumKommi\SetupWix\bin\Debug\KommiCollo-x86-1.0.0.0.ms
E:\JenneJ\Visual Studio\SchaumKommi\SetupWix\bin\Debug\KommiCollo-x86-1.0.0.0.wixpdb
E:\SchreiberM\Visual Studio\GIT\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.0.msi
E:\SchreiberM\Visual Studio\GIT\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.0.wixpdb
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.0.msi
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.0.wixpdb
obj\Debug\Product.wixobj
obj\Debug\SetupWix.wixproj.BindContentsFileListde-DE.txt
obj\Debug\SetupWix.wixproj.BindOutputsFileListde-DE.txt
obj\Debug\SetupWix.wixproj.BindBuiltOutputsFileListde-DE.txt
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.1.msi
E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.1.wixpdb