diff --git a/.vs/MC_SUPPLYWATCH/v15/.suo b/.vs/MC_SUPPLYWATCH/v15/.suo index f0f0ea3..ce8d324 100644 Binary files a/.vs/MC_SUPPLYWATCH/v15/.suo and b/.vs/MC_SUPPLYWATCH/v15/.suo differ diff --git a/Supplywatch/FMMain.Designer.vb b/Supplywatch/FMMain.Designer.vb index a4bce58..fcb3fa1 100644 --- a/Supplywatch/FMMain.Designer.vb +++ b/Supplywatch/FMMain.Designer.vb @@ -166,6 +166,7 @@ Partial Class FMMain Me.tsbRefresh_Bestellungen = New System.Windows.Forms.ToolStripButton() Me.tsbExel_bestellungen = New System.Windows.Forms.ToolStripButton() Me.tsbtOrderSelectDate = New System.Windows.Forms.ToolStripButton() + Me.lblFilteredRowsOrders = New System.Windows.Forms.ToolStripLabel() Me.TabPageBestell_Import = New System.Windows.Forms.TabPage() Me.DataGridView2 = New System.Windows.Forms.DataGridView() Me.GroupBox10 = New System.Windows.Forms.GroupBox() @@ -345,6 +346,7 @@ Partial Class FMMain Me.tsbtnONHOLD = New System.Windows.Forms.ToolStripButton() Me.tscmbaktiv = New System.Windows.Forms.ToolStripComboBox() Me.tsbtnChangelog = New System.Windows.Forms.ToolStripButton() + Me.lblFilterRowCountGeraet = New System.Windows.Forms.ToolStripLabel() Me.tpVerfolgung = New System.Windows.Forms.TabPage() Me.TabControlNachverfolgung = New System.Windows.Forms.TabControl() Me.TabPage6 = New System.Windows.Forms.TabPage() @@ -1932,7 +1934,7 @@ Partial Class FMMain Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.CountItem = Me.BindingNavigatorCountItem3 Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.CountItemFormat = "von {0} Bestellungen" Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.DeleteItem = Nothing - Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem3, Me.BindingNavigatorMovePreviousItem3, Me.BindingNavigatorSeparator9, Me.BindingNavigatorPositionItem3, Me.BindingNavigatorCountItem3, Me.BindingNavigatorSeparator10, Me.BindingNavigatorMoveNextItem3, Me.BindingNavigatorMoveLastItem3, Me.BindingNavigatorSeparator11, Me.tsbRefresh_Bestellungen, Me.tsbExel_bestellungen, Me.tsbtOrderSelectDate}) + Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem3, Me.BindingNavigatorMovePreviousItem3, Me.BindingNavigatorSeparator9, Me.BindingNavigatorPositionItem3, Me.BindingNavigatorCountItem3, Me.BindingNavigatorSeparator10, Me.BindingNavigatorMoveNextItem3, Me.BindingNavigatorMoveLastItem3, Me.BindingNavigatorSeparator11, Me.tsbRefresh_Bestellungen, Me.tsbExel_bestellungen, Me.tsbtOrderSelectDate, Me.lblFilteredRowsOrders}) Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.Location = New System.Drawing.Point(3, 3) Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem3 Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.MoveLastItem = Me.BindingNavigatorMoveLastItem3 @@ -2043,6 +2045,14 @@ Partial Class FMMain Me.tsbtOrderSelectDate.Size = New System.Drawing.Size(146, 22) Me.tsbtOrderSelectDate.Text = "Datumseinschränkung" ' + 'lblFilteredRowsOrders + ' + Me.lblFilteredRowsOrders.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblFilteredRowsOrders.Name = "lblFilteredRowsOrders" + Me.lblFilteredRowsOrders.Size = New System.Drawing.Size(82, 22) + Me.lblFilteredRowsOrders.Text = "Filtered Rows: " + Me.lblFilteredRowsOrders.Visible = False + ' 'TabPageBestell_Import ' Me.TabPageBestell_Import.Controls.Add(Me.DataGridView2) @@ -3510,7 +3520,7 @@ Partial Class FMMain Me.TBGERAETBindingNavigator.CountItem = Me.BindingNavigatorCountItem2 Me.TBGERAETBindingNavigator.CountItemFormat = "von {0} Geräten" Me.TBGERAETBindingNavigator.DeleteItem = Nothing - Me.TBGERAETBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbImport2, Me.ToolStripSeparator9, Me.BindingNavigatorMoveFirstItem2, Me.BindingNavigatorMovePreviousItem2, Me.BindingNavigatorSeparator6, Me.BindingNavigatorPositionItem2, Me.BindingNavigatorCountItem2, Me.BindingNavigatorSeparator7, Me.BindingNavigatorMoveNextItem2, Me.BindingNavigatorMoveLastItem2, Me.BindingNavigatorSeparator8, Me.tsbGeraeteRefresh, Me.tsbexcel_geraete, Me.tsbGeraeteverfolgung_Geraet, Me.tsbtnONHOLD, Me.tscmbaktiv, Me.tsbtnChangelog}) + Me.TBGERAETBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbImport2, Me.ToolStripSeparator9, Me.BindingNavigatorMoveFirstItem2, Me.BindingNavigatorMovePreviousItem2, Me.BindingNavigatorSeparator6, Me.BindingNavigatorPositionItem2, Me.BindingNavigatorCountItem2, Me.BindingNavigatorSeparator7, Me.BindingNavigatorMoveNextItem2, Me.BindingNavigatorMoveLastItem2, Me.BindingNavigatorSeparator8, Me.tsbGeraeteRefresh, Me.tsbexcel_geraete, Me.tsbGeraeteverfolgung_Geraet, Me.tsbtnONHOLD, Me.tscmbaktiv, Me.tsbtnChangelog, Me.lblFilterRowCountGeraet}) Me.TBGERAETBindingNavigator.Location = New System.Drawing.Point(3, 3) Me.TBGERAETBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem2 Me.TBGERAETBindingNavigator.MoveLastItem = Me.BindingNavigatorMoveLastItem2 @@ -3654,6 +3664,14 @@ Partial Class FMMain Me.tsbtnChangelog.Size = New System.Drawing.Size(120, 22) Me.tsbtnChangelog.Text = "Zeige ChangeLog" ' + 'lblFilterRowCountGeraet + ' + Me.lblFilterRowCountGeraet.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblFilterRowCountGeraet.Name = "lblFilterRowCountGeraet" + Me.lblFilterRowCountGeraet.Size = New System.Drawing.Size(87, 22) + Me.lblFilterRowCountGeraet.Text = "ToolStripLabel2" + Me.lblFilterRowCountGeraet.Visible = False + ' 'tpVerfolgung ' Me.tpVerfolgung.Controls.Add(Me.TabControlNachverfolgung) @@ -7006,4 +7024,6 @@ Partial Class FMMain Friend WithEvents Label12 As Label Friend WithEvents Panel1 As Panel Friend WithEvents Panel2 As Panel + Friend WithEvents lblFilteredRowsOrders As ToolStripLabel + Friend WithEvents lblFilterRowCountGeraet As ToolStripLabel End Class diff --git a/Supplywatch/FMMain.resx b/Supplywatch/FMMain.resx index 7a8be7f..44ae48d 100644 --- a/Supplywatch/FMMain.resx +++ b/Supplywatch/FMMain.resx @@ -222,7 +222,7 @@ 734, 212 - 844, 680 + 17, 680 191, 17 @@ -268,10 +268,10 @@ - 17, 680 + 647, 641 - 690, 680 + 1320, 641 @@ -368,13 +368,13 @@ - 533, 602 + 17, 602 292, 407 - 1084, 641 + 493, 641 @@ -472,10 +472,10 @@ True - 967, 602 + 451, 602 - 17, 719 + 524, 680 @@ -521,10 +521,10 @@ 17, 290 - 280, 641 + 983, 602 - 930, 641 + 339, 641 @@ -656,7 +656,7 @@ 877, 212 - 641, 563 + 236, 563 @@ -754,7 +754,7 @@ True - 228, 485 + 17, 485 604, 173 @@ -873,7 +873,7 @@ 775, 56 - 734, 485 + 523, 485 1054, 134 @@ -1021,7 +1021,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA2 - CwAAAk1TRnQBSQFMAgEBAwEAAdgBIwHYASMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CwAAAk1TRnQBSQFMAgEBAwEAASgBJAEoASQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1075,7 +1075,7 @@ 944, 368 - 17, 524 + 1106, 485 587, 17 @@ -1168,64 +1168,64 @@ 779, 446 - 17, 485 + 1247, 446 - 484, 485 + 273, 485 - 1028, 485 + 817, 485 - 332, 524 + 17, 524 - 641, 524 + 326, 524 - 767, 524 + 452, 524 - 1023, 524 + 708, 524 - 17, 563 + 958, 524 - 197, 563 + 1138, 524 - 422, 563 + 17, 563 - 889, 563 + 484, 563 - 1131, 563 + 726, 563 - 17, 602 + 907, 563 - 278, 602 + 1168, 563 - 753, 602 + 237, 602 - 17, 641 + 720, 602 - 608, 641 + 17, 641 - 356, 680 + 986, 641 - 1100, 680 + 273, 680 - 171, 719 + 678, 680 187 diff --git a/Supplywatch/FMMain.vb b/Supplywatch/FMMain.vb index 2b2b76c..80b542e 100644 --- a/Supplywatch/FMMain.vb +++ b/Supplywatch/FMMain.vb @@ -767,9 +767,9 @@ Public Class FMMain Dim BESTELL_LEVEL = DTRECORD.Rows(0).Item(7) Dim MandantID = DTRECORD.Rows(0).Item(8) - Dim ins = String.Format("INSERT INTO TBSUPPLY_BESTELLUNG(SUPPLY_BEZEICHNUNG,MARKT,BESTELLT_WER,GERAET,SERIEN_NR,SUPPLY_ID,GERAET_ID,BESTELL_LEVEL,MANDANT_ID,MENGE) VALUES (" & + Dim ins = String.Format("INSERT INTO TBSUPPLY_BESTELLUNG(SUPPLY_BEZEICHNUNG,MARKT,BESTELLT_WER,GERAET,SERIEN_NR,SUPPLY_ID,GERAET_ID,BESTELL_LEVEL,MANDANT_ID,MENGE,STATE_MSG) VALUES (" & "'{0}','{1}','{2}','{3}','{4}',{5},{6},'{7}',{8},{9})", - _Supply, _markt, wer, _gerät, _seriennr, SUPP_ID, GERAETID, BESTELL_LEVEL, MandantID, _Anzahl) + _Supply, _markt, wer, _gerät, _seriennr, SUPP_ID, GERAETID, BESTELL_LEVEL, MandantID, _Anzahl, "ORDER CONFIRMED") If ClassDatabase.Execute_non_Query(ins, True) = True Then sql = String.Format("SELECT MAX(GUID) FROM TBSUPPLY_BESTELLUNG WHERE UPPER(SUPPLY_BEZEICHNUNG) = UPPER('{0}') AND UPPER(SERIEN_NR) = UPPER('{1}')", _Supply, _seriennr) _BestellID = ClassDatabase.Execute_Scalar(sql, True) @@ -2219,7 +2219,7 @@ Public Class FMMain ClassDatabase.Execute_non_Query(sql, True) Else Dim ORDER_ID As Integer = DR.Item("BESTELL_ID") - sql = String.Format("UPDATE TBSUPPLY_BESTELLUNG SET BESTELLT_WANN = GETDATE(), MARKER = 'STATUS GESENDET MANUELL', MANUELL_BESTELLT = 1 WHERE (GUID ={0})", ORDER_ID) + sql = String.Format("UPDATE TBSUPPLY_BESTELLUNG SET BESTELLT_WANN = GETDATE(), MARKER = 'STATUS GESENDET MANUELL',STATE_MSG = 'BESTELLUNG GESENDET', MANUELL_BESTELLT = 1 WHERE (GUID ={0})", ORDER_ID) ClassDatabase.Execute_non_Query(sql, True) End If @@ -2248,7 +2248,7 @@ Public Class FMMain Else Dim ORDER_ID As Integer = DR.Item("BESTELL_ID") 'eine manuell ausgeführte Bestellung - sql = String.Format("UPDATE TBSUPPLY_BESTELLUNG SET MARKER = 'STATUS BESTELLT MANUELL', MANUELL_BESTELLT = 1 WHERE (GUID ={0})", ORDER_ID) + sql = String.Format("UPDATE TBSUPPLY_BESTELLUNG SET MARKER = 'STATUS BESTELLT MANUELL', MANUELL_BESTELLT = 1, STATE_MSG = 'BESTELLT manuell per Oberfläche' WHERE (GUID ={0})", ORDER_ID) ClassDatabase.Execute_non_Query(sql, True) End If @@ -3336,13 +3336,13 @@ Public Class FMMain If Manuell = False Then sql = String.Format("UPDATE TBSUPPLIES SET STATUS_ID = 4, STATUS_WER = '{0}', MARKER = 'MANUALLY FROM BESTELLUNG GESENDET' WHERE (STATUS_ID = 10) AND (GUID = {1})", Environment.UserName, SupplyID) If ClassDatabase.Execute_non_Query(sql, True) = True Then - sql = String.Format("UPDATE TBSUPPLY_BESTELLUNG SET BESTELLT_WANN = GETDATE(), BESTELLNR = 'PLEASE UPDATE MANUALLY', MARKER = 'Status Bestellt manuell gesetzt durch: {0}' WHERE GUID = {1}", Environment.UserName, BestellID) + sql = String.Format("UPDATE TBSUPPLY_BESTELLUNG SET BESTELLT_WANN = GETDATE(), BESTELLNR = 'PLEASE UPDATE MANUALLY', STATE_MSG = 'ORDERED MANUALLY', MARKER = 'Status Bestellt manuell gesetzt durch: {0}' WHERE GUID = {1}", Environment.UserName, BestellID) ClassDatabase.Execute_non_Query(sql, True) End If 'TBSUPPLIESTableAdapter.cmdSetBestellt(Environment.UserName, "MANUALLY FROM BESTELLUNG GESENDET", SupplyID) Else 'If BestelltWer.ToString.StartsWith("FW_") Then - sql = String.Format("UPDATE TBSUPPLY_BESTELLUNG SET BESTELLT_WANN = GETDATE(), MARKER = 'Status Bestellt manuell gesetzt durch: {0}' WHERE GUID = {1}", Environment.UserName, BestellID) + sql = String.Format("UPDATE TBSUPPLY_BESTELLUNG SET BESTELLT_WANN = GETDATE(),STATE_MSG = 'ORDERED MANUALLY', MARKER = 'Status Bestellt manuell gesetzt durch: {0}' WHERE GUID = {1}", Environment.UserName, BestellID) ClassDatabase.Execute_non_Query(sql, True) ' End If End If @@ -3650,6 +3650,33 @@ Public Class FMMain End If End Sub + Private Sub GridViewBestellUebersicht_ColumnFilterChanged(sender As Object, e As EventArgs) Handles GridViewBestellUebersicht.ColumnFilterChanged + Try + If GridViewBestellUebersicht.RowCount > 0 Then + lblFilteredRowsOrders.Text = $"Filtered RowCount: {GridViewBestellUebersicht.RowCount}" + lblFilteredRowsOrders.Visible = True + Else + lblFilteredRowsOrders.Visible = False + End If + Catch ex As Exception + + End Try + + End Sub + + Private Sub GridViewGeraete_ColumnFilterChanged(sender As Object, e As EventArgs) Handles GridViewGeraete.ColumnFilterChanged + Try + If GridViewGeraete.RowCount > 0 Then + lblFilterRowCountGeraet.Text = $"Filtered RowCount: {GridViewGeraete.RowCount}" + lblFilterRowCountGeraet.Visible = True + Else + lblFilterRowCountGeraet.Visible = False + End If + Catch ex As Exception + + End Try + End Sub + 'Private Sub GridViewGeraetOrder_RowUpdated(sender As Object, e As DevExpress.XtraGrid.Views.Base.RowObjectEventArgs) ' If FormLoaded = True Then ' Try diff --git a/Supplywatch/bin/Debug/SUPPLYWATCH.exe b/Supplywatch/bin/Debug/SUPPLYWATCH.exe index 594e6f7..85b0cbb 100644 Binary files a/Supplywatch/bin/Debug/SUPPLYWATCH.exe and b/Supplywatch/bin/Debug/SUPPLYWATCH.exe differ diff --git a/Supplywatch/bin/Debug/SUPPLYWATCH.pdb b/Supplywatch/bin/Debug/SUPPLYWATCH.pdb index 2edfcff..d182f5a 100644 Binary files a/Supplywatch/bin/Debug/SUPPLYWATCH.pdb and b/Supplywatch/bin/Debug/SUPPLYWATCH.pdb differ diff --git a/Supplywatch/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Supplywatch/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index b2b3106..ab32f6f 100644 Binary files a/Supplywatch/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Supplywatch/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Supplywatch/obj/x86/Debug/SUPPLYWATCH.FMMain.resources b/Supplywatch/obj/x86/Debug/SUPPLYWATCH.FMMain.resources index 3975ab5..1294fdc 100644 Binary files a/Supplywatch/obj/x86/Debug/SUPPLYWATCH.FMMain.resources and b/Supplywatch/obj/x86/Debug/SUPPLYWATCH.FMMain.resources differ diff --git a/Supplywatch/obj/x86/Debug/SUPPLYWATCH.exe b/Supplywatch/obj/x86/Debug/SUPPLYWATCH.exe index 594e6f7..85b0cbb 100644 Binary files a/Supplywatch/obj/x86/Debug/SUPPLYWATCH.exe and b/Supplywatch/obj/x86/Debug/SUPPLYWATCH.exe differ diff --git a/Supplywatch/obj/x86/Debug/SUPPLYWATCH.pdb b/Supplywatch/obj/x86/Debug/SUPPLYWATCH.pdb index 2edfcff..d182f5a 100644 Binary files a/Supplywatch/obj/x86/Debug/SUPPLYWATCH.pdb and b/Supplywatch/obj/x86/Debug/SUPPLYWATCH.pdb differ diff --git a/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.CoreCompileInputs.cache b/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.CoreCompileInputs.cache index 75f2e17..0c1e1d5 100644 --- a/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.CoreCompileInputs.cache +++ b/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.CoreCompileInputs.cache @@ -1 +1 @@ -82c9c13f8d521d19a2f35533131944da0864ccf5 +12d883df1eb1cbfd57cea038b93fc5f2910e9856 diff --git a/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.FileListAbsolute.txt b/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.FileListAbsolute.txt index 858c2c6..fb75bb3 100644 --- a/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.FileListAbsolute.txt +++ b/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.FileListAbsolute.txt @@ -212,3 +212,4 @@ E:\SchreiberM\Visual Studio\GIT\Supplywatch\Supplywatch\obj\x86\Debug\Supplywatc E:\SchreiberM\Visual Studio\GIT\Supplywatch\Supplywatch\obj\x86\Debug\SUPPLYWATCH.exe E:\SchreiberM\Visual Studio\GIT\Supplywatch\Supplywatch\obj\x86\Debug\SUPPLYWATCH.xml E:\SchreiberM\Visual Studio\GIT\Supplywatch\Supplywatch\obj\x86\Debug\SUPPLYWATCH.pdb +E:\SchreiberM\Visual Studio\GIT\Supplywatch\Supplywatch\obj\x86\Debug\Supplywatch.vbprojAssemblyReference.cache diff --git a/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.GenerateResource.Cache b/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.GenerateResource.Cache index b71704f..bebfb84 100644 Binary files a/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.GenerateResource.Cache and b/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.GenerateResource.Cache differ diff --git a/Supplywatch/obj/x86/Debug/Supplywatch.vbprojAssemblyReference.cache b/Supplywatch/obj/x86/Debug/Supplywatch.vbprojAssemblyReference.cache new file mode 100644 index 0000000..8e9139c Binary files /dev/null and b/Supplywatch/obj/x86/Debug/Supplywatch.vbprojAssemblyReference.cache differ diff --git a/Supplywatch/obj/x86/Debug/TempPE/MyDataset.Designer.vb.dll b/Supplywatch/obj/x86/Debug/TempPE/MyDataset.Designer.vb.dll index 40e3aca..6953c9a 100644 Binary files a/Supplywatch/obj/x86/Debug/TempPE/MyDataset.Designer.vb.dll and b/Supplywatch/obj/x86/Debug/TempPE/MyDataset.Designer.vb.dll differ