Index: TAOR rework/TAOR rework/app.config =================================================================== diff -u -r2067 -r2283 --- TAOR rework/TAOR rework/app.config (.../app.config) (revision 2067) +++ TAOR rework/TAOR rework/app.config (.../app.config) (revision 2283) @@ -1,19 +1,16 @@ - + - -
+ +
- - - - - + + + + + @@ -27,12 +24,10 @@ - + - + @@ -53,4 +48,4 @@ - + Index: TAOR rework/TAOR rework/TAOR rework.vbproj =================================================================== diff -u -r2175 -r2283 --- TAOR rework/TAOR rework/TAOR rework.vbproj (.../TAOR rework.vbproj) (revision 2175) +++ TAOR rework/TAOR rework/TAOR rework.vbproj (.../TAOR rework.vbproj) (revision 2283) @@ -1,5 +1,5 @@  - + Debug x86 @@ -13,10 +13,11 @@ TAOR rework 512 WindowsForms - v4.0 - Client + v4.8 + + false - \\NOTES01\Shared\Multi media\TAOR rework\ + \\NOTES01\Shared\Multi media\TAOR rework new\ true Unc true @@ -28,6 +29,8 @@ false TAOR rework Robin De Bock + true + publish.htm false 1 7.18.0.%2a @@ -46,6 +49,7 @@ TAOR rework.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 BasicCorrectnessRules.ruleset + false x86 @@ -56,6 +60,7 @@ bin\Release\ TAOR rework.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + false On @@ -289,6 +294,7 @@ True Application.myapp + True True Index: TAOR rework/TAOR rework/My Project/Resources.Designer.vb =================================================================== diff -u -r1513 -r2283 --- TAOR rework/TAOR rework/My Project/Resources.Designer.vb (.../Resources.Designer.vb) (revision 1513) +++ TAOR rework/TAOR rework/My Project/Resources.Designer.vb (.../Resources.Designer.vb) (revision 2283) @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:4.0.30319.36406 +' Runtime Version:4.0.30319.42000 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. @@ -22,7 +22,7 @@ ''' ''' A strongly-typed resource class, for looking up localized strings, etc. ''' - _ Index: TAOR rework/TAOR rework/My Project/Settings.settings =================================================================== diff -u -r2067 -r2283 --- TAOR rework/TAOR rework/My Project/Settings.settings (.../Settings.settings) (revision 2067) +++ TAOR rework/TAOR rework/My Project/Settings.settings (.../Settings.settings) (revision 2283) @@ -17,9 +17,9 @@ <?xml version="1.0" encoding="utf-16"?> <SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Server=Ardisserver\SQLEXPRESS; database=VH_Ardis_TST; user=VH_write; Pwd=SQLwr!t3</ConnectionString> + <ConnectionString>Server=SQL06-PRD\ARDIS01_PRD; database=VH_Ardis_PROD; user=VH_write; Pwd=SQLwr!t3</ConnectionString> </SerializableConnectionString> - Server=Ardisserver\SQLEXPRESS; database=VH_Ardis_TST; user=VH_write; Pwd=SQLwr!t3 + Server=SQL06-PRD\ARDIS01_PRD; database=VH_Ardis_PROD; user=VH_write; Pwd=SQLwr!t3 <?xml version="1.0" encoding="utf-16"?> Index: TAOR rework/TAOR rework/My Project/Application.Designer.vb =================================================================== diff -u -r1513 -r2283 --- TAOR rework/TAOR rework/My Project/Application.Designer.vb (.../Application.Designer.vb) (revision 1513) +++ TAOR rework/TAOR rework/My Project/Application.Designer.vb (.../Application.Designer.vb) (revision 2283) @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:4.0.30319.36450 +' Runtime Version:4.0.30319.42000 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. Index: TAOR rework/TAOR rework/My Project/Settings.Designer.vb =================================================================== diff -u -r2109 -r2283 --- TAOR rework/TAOR rework/My Project/Settings.Designer.vb (.../Settings.Designer.vb) (revision 2109) +++ TAOR rework/TAOR rework/My Project/Settings.Designer.vb (.../Settings.Designer.vb) (revision 2283) @@ -15,7 +15,7 @@ Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -105,7 +105,7 @@ _ Public ReadOnly Property ArdisConnectieString() As String Get Index: TAOR rework/TAOR rework/databases/Ardis/ArdisMapper.vb =================================================================== diff -u -r2172 -r2283 --- TAOR rework/TAOR rework/databases/Ardis/ArdisMapper.vb (.../ArdisMapper.vb) (revision 2172) +++ TAOR rework/TAOR rework/databases/Ardis/ArdisMapper.vb (.../ArdisMapper.vb) (revision 2283) @@ -193,7 +193,7 @@ LogBestandTextMapper.WriteToFile("Ardis", $"Opvragen van Ardisdata met barcode '{barcodeId}'") 'Opbouwen query. - Dim query As String = $"Select top 1 {LijstKolommen} From [VH_Ardis_TST].[dbo].[Parts] where PartCalc='{barcodeId}' order by Inserted desc" + Dim query As String = $"Select top 1 {LijstKolommen} From [VH_Ardis_PROD].[dbo].[Parts] where PartCalc='{barcodeId}' order by Inserted desc" 'Query uitvoeren en resultaat retourneren. Dim resultaat = ExecuteIntoResultset(query) LogBestandTextMapper.WriteToFile("Ardis", $"Opvragen van Ardisdata met barcode '{barcodeId}'", True) @@ -213,7 +213,7 @@ LogBestandTextMapper.WriteToFile("Ardis", $"Opvragen van Ardisdata's met batch '{batchNummer}'") 'Opbouwen query. - Dim query As String = $"Select {LijstKolommen} From [VH_Ardis_TST].[dbo].[Parts] where PartGroup like '{batchNummer}%' order by Inserted desc" + Dim query As String = $"Select {LijstKolommen} From [VH_Ardis_PROD].[dbo].[Parts] where PartGroup like '{batchNummer}%' order by Inserted desc" 'Query uitvoeren en resultaat retourneren. Dim resultaat = ExecuteIntoList(query) LogBestandTextMapper.WriteToFile("Ardis", $"Opvragen van Ardisdata's met batch '{batchNummer}'", True) @@ -233,7 +233,7 @@ LogBestandTextMapper.WriteToFile("Ardis", $"Opvragen van Ardisdata's met lade code '{ladeCode}'") 'Opbouwen query. - Dim query As String = $"Select {LijstKolommen} From [VH_Ardis_TST].[dbo].[Parts] where PartRemark='{ladeCode}' order by Inserted desc" + Dim query As String = $"Select {LijstKolommen} From [VH_Ardis_PROD].[dbo].[Parts] where PartRemark='{ladeCode}' order by Inserted desc" 'Query uitvoeren en resultaat retourneren. Dim resultaat = ExecuteIntoList(query) LogBestandTextMapper.WriteToFile("Ardis", $"Opvragen van Ardisdata's met lade code '{ladeCode}'", True) @@ -251,7 +251,7 @@ Try LogBestandTextMapper.WriteToFile("Ardis", $"Updaten van Ardis met ArdisData '{ardisData.PartCalc}'") 'Opbouwen query. - Dim query As String = "update [VH_Ardis_TST].[dbo].[Parts] set + Dim query As String = "update [VH_Ardis_PROD].[dbo].[Parts] set OrderId=@OrderId,PartRef=@PartRef, PartQty=@PartQty, PartMat=@PartMat, PartL = @PartL, PartW=@PartW, PartRemark=@PartRemark, PartRemark2=@PartRemark2, PartRemark3=@PartRemark3, PartGroup=@PartGroup, PartLevel=@PartLevel, PartExt01=@PartExt01, PartExt02=@PartExt02, @@ -313,7 +313,7 @@ LogBestandTextMapper.WriteToFile("Ardis", $"Opvragen van barcodes met info Partgroup, PartExt02, LinksOfRechts: {partgroup}{partExt02}{linksOfRechts}") 'Query opbouwen. - Dim query As String = $"select top 2 PartCalc from [VH_Ardis_TST].[dbo].[Parts] where partgroup='{partgroup}' and partext02='{partExt02}' and partl='{partL}' and partext01 like '%ZIJ-{linksOfRechts}%' order by Inserted" + Dim query As String = $"select top 2 PartCalc from [VH_Ardis_PROD].[dbo].[Parts] where partgroup='{partgroup}' and partext02='{partExt02}' and partl='{partL}' and partext01 like '%ZIJ-{linksOfRechts}%' order by Inserted" 'Query uitvoeren en resultaat retourneren. Dim result = ExecuteIntoListOfString(query) @@ -336,7 +336,7 @@ LogBestandTextMapper.WriteToFile("Ardis", $"Opvragen van barcodes gegenereerde plankjes met info Partgroup, PartExt02, PartL: '{partgroup}' '{partExt02}' '{partL}'") 'Query opbouwen. - Dim query = $"select top 2 PartCalc from [VH_Ardis_TST].[dbo].[Parts] where partgroup='{partgroup}' and partext02='{partExt02}' and partl='{partL}' and partext01 like '%ZIJ-%' and (partext09 ='{Configs.sifonLadeGeefPartExt09GegenereerdeZijkantLinks()}' or partext09='{Configs.sifonLadeGeefPartExt09GegenereerdeZijkantRechts()}') order by partid desc" + Dim query = $"select top 2 PartCalc from [VH_Ardis_PROD].[dbo].[Parts] where partgroup='{partgroup}' and partext02='{partExt02}' and partl='{partL}' and partext01 like '%ZIJ-%' and (partext09 ='{Configs.sifonLadeGeefPartExt09GegenereerdeZijkantLinks()}' or partext09='{Configs.sifonLadeGeefPartExt09GegenereerdeZijkantRechts()}') order by partid desc" 'Query uitvoeren en resultaat retourneren. Dim result = ExecuteIntoListOfString(query) LogBestandTextMapper.WriteToFile("Ardis", $"Opvragen van barcodes gegenereerde plankjes met info Partgroup, PartExt02, PartL: '{partgroup}' '{partExt02}' '{partL}'", True) @@ -358,7 +358,7 @@ LogBestandTextMapper.WriteToFile("Ardis", $"Opvragen van barcodes originele plankjes met info Partgroup, PartExt02, PartL: '{partgroup}' '{partExt02}' '{partL}'") 'Query opbouwen. - Dim query = $"select top 4 PartCalc from [VH_Ardis_TST].[dbo].[Parts] where partgroup='{partgroup}' and partext02='{partExt02}' and partl='{partL}' and partext01 like '%ZIJ-%' and (partext09 ='{Configs.sifonLadeGeefPartExt09GegenereerdeZijkantLinks()}' or partext09='{Configs.sifonLadeGeefPartExt09GegenereerdeZijkantRechts()}') and PartRemark3='NoRework' order by partid desc" + Dim query = $"select top 4 PartCalc from [VH_Ardis_PROD].[dbo].[Parts] where partgroup='{partgroup}' and partext02='{partExt02}' and partl='{partL}' and partext01 like '%ZIJ-%' and (partext09 ='{Configs.sifonLadeGeefPartExt09GegenereerdeZijkantLinks()}' or partext09='{Configs.sifonLadeGeefPartExt09GegenereerdeZijkantRechts()}') and PartRemark3='NoRework' order by partid desc" 'Query uitvoeren en resultaat retourneren. Dim result = ExecuteIntoListOfString(query) LogBestandTextMapper.WriteToFile("Ardis", $"Opvragen van barcodes originele plankjes met info Partgroup, PartExt02, PartL: '{partgroup}' '{partExt02}' '{partL}'", True) @@ -377,7 +377,7 @@ Try LogBestandTextMapper.WriteToFile("Ardis", $"Opvragen van data table met partCalc: '{partCalc}'") 'Query opbouwen. - Dim query As String = $"select SUBSTRING(PartGroup, 0, 6) as BatchID, 'ToeleveringID' as ToeleveringID, substring(substring(PartExt03, CHARINDEX('/',PartExt03)+1, len(partext03)), CHARINDEX('/',substring(PartExt03, CHARINDEX('/',PartExt03)+1, len(partext03)))+1, CHARINDEX('/', substring(substring(PartExt03, CHARINDEX('/',PartExt03)+1, len(partext03)), CHARINDEX('/',substring(PartExt03, CHARINDEX('/',PartExt03)+1, len(partext03)))+1, len(partext03)))-1) as Naam, PartRemark as DossierCode, substring(substring(PartExt02, CHARINDEX('/',PartExt02)+1, len(partext02)), CHARINDEX('/',substring(PartExt02, CHARINDEX('/',PartExt02)+1, len(partext02)))+1,len(partext02)) as Kar, PartCalc as VerwerkingID, case PartRef when 'ZijkantPlaat' then 'Zijkant' else Partref end as Onderdeel, -1 as Status, 0 as Rework FROM [VH_Ardis_TST].[dbo].[Parts] where Partcalc ='{partCalc}' and PartRemark3='NoRework'" + Dim query As String = $"select SUBSTRING(PartGroup, 0, 6) as BatchID, 'ToeleveringID' as ToeleveringID, substring(substring(PartExt03, CHARINDEX('/',PartExt03)+1, len(partext03)), CHARINDEX('/',substring(PartExt03, CHARINDEX('/',PartExt03)+1, len(partext03)))+1, CHARINDEX('/', substring(substring(PartExt03, CHARINDEX('/',PartExt03)+1, len(partext03)), CHARINDEX('/',substring(PartExt03, CHARINDEX('/',PartExt03)+1, len(partext03)))+1, len(partext03)))-1) as Naam, PartRemark as DossierCode, substring(substring(PartExt02, CHARINDEX('/',PartExt02)+1, len(partext02)), CHARINDEX('/',substring(PartExt02, CHARINDEX('/',PartExt02)+1, len(partext02)))+1,len(partext02)) as Kar, PartCalc as VerwerkingID, case PartRef when 'ZijkantPlaat' then 'Zijkant' else Partref end as Onderdeel, -1 as Status, 0 as Rework FROM [VH_Ardis_PROD].[dbo].[Parts] where Partcalc ='{partCalc}' and PartRemark3='NoRework'" 'Datareader opvragen en bijhouden. Dim dataReader = ExecuteIntoDataReader(query)