jj abschluss 2

This commit is contained in:
Jonathan Jenne
2017-09-25 11:21:08 +02:00
parent 6d6126c401
commit e4b737c7db
17 changed files with 120 additions and 119 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -29,6 +29,12 @@ Partial Class frmAbschluss
Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
Me.VWAbschlussDataGridView = New System.Windows.Forms.DataGridView() Me.VWAbschlussDataGridView = New System.Windows.Forms.DataGridView()
Me.Auswahl = New System.Windows.Forms.DataGridViewCheckBoxColumn() 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.Panel1 = New System.Windows.Forms.Panel()
Me.cmbMandant = New System.Windows.Forms.ComboBox() Me.cmbMandant = New System.Windows.Forms.ComboBox()
Me.btndelete = New System.Windows.Forms.Button() Me.btndelete = New System.Windows.Forms.Button()
@@ -38,12 +44,6 @@ Partial Class frmAbschluss
Me.VKKOPFBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.VKKOPFBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.VKKOPFTableAdapter = New KommiCollo.DSMercatorTableAdapters.VKKOPFTableAdapter() Me.VKKOPFTableAdapter = New KommiCollo.DSMercatorTableAdapters.VKKOPFTableAdapter()
Me.TableAdapterManager1 = New KommiCollo.DSMercatorTableAdapters.TableAdapterManager() Me.TableAdapterManager1 = New KommiCollo.DSMercatorTableAdapters.TableAdapterManager()
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.VWAbschlussTableAdapter = New KommiCollo.MyDatasetTableAdapters.VWKOMMCOLLI_ABSCHLUSS_PAKETTableAdapter() Me.VWAbschlussTableAdapter = New KommiCollo.MyDatasetTableAdapters.VWKOMMCOLLI_ABSCHLUSS_PAKETTableAdapter()
Me.TableAdapterManager = New KommiCollo.MyDatasetTableAdapters.TableAdapterManager() Me.TableAdapterManager = New KommiCollo.MyDatasetTableAdapters.TableAdapterManager()
Me.TBKOMMCOLLI_MANDANTBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBKOMMCOLLI_MANDANTBindingSource = New System.Windows.Forms.BindingSource(Me.components)
@@ -54,14 +54,15 @@ Partial Class frmAbschluss
Me.TBKOMMCOLLI_PAKET_KOPFTableAdapter = New KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_PAKET_KOPFTableAdapter() Me.TBKOMMCOLLI_PAKET_KOPFTableAdapter = New KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_PAKET_KOPFTableAdapter()
Me.TBKOMMCOLLI_PAKET_POS_LSBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBKOMMCOLLI_PAKET_POS_LSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.TBKOMMCOLLI_PAKET_POS_LSTableAdapter = New KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_PAKET_POS_LSTableAdapter() Me.TBKOMMCOLLI_PAKET_POS_LSTableAdapter = New KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_PAKET_POS_LSTableAdapter()
Me.bw_Tagesabschluss = New System.ComponentModel.BackgroundWorker()
Me.ToolStrip1.SuspendLayout() Me.ToolStrip1.SuspendLayout()
CType(Me.VWAbschlussDataGridView, System.ComponentModel.ISupportInitialize).BeginInit() 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.Panel1.SuspendLayout()
Me.Panel2.SuspendLayout() Me.Panel2.SuspendLayout()
CType(Me.DSMercator, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DSMercator, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.VKKOPFBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.VKKOPFBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.VWAbschlussBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBKOMMCOLLI_MANDANTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBKOMMCOLLI_MANDANTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBKOMMCOLLI_PAKET_POSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBKOMMCOLLI_PAKET_POSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBKOMMCOLLI_PAKET_KOPFBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBKOMMCOLLI_PAKET_KOPFBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -123,6 +124,44 @@ Partial Class frmAbschluss
Me.Auswahl.Name = "Auswahl" Me.Auswahl.Name = "Auswahl"
Me.Auswahl.Width = 60 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 'Panel1
' '
Me.Panel1.Controls.Add(Me.cmbMandant) Me.Panel1.Controls.Add(Me.cmbMandant)
@@ -144,6 +183,7 @@ Partial Class frmAbschluss
' '
'btndelete 'btndelete
' '
Me.btndelete.Enabled = False
Me.btndelete.Image = Global.KommiCollo.My.Resources.Resources.delete2 Me.btndelete.Image = Global.KommiCollo.My.Resources.Resources.delete2
Me.btndelete.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btndelete.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btndelete.Location = New System.Drawing.Point(3, 194) Me.btndelete.Location = New System.Drawing.Point(3, 194)
@@ -156,6 +196,7 @@ Partial Class frmAbschluss
' '
'btnAbschluss 'btnAbschluss
' '
Me.btnAbschluss.Enabled = False
Me.btnAbschluss.Image = Global.KommiCollo.My.Resources.Resources.package_go Me.btnAbschluss.Image = Global.KommiCollo.My.Resources.Resources.package_go
Me.btnAbschluss.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnAbschluss.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnAbschluss.Location = New System.Drawing.Point(3, 64) Me.btnAbschluss.Location = New System.Drawing.Point(3, 64)
@@ -195,44 +236,6 @@ Partial Class frmAbschluss
Me.TableAdapterManager1.UpdateOrder = KommiCollo.DSMercatorTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete Me.TableAdapterManager1.UpdateOrder = KommiCollo.DSMercatorTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
Me.TableAdapterManager1.VKKOPFTableAdapter = Me.VKKOPFTableAdapter Me.TableAdapterManager1.VKKOPFTableAdapter = Me.VKKOPFTableAdapter
' '
'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
'
'VWAbschlussTableAdapter 'VWAbschlussTableAdapter
' '
Me.VWAbschlussTableAdapter.ClearBeforeFill = True Me.VWAbschlussTableAdapter.ClearBeforeFill = True
@@ -244,6 +247,7 @@ Partial Class frmAbschluss
Me.TableAdapterManager.TBKOMMCOLLI_MANDANTTableAdapter = Nothing Me.TableAdapterManager.TBKOMMCOLLI_MANDANTTableAdapter = Nothing
Me.TableAdapterManager.TBKOMMCOLLI_PAKET_KOPFTableAdapter = Nothing Me.TableAdapterManager.TBKOMMCOLLI_PAKET_KOPFTableAdapter = Nothing
Me.TableAdapterManager.TBKOMMCOLLI_PAKET_POSTableAdapter = Nothing Me.TableAdapterManager.TBKOMMCOLLI_PAKET_POSTableAdapter = Nothing
Me.TableAdapterManager.TBKOMMCOLLI_SDGPOSITIONENTableAdapter = Nothing
Me.TableAdapterManager.TBKOMMCOLLI_TERMINARTTableAdapter = Nothing Me.TableAdapterManager.TBKOMMCOLLI_TERMINARTTableAdapter = Nothing
Me.TableAdapterManager.UpdateOrder = KommiCollo.MyDatasetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete Me.TableAdapterManager.UpdateOrder = KommiCollo.MyDatasetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
' '
@@ -299,12 +303,12 @@ Partial Class frmAbschluss
Me.ToolStrip1.ResumeLayout(False) Me.ToolStrip1.ResumeLayout(False)
Me.ToolStrip1.PerformLayout() Me.ToolStrip1.PerformLayout()
CType(Me.VWAbschlussDataGridView, System.ComponentModel.ISupportInitialize).EndInit() 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.ResumeLayout(False)
Me.Panel2.ResumeLayout(False) Me.Panel2.ResumeLayout(False)
CType(Me.DSMercator, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DSMercator, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.VKKOPFBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.VKKOPFBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.VWAbschlussBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBKOMMCOLLI_MANDANTBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBKOMMCOLLI_MANDANTBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBKOMMCOLLI_PAKET_POSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBKOMMCOLLI_PAKET_POSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBKOMMCOLLI_PAKET_KOPFBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBKOMMCOLLI_PAKET_KOPFBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
@@ -345,4 +349,5 @@ Partial Class frmAbschluss
Friend WithEvents cmbMandant As System.Windows.Forms.ComboBox Friend WithEvents cmbMandant As System.Windows.Forms.ComboBox
Friend WithEvents TBKOMMCOLLI_PAKET_POS_LSBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBKOMMCOLLI_PAKET_POS_LSBindingSource As System.Windows.Forms.BindingSource
Friend WithEvents TBKOMMCOLLI_PAKET_POS_LSTableAdapter As KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_PAKET_POS_LSTableAdapter Friend WithEvents TBKOMMCOLLI_PAKET_POS_LSTableAdapter As KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_PAKET_POS_LSTableAdapter
Friend WithEvents bw_Tagesabschluss As System.ComponentModel.BackgroundWorker
End Class End Class

View File

@@ -141,9 +141,6 @@
<metadata name="TableAdapterManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="TableAdapterManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>477, 56</value> <value>477, 56</value>
</metadata> </metadata>
<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="VWAbschlussTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="VWAbschlussTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>330, 17</value> <value>330, 17</value>
</metadata> </metadata>
@@ -174,4 +171,10 @@
<metadata name="TBKOMMCOLLI_PAKET_POS_LSTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="TBKOMMCOLLI_PAKET_POS_LSTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>317, 95</value> <value>317, 95</value>
</metadata> </metadata>
<metadata name="bw_Tagesabschluss.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>611, 95</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>187</value>
</metadata>
</root> </root>

View File

@@ -205,20 +205,30 @@
Me.Validate() Me.Validate()
VWAbschlussBindingSource.EndEdit() VWAbschlussBindingSource.EndEdit()
' Fragen ob das Profil wirklich gelöscht werden soll ' Fragen ob das Profil wirklich gelöscht werden soll
Dim result As MsgBoxResult = MsgBox("Sind Sie sicher, dass sie für die ausgewählten Pakete einen Abschluss durchführen wollen?", MsgBoxStyle.YesNo, "Abschluss bestätigen") Dim result As DialogResult = MessageBox.Show("Dies wird die Sendungsdaten exportieren und verschicken." & vbNewLine & vbNewLine & "DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN!" & vbNewLine & vbNewLine & "Sind Sie sicher dass Sie den Tageschluss durchführen wollen?", "Tagesabschluss", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation, MessageBoxDefaultButton.Button2)
' wenn das Profil gelöscht werden soll ' wenn das Profil gelöscht werden soll
If result = MsgBoxResult.Yes Then If result = MsgBoxResult.Yes Then
Dim Speicherort As String
Mandant_ID = 0
Mandant_ID = TBKOMMCOLLI_MANDANTTableAdapter.cmdGetGUIDbyKurzname(Mandant) If cmbMandant.Text = "GLS" Then
Speicherort = TBKOMMCOLLI_MANDANTTableAdapter.cmdgetSpeicherort(Mandant_ID)
If Speicherort IsNot Nothing Then Dim Speicherort As String
AbschlussPaket(Mandant_ID, Speicherort) Mandant_ID = 0
Else
MsgBox("Achtung: Ein Mandant konnte nicht bestimmt werden!", MsgBoxStyle.Exclamation) Mandant_ID = TBKOMMCOLLI_MANDANTTableAdapter.cmdGetGUIDbyKurzname(Mandant)
Speicherort = TBKOMMCOLLI_MANDANTTableAdapter.cmdgetSpeicherort(Mandant_ID)
If Speicherort IsNot Nothing Then
AbschlussPaket(Mandant_ID, Speicherort)
Else
MsgBox("Achtung: Ein Mandant konnte nicht bestimmt werden!", MsgBoxStyle.Exclamation)
End If
Load_Pakete(Mandant)
ElseIf cmbMandant.Text = "HuP" Then
bw_Tagesabschluss.RunWorkerAsync()
End If End If
Load_Pakete(Mandant)
End If End If
End Sub End Sub
@@ -229,15 +239,24 @@
Dim result As MsgBoxResult = MsgBox("Sind Sie sicher, dass sie die ausgewählten Pakete löschen wollen?", MsgBoxStyle.YesNo, "Löschen bestätigen") Dim result As MsgBoxResult = MsgBox("Sind Sie sicher, dass sie die ausgewählten Pakete löschen wollen?", MsgBoxStyle.YesNo, "Löschen bestätigen")
' wenn das Profil gelöscht werden soll ' wenn das Profil gelöscht werden soll
If result = MsgBoxResult.Yes Then If result = MsgBoxResult.Yes Then
For Each dbRow As DataRow In MyDataset.VWKOMMCOLLI_ABSCHLUSS_PAKET.Rows
If CBool(dbRow.Item("Auswahl")) = True Then If cmbMandant.Text = "GLS" Then
'Positionen löschen
TBKOMMCOLLI_PAKET_POSTableAdapter.cmdDeletePos(dbRow.Item("GUID")) For Each dbRow As DataRow In MyDataset.VWKOMMCOLLI_ABSCHLUSS_PAKET.Rows
'Kopf löschen If CBool(dbRow.Item("Auswahl")) = True Then
TBKOMMCOLLI_PAKET_KOPFTableAdapter.CmdDeleteGUID(dbRow.Item("GUID")) 'Positionen löschen
End If TBKOMMCOLLI_PAKET_POSTableAdapter.cmdDeletePos(dbRow.Item("GUID"))
Next 'Kopf löschen
Load_Pakete(Mandant) TBKOMMCOLLI_PAKET_KOPFTableAdapter.CmdDeleteGUID(dbRow.Item("GUID"))
End If
Next
Load_Pakete(Mandant)
ElseIf cmbMandant.Text = "HuP" Then
'TODO: Sendung löschen bei HuP
End If
End If End If
End Sub End Sub
@@ -245,7 +264,24 @@
If cmbMandant.SelectedIndex <> -1 Then If cmbMandant.SelectedIndex <> -1 Then
Load_Pakete(cmbMandant.Text) Load_Pakete(cmbMandant.Text)
btnAbschluss.Text = "Mandanten '" & cmbMandant.Text & "' abschliessen" btnAbschluss.Text = "Mandanten '" & cmbMandant.Text & "' abschliessen"
btnAbschluss.Enabled = True
btndelete.Enabled = True
End If End If
End Sub End Sub
Private Sub bw_Tagesabschluss_DoWork(sender As Object, e As System.ComponentModel.DoWorkEventArgs) Handles bw_Tagesabschluss.DoWork
Dim Result As Boolean = True
Result = ClassDatabase.Execute_non_Query("EXEC PRKOMMCOLLI_BORDERO_EXPORTIEREN", False)
e.Result = Result
End Sub
Private Sub bw_Tagesabschluss_RunWorkerCompleted(sender As Object, e As System.ComponentModel.RunWorkerCompletedEventArgs) Handles bw_Tagesabschluss.RunWorkerCompleted
If e.Result = True Then
MsgBox("Abschluss erfolgreich ausgeführt.", MsgBoxStyle.Information, "Tagesabschluss")
Else
MsgBox("Fehler bei Abschluss, bitte Log prüfen.")
End If
End Sub
End Class End Class

View File

@@ -73,7 +73,6 @@ Partial Class frmMain
Me.pnlError = New System.Windows.Forms.Panel() Me.pnlError = New System.Windows.Forms.Panel()
Me.TBKOMMCOLLI_TERMINARTTableAdapter = New KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_TERMINARTTableAdapter() Me.TBKOMMCOLLI_TERMINARTTableAdapter = New KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_TERMINARTTableAdapter()
Me.Panel1 = New System.Windows.Forms.Panel() Me.Panel1 = New System.Windows.Forms.Panel()
Me.Button3 = New System.Windows.Forms.Button()
Me.Button1 = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button()
Me.txtPaketID = New System.Windows.Forms.TextBox() Me.txtPaketID = New System.Windows.Forms.TextBox()
Me.btndeletePaket = New System.Windows.Forms.Button() Me.btndeletePaket = New System.Windows.Forms.Button()
@@ -553,7 +552,6 @@ Partial Class frmMain
' '
'Panel1 'Panel1
' '
Me.Panel1.Controls.Add(Me.Button3)
Me.Panel1.Controls.Add(Me.Button1) Me.Panel1.Controls.Add(Me.Button1)
Me.Panel1.Controls.Add(Me.txtPaketID) Me.Panel1.Controls.Add(Me.txtPaketID)
Me.Panel1.Controls.Add(Me.btndeletePaket) Me.Panel1.Controls.Add(Me.btndeletePaket)
@@ -565,20 +563,6 @@ Partial Class frmMain
Me.Panel1.Size = New System.Drawing.Size(135, 648) Me.Panel1.Size = New System.Drawing.Size(135, 648)
Me.Panel1.TabIndex = 7 Me.Panel1.TabIndex = 7
' '
'Button3
'
Me.Button3.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Button3.ForeColor = System.Drawing.Color.Red
Me.Button3.Image = Global.KommiCollo.My.Resources.Resources.package_green
Me.Button3.ImageAlign = System.Drawing.ContentAlignment.TopLeft
Me.Button3.Location = New System.Drawing.Point(12, 173)
Me.Button3.Name = "Button3"
Me.Button3.Size = New System.Drawing.Size(112, 69)
Me.Button3.TabIndex = 5
Me.Button3.Text = "Tages-" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Abschluss"
Me.Button3.TextAlign = System.Drawing.ContentAlignment.BottomLeft
Me.Button3.UseVisualStyleBackColor = True
'
'Button1 'Button1
' '
Me.Button1.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button1.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -696,7 +680,7 @@ Partial Class frmMain
Me.GroupBox1.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.GroupBox1.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.GroupBox1.Location = New System.Drawing.Point(19, 345) Me.GroupBox1.Location = New System.Drawing.Point(19, 345)
Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(860, 243) Me.GroupBox1.Size = New System.Drawing.Size(860, 233)
Me.GroupBox1.TabIndex = 27 Me.GroupBox1.TabIndex = 27
Me.GroupBox1.TabStop = False Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Textinformationen:" Me.GroupBox1.Text = "Textinformationen:"
@@ -923,7 +907,7 @@ Partial Class frmMain
Me.btnSendungFertig.Font = New System.Drawing.Font("Segoe UI", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnSendungFertig.Font = New System.Drawing.Font("Segoe UI", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btnSendungFertig.Image = Global.KommiCollo.My.Resources.Resources.package_go Me.btnSendungFertig.Image = Global.KommiCollo.My.Resources.Resources.package_go
Me.btnSendungFertig.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnSendungFertig.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnSendungFertig.Location = New System.Drawing.Point(18, 592) Me.btnSendungFertig.Location = New System.Drawing.Point(663, 584)
Me.btnSendungFertig.Name = "btnSendungFertig" Me.btnSendungFertig.Name = "btnSendungFertig"
Me.btnSendungFertig.Size = New System.Drawing.Size(216, 45) Me.btnSendungFertig.Size = New System.Drawing.Size(216, 45)
Me.btnSendungFertig.TabIndex = 7 Me.btnSendungFertig.TabIndex = 7
@@ -963,9 +947,6 @@ Partial Class frmMain
' '
Me.TBKOMMCOLLI_HINWEISTableAdapter.ClearBeforeFill = True Me.TBKOMMCOLLI_HINWEISTableAdapter.ClearBeforeFill = True
' '
'bw_Tagesabschluss
'
'
'frmMain 'frmMain
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 21!) Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 21!)
@@ -1099,6 +1080,5 @@ End Sub
Friend WithEvents TBKOMMCOLLI_HINWEISTableAdapter As KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_HINWEISTableAdapter Friend WithEvents TBKOMMCOLLI_HINWEISTableAdapter As KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_HINWEISTableAdapter
Friend WithEvents Button2 As System.Windows.Forms.Button Friend WithEvents Button2 As System.Windows.Forms.Button
Friend WithEvents btnPrintOptions As System.Windows.Forms.Button Friend WithEvents btnPrintOptions As System.Windows.Forms.Button
Friend WithEvents Button3 As Button
Friend WithEvents bw_Tagesabschluss As System.ComponentModel.BackgroundWorker Friend WithEvents bw_Tagesabschluss As System.ComponentModel.BackgroundWorker
End Class End Class

View File

@@ -190,7 +190,7 @@
<value>549, 134</value> <value>549, 134</value>
</metadata> </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>172</value> <value>46</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

View File

@@ -637,27 +637,4 @@ Public Class frmMain
CURRENT_SENDUNG = aktGUID CURRENT_SENDUNG = aktGUID
frmPrintOptions.ShowDialog() frmPrintOptions.ShowDialog()
End Sub End Sub
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
Dim result As DialogResult = MessageBox.Show("Dies wird die Sendungsdaten exportieren und verschicken." & vbNewLine & vbNewLine & "DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN!" & vbNewLine & vbNewLine & "Sind Sie sicher dass Sie den Tageschluss durchführen wollen?", "Tagesabschluss", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation, MessageBoxDefaultButton.Button2)
If result = DialogResult.Yes Then
bw_Tagesabschluss.RunWorkerAsync()
End If
End Sub
Private Sub bw_Tagesabschluss_DoWork(sender As Object, e As System.ComponentModel.DoWorkEventArgs) Handles bw_Tagesabschluss.DoWork
'Threading.Thread.Sleep(3000)
Dim Result As Boolean = True
Result = ClassDatabase.Execute_non_Query("EXEC PRKOMMCOLLI_BORDERO_EXPORTIEREN", False)
e.Result = Result
End Sub
Private Sub bw_Tagesabschluss_RunWorkerCompleted(sender As Object, e As System.ComponentModel.RunWorkerCompletedEventArgs) Handles bw_Tagesabschluss.RunWorkerCompleted
If e.Result = True Then
MsgBox("Abschluss erfolgreich ausgeführt.", MsgBoxStyle.Information, "Tagesabschluss")
Else
MsgBox("Fehler bei Abschluss, bitte Log prüfen.")
End If
End Sub
End Class End Class

View File

@@ -365,7 +365,6 @@ E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.Pdf.v15.2
E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.Pdf.v15.2.Core.resources.dll E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.Pdf.v15.2.Core.resources.dll
E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.Pdf.v15.2.Core.resources.dll E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.Pdf.v15.2.Core.resources.dll
E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.Pdf.v15.2.Core.resources.dll E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.Pdf.v15.2.Core.resources.dll
E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.vbprojResolveAssemblyReference.cache
E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.DocumentViewerEx.resources E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.DocumentViewerEx.resources
E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.frmAbschluss.resources E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.frmAbschluss.resources
E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.frmConnection.resources E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.frmConnection.resources
@@ -380,3 +379,4 @@ E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.exe.lice
E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.exe E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.exe
E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.xml E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.xml
E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.pdb E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.pdb
E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.vbprojResolveAssemblyReference.cache

View File

@@ -1,6 +1,6 @@
obj\Debug\Product.wixobj
E:\JenneJ\Visual Studio\SchaumKommi\SetupWix\bin\Debug\KommiCollo-x86-1.0.0.0.msi E:\JenneJ\Visual Studio\SchaumKommi\SetupWix\bin\Debug\KommiCollo-x86-1.0.0.0.msi
E:\JenneJ\Visual Studio\SchaumKommi\SetupWix\bin\Debug\KommiCollo-x86-1.0.0.0.wixpdb E:\JenneJ\Visual Studio\SchaumKommi\SetupWix\bin\Debug\KommiCollo-x86-1.0.0.0.wixpdb
obj\Debug\Product.wixobj
obj\Debug\SetupWix.wixproj.BindContentsFileListde-DE.txt obj\Debug\SetupWix.wixproj.BindContentsFileListde-DE.txt
obj\Debug\SetupWix.wixproj.BindOutputsFileListde-DE.txt obj\Debug\SetupWix.wixproj.BindOutputsFileListde-DE.txt
obj\Debug\SetupWix.wixproj.BindBuiltOutputsFileListde-DE.txt obj\Debug\SetupWix.wixproj.BindBuiltOutputsFileListde-DE.txt