Neue DLL Struktur und Hennings Basisdatie für Suipplys

This commit is contained in:
Digital Data - Marlon Schreiber
2019-04-17 16:20:49 +02:00
parent 4f92b20a31
commit 21f525b09d
15 changed files with 91 additions and 43 deletions

Binary file not shown.

View File

@@ -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

View File

@@ -222,7 +222,7 @@
<value>734, 212</value>
</metadata>
<metadata name="VWSUPPLIES_2_ORDERBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>844, 680</value>
<value>17, 680</value>
</metadata>
<metadata name="VWGERAET_ORDERBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>191, 17</value>
@@ -268,10 +268,10 @@
</value>
</data>
<metadata name="VWSUPPLIES_BESTELLUNG_GESENDETBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 680</value>
<value>647, 641</value>
</metadata>
<metadata name="BindingNavigator4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>690, 680</value>
<value>1320, 641</value>
</metadata>
<data name="ToolStripButton12.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -368,13 +368,13 @@
</value>
</data>
<metadata name="TBMANDANTENBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>533, 602</value>
<value>17, 602</value>
</metadata>
<metadata name="VWSUPPLY_VERFOLGUNGBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>292, 407</value>
</metadata>
<metadata name="BindingNavigator3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1084, 641</value>
<value>493, 641</value>
</metadata>
<data name="BindingNavigatorMoveFirstItem10.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -472,10 +472,10 @@
<value>True</value>
</metadata>
<metadata name="TBCHANGE_LOG_GERAETBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>967, 602</value>
<value>451, 602</value>
</metadata>
<metadata name="BindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 719</value>
<value>524, 680</value>
</metadata>
<data name="BindingNavigatorMoveFirstItem7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -521,10 +521,10 @@
<value>17, 290</value>
</metadata>
<metadata name="ViewSUPPLY_STATUS_VERFOLGUNGBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>280, 641</value>
<value>983, 602</value>
</metadata>
<metadata name="BindingNavigator2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>930, 641</value>
<value>339, 641</value>
</metadata>
<data name="BindingNavigatorMoveFirstItem9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -656,7 +656,7 @@
<value>877, 212</value>
</metadata>
<metadata name="VWMarkt_VerfolgungBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>641, 563</value>
<value>236, 563</value>
</metadata>
<data name="ToolStripButton31.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -754,7 +754,7 @@
<value>True</value>
</metadata>
<metadata name="TBSUPPLY_DEFINITIONBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>228, 485</value>
<value>17, 485</value>
</metadata>
<metadata name="TBSUPPLY_DEFINITIONBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>604, 173</value>
@@ -873,7 +873,7 @@
<value>775, 56</value>
</metadata>
<metadata name="VWGeraet_Supply_ZuordnungBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>734, 485</value>
<value>523, 485</value>
</metadata>
<metadata name="VWGeraet_Supply_ZuordnungBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1054, 134</value>
@@ -1021,7 +1021,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA2
CwAAAk1TRnQBSQFMAgEBAwEAAdgBIwHYASMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CwAAAk1TRnQBSQFMAgEBAwEAASgBJAEoASQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -1075,7 +1075,7 @@
<value>944, 368</value>
</metadata>
<metadata name="TBGERAET_SUPPLY_ZUORDNUNGBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 524</value>
<value>1106, 485</value>
</metadata>
<metadata name="Timer_Uhrzeit.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>587, 17</value>
@@ -1168,64 +1168,64 @@
<value>779, 446</value>
</metadata>
<metadata name="TBWH_MODELLTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 485</value>
<value>1247, 446</value>
</metadata>
<metadata name="TBSUPPLY_DEFINITIONTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>484, 485</value>
<value>273, 485</value>
</metadata>
<metadata name="VWGeraet_Supply_ZuordnungTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1028, 485</value>
<value>817, 485</value>
</metadata>
<metadata name="TBGERAET_SUPPLY_ZUORDNUNGTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>332, 524</value>
<value>17, 524</value>
</metadata>
<metadata name="DS_Reporting.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>641, 524</value>
<value>326, 524</value>
</metadata>
<metadata name="TBVERTRAG_NOTEXISTBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>767, 524</value>
<value>452, 524</value>
</metadata>
<metadata name="TBVERTRAG_NOTEXISTTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1023, 524</value>
<value>708, 524</value>
</metadata>
<metadata name="TableAdapterManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 563</value>
<value>958, 524</value>
</metadata>
<metadata name="TBMELDEDATUMBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>197, 563</value>
<value>1138, 524</value>
</metadata>
<metadata name="TBMELDEDATUMTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>422, 563</value>
<value>17, 563</value>
</metadata>
<metadata name="VWMarkt_VerfolgungTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>889, 563</value>
<value>484, 563</value>
</metadata>
<metadata name="TBGERAETTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1131, 563</value>
<value>726, 563</value>
</metadata>
<metadata name="TBSUPPLY_BESTELLUNGBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 602</value>
<value>907, 563</value>
</metadata>
<metadata name="TBSUPPLY_BESTELLUNGTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>278, 602</value>
<value>1168, 563</value>
</metadata>
<metadata name="TBMANDANTENTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>753, 602</value>
<value>237, 602</value>
</metadata>
<metadata name="TBCHANGE_LOG_GERAETTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 641</value>
<value>720, 602</value>
</metadata>
<metadata name="ViewSUPPLY_STATUS_VERFOLGUNGTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>608, 641</value>
<value>17, 641</value>
</metadata>
<metadata name="VWSUPPLIES_BESTELLUNG_GESENDETTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>356, 680</value>
<value>986, 641</value>
</metadata>
<metadata name="VWSUPPLIES_2_ORDERTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1100, 680</value>
<value>273, 680</value>
</metadata>
<metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>171, 719</value>
<value>678, 680</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>187</value>

View File

@@ -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

View File

@@ -1 +1 @@
82c9c13f8d521d19a2f35533131944da0864ccf5
12d883df1eb1cbfd57cea038b93fc5f2910e9856

View File

@@ -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