diff --git a/SchaumKommiCollo/.vs/KommiCollo/v15/.suo b/SchaumKommiCollo/.vs/KommiCollo/v15/.suo index 8903bd3..eba95b4 100644 Binary files a/SchaumKommiCollo/.vs/KommiCollo/v15/.suo and b/SchaumKommiCollo/.vs/KommiCollo/v15/.suo differ diff --git a/SchaumKommiCollo/KommiCollo/My Project/AssemblyInfo.vb b/SchaumKommiCollo/KommiCollo/My Project/AssemblyInfo.vb index 18da06a..45a792e 100644 --- a/SchaumKommiCollo/KommiCollo/My Project/AssemblyInfo.vb +++ b/SchaumKommiCollo/KommiCollo/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/SchaumKommiCollo/KommiCollo/app.config b/SchaumKommiCollo/KommiCollo/app.config index 5997dbe..2714327 100644 --- a/SchaumKommiCollo/KommiCollo/app.config +++ b/SchaumKommiCollo/KommiCollo/app.config @@ -11,8 +11,7 @@ providerName="System.Data.SqlClient" /> - - + diff --git a/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.exe b/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.exe index 106413d..67d94cb 100644 Binary files a/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.exe and b/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.exe differ diff --git a/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.exe.config b/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.exe.config index 5997dbe..2714327 100644 --- a/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.exe.config +++ b/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.exe.config @@ -11,8 +11,7 @@ providerName="System.Data.SqlClient" /> - - + diff --git a/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.pdb b/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.pdb index 69cc614..f01ef32 100644 Binary files a/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.pdb and b/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.pdb differ diff --git a/SchaumKommiCollo/KommiCollo/frmMain.Designer.vb b/SchaumKommiCollo/KommiCollo/frmMain.Designer.vb index e4ceb96..7792867 100644 --- a/SchaumKommiCollo/KommiCollo/frmMain.Designer.vb +++ b/SchaumKommiCollo/KommiCollo/frmMain.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmMain Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmMain 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim PAKET_IDLabel As System.Windows.Forms.Label @@ -55,8 +55,8 @@ Partial Class frmMain Me.pnlAddBarcodes = New System.Windows.Forms.Panel() Me.lblInfoBarcodes = New System.Windows.Forms.Label() Me.ListViewBarcodes = New System.Windows.Forms.ListView() - Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader) - Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader) + Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) + Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) Me.GESAMTGEWICHTTextBox = New System.Windows.Forms.TextBox() Me.Label4 = New System.Windows.Forms.Label() Me.cmbTerminart = New System.Windows.Forms.ComboBox() @@ -91,9 +91,6 @@ Partial Class frmMain Me.TabPage4 = New System.Windows.Forms.TabPage() Me.GridControlLHM = New DevExpress.XtraGrid.GridControl() Me.GridViewLHM = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn() - Me.GridColumn2 = New DevExpress.XtraGrid.Columns.GridColumn() - Me.GridColumn3 = New DevExpress.XtraGrid.Columns.GridColumn() Me.btnChangeAdress = New System.Windows.Forms.Button() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() @@ -686,7 +683,7 @@ Partial Class frmMain Me.TabControl2.Location = New System.Drawing.Point(19, 120) Me.TabControl2.Name = "TabControl2" Me.TabControl2.SelectedIndex = 0 - Me.TabControl2.Size = New System.Drawing.Size(929, 141) + Me.TabControl2.Size = New System.Drawing.Size(929, 135) Me.TabControl2.TabIndex = 30 ' 'TabPage3 @@ -695,7 +692,7 @@ Partial Class frmMain Me.TabPage3.Location = New System.Drawing.Point(4, 26) Me.TabPage3.Name = "TabPage3" Me.TabPage3.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage3.Size = New System.Drawing.Size(921, 111) + Me.TabPage3.Size = New System.Drawing.Size(932, 111) Me.TabPage3.TabIndex = 0 Me.TabPage3.Text = "Übersicht Lieferscheine" Me.TabPage3.UseVisualStyleBackColor = True @@ -708,7 +705,7 @@ Partial Class frmMain Me.GridControlPos.Location = New System.Drawing.Point(3, 3) Me.GridControlPos.MainView = Me.grvwGridPos Me.GridControlPos.Name = "GridControlPos" - Me.GridControlPos.Size = New System.Drawing.Size(915, 105) + Me.GridControlPos.Size = New System.Drawing.Size(926, 105) Me.GridControlPos.TabIndex = 2 Me.GridControlPos.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwGridPos}) ' @@ -767,7 +764,7 @@ Partial Class frmMain Me.TabPage4.Location = New System.Drawing.Point(4, 26) Me.TabPage4.Name = "TabPage4" Me.TabPage4.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage4.Size = New System.Drawing.Size(921, 111) + Me.TabPage4.Size = New System.Drawing.Size(921, 105) Me.TabPage4.TabIndex = 1 Me.TabPage4.Text = "LHM-Übersicht" Me.TabPage4.UseVisualStyleBackColor = True @@ -780,7 +777,7 @@ Partial Class frmMain Me.GridControlLHM.Location = New System.Drawing.Point(3, 3) Me.GridControlLHM.MainView = Me.GridViewLHM Me.GridControlLHM.Name = "GridControlLHM" - Me.GridControlLHM.Size = New System.Drawing.Size(915, 105) + Me.GridControlLHM.Size = New System.Drawing.Size(915, 99) Me.GridControlLHM.TabIndex = 3 Me.GridControlLHM.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewLHM}) ' @@ -788,46 +785,12 @@ Partial Class frmMain ' Me.GridViewLHM.Appearance.EvenRow.BackColor = System.Drawing.Color.Cyan Me.GridViewLHM.Appearance.EvenRow.Options.UseBackColor = True - Me.GridViewLHM.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn1, Me.GridColumn2, Me.GridColumn3}) Me.GridViewLHM.GridControl = Me.GridControlLHM Me.GridViewLHM.Name = "GridViewLHM" Me.GridViewLHM.OptionsView.EnableAppearanceEvenRow = True Me.GridViewLHM.OptionsView.ShowGroupExpandCollapseButtons = False Me.GridViewLHM.OptionsView.ShowGroupPanel = False ' - 'GridColumn1 - ' - Me.GridColumn1.Caption = "ID" - Me.GridColumn1.FieldName = "GUID" - Me.GridColumn1.Name = "GridColumn1" - Me.GridColumn1.OptionsColumn.AllowEdit = False - Me.GridColumn1.Visible = True - Me.GridColumn1.VisibleIndex = 0 - Me.GridColumn1.Width = 61 - ' - 'GridColumn2 - ' - Me.GridColumn2.Caption = "Positionsinhalt" - Me.GridColumn2.FieldName = "POSINHALT" - Me.GridColumn2.Name = "GridColumn2" - Me.GridColumn2.OptionsColumn.AllowEdit = False - Me.GridColumn2.Visible = True - Me.GridColumn2.VisibleIndex = 1 - Me.GridColumn2.Width = 504 - ' - 'GridColumn3 - ' - Me.GridColumn3.AppearanceCell.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer)) - Me.GridColumn3.AppearanceCell.Options.UseBackColor = True - Me.GridColumn3.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer)) - Me.GridColumn3.AppearanceHeader.Options.UseBackColor = True - Me.GridColumn3.Caption = "Gewicht" - Me.GridColumn3.FieldName = "GEWICHT" - Me.GridColumn3.Name = "GridColumn3" - Me.GridColumn3.Visible = True - Me.GridColumn3.VisibleIndex = 2 - Me.GridColumn3.Width = 165 - ' 'btnChangeAdress ' Me.btnChangeAdress.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) @@ -1179,9 +1142,9 @@ Partial Class frmMain CType(Me.TBKOMMCOLLI_HINWEISBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBKOMMCOLLI_TEXTSCHLUESSELBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) - Me.PerformLayout + Me.PerformLayout() -End Sub + End Sub Friend WithEvents MenuStrip1 As System.Windows.Forms.MenuStrip Friend WithEvents ProgrammToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents BeendenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem @@ -1274,7 +1237,4 @@ End Sub Friend WithEvents TabPage4 As TabPage Friend WithEvents GridControlLHM As DevExpress.XtraGrid.GridControl Friend WithEvents GridViewLHM As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents GridColumn1 As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents GridColumn2 As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents GridColumn3 As DevExpress.XtraGrid.Columns.GridColumn End Class diff --git a/SchaumKommiCollo/KommiCollo/frmMain.vb b/SchaumKommiCollo/KommiCollo/frmMain.vb index b7409c9..af03b9d 100644 --- a/SchaumKommiCollo/KommiCollo/frmMain.vb +++ b/SchaumKommiCollo/KommiCollo/frmMain.vb @@ -1,4 +1,5 @@ Imports System.Text +Imports DevExpress.XtraGrid.Views.Base Public Class frmMain @@ -226,7 +227,7 @@ Public Class frmMain Try GridControlLHM.DataSource = Nothing GridViewLHM.Columns.Clear() - Dim sel = String.Format("SELECT T.GUID,T1.LHM, T.FERTIG,T.GEWICHT FROM TBKOMMCOLLI_SDG_LHM T, TBKOMMCOLLI_LHM T1 WHERE T.LHM_ID = T1.GUID AND T.SENDUNGNR = {0}", SDG) + Dim sel = String.Format("SELECT T.GUID,T1.LHM, T.FERTIG,T.GEWICHT, T.POSINHALT FROM TBKOMMCOLLI_SDG_LHM T, TBKOMMCOLLI_LHM T1 WHERE T.LHM_ID = T1.GUID AND T.SENDUNGNR = {0}", SDG) Dim DT As DataTable = ClassDatabase.Return_Datatable(sel, True) If Not DT Is Nothing Then GridControlLHM.DataSource = DT @@ -563,8 +564,9 @@ Public Class frmMain Dim POSINHALT As String = e.Value Dim upd = String.Format("UPDATE TBKOMMCOLLI_SDGPOSITIONEN SET POSINHALT = '{0}', GEAENDERTWER = '{2}' WHERE GUID = {1}", POSINHALT, guid, Environment.UserName) - If ClassDatabase.Execute_non_Query(upd, True) = False Then - + If ClassDatabase.Execute_non_Query(upd, True) = True Then + upd = String.Format("UPDATE TBKOMMCOLLI_SDG_LHM SET POSINHALT = '{0}', GEAENDERTWER = '{1}' WHERE GUID = (SELECT SDG_LHM_ID FROM TBKOMMCOLLI_SDGPOSITIONEN WHERE GUID = {2})", POSINHALT, Environment.UserName, guid) + ClassDatabase.Execute_non_Query(upd, True) End If End If @@ -601,9 +603,9 @@ Public Class frmMain ' cmbLHM.Enabled = True ' cmbLHM.DroppedDown = True tsinfolabel.Visible = True - tsinfolabel.Text = "Palette erfolgreich fertig gekennzeichnet - " & Now.ToString - Else - SDG_READY = False + tsinfolabel.Text = "Palette erfolgreich fertig gekennzeichnet - " & Now.ToString + Else + SDG_READY = False End If Catch ex As Exception MsgBox("Error in btndeletePos_Click:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -738,4 +740,24 @@ Public Class frmMain btndeletePosLHM.Enabled = False End Select End Sub + + Private Sub GridViewLHM_CellValueChanged(sender As Object, e As CellValueChangedEventArgs) Handles GridViewLHM.CellValueChanged + Try + Dim column = e.Column.FieldName + If column = "POSINHALT" Then + Dim guid = GridViewLHM.GetFocusedRowCellValue(grvwGridPos.Columns("GUID")) + Dim POSINHALT As String = e.Value + + Dim upd = String.Format("UPDATE TBKOMMCOLLI_SDG_LHM SET POSINHALT = '{0}', GEAENDERTWER = '{2}' WHERE GUID = {1}", POSINHALT, guid, Environment.UserName) + If ClassDatabase.Execute_non_Query(upd, True) = True Then + upd = String.Format("UPDATE TBKOMMCOLLI_SDGPOSITIONEN SET POSINHALT = '{0}', GEAENDERTWER = '{1}' WHERE SDG_LHM_ID = {2}", POSINHALT, Environment.UserName, guid) + ClassDatabase.Execute_non_Query(upd, True) + End If + End If + + + Catch ex As Exception + MsgBox("Error in GridViewLHM.CellValueChanged:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub End Class diff --git a/SchaumKommiCollo/KommiCollo/frmPrintOptions.vb b/SchaumKommiCollo/KommiCollo/frmPrintOptions.vb index 778595e..d9c880b 100644 --- a/SchaumKommiCollo/KommiCollo/frmPrintOptions.vb +++ b/SchaumKommiCollo/KommiCollo/frmPrintOptions.vb @@ -126,6 +126,11 @@ Public Class frmPrintOptions Private Sub frmPrintOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load 'TODO: Diese Codezeile lädt Daten in die Tabelle "MyDataset.VWHUP_REPORT1". Sie können sie bei Bedarf verschieben oder entfernen. + Try + DocumentViewerEx1.Source = Nothing + Catch ex As Exception + + End Try End Sub diff --git a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index a036cba..51d30c0 100644 Binary files a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache and b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.exe b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.exe index 106413d..67d94cb 100644 Binary files a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.exe and b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.exe differ diff --git a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.pdb b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.pdb index 69cc614..f01ef32 100644 Binary files a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.pdb and b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.pdb differ diff --git a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.GenerateResource.Cache b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.GenerateResource.Cache index 1e644dd..cc9677d 100644 Binary files a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.GenerateResource.Cache and b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.GenerateResource.Cache differ diff --git a/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb b/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb index b3e49c4..e6e41b6 100644 --- a/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb +++ b/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb @@ -218,7 +218,7 @@ Partial Public Class reportUebergabe ' 'SqlDataSource1 ' - Me.SqlDataSource1.ConnectionName = "192.168.13.101_SCHAUM_IID_Connection" + Me.SqlDataSource1.ConnectionName = "REPORT_Connection" Me.SqlDataSource1.Name = "SqlDataSource1" CustomSqlQuery1.Name = "Query" CustomSqlQuery1.Sql = resources.GetString("CustomSqlQuery1.Sql")