Index: TAOR rework/TAOR rework/Rework/Rework.vb =================================================================== diff -u -r1869 -r2069 --- TAOR rework/TAOR rework/Rework/Rework.vb (.../Rework.vb) (revision 1869) +++ TAOR rework/TAOR rework/Rework/Rework.vb (.../Rework.vb) (revision 2069) @@ -1,193 +1,72 @@  Public Class Rework - Private _onderdeel As String - Private _barcode As String - Private _reden As String - Private _redenLabel As String - Private _batch As String - Private _kar As String - Private _dossierCode As String - - Private _opslaanArdis As Boolean - - Private _color As String = "-" - Private _length As String = "-" - Private _height As String = "-" - - Private _voorVoorraad As String - Private _etiketTekst As String - - Public DueOut As String - Public MachineID As String - Public PartijID As String - Public ProductID As String - Public SequentieNummer As String - Public StapNummer As String - Public TijdstipCreatie As String - Public TijdstipProductie As String - Public ToeleveringID As String - Public IsRework As String - Public OrigineelOnderdeel As String - Public Sub New() - End Sub Public Sub New(ByVal barcode As String, ByVal reden() As String, ByVal onderdeel As String, ByVal voorVoorraad As Boolean) - _barcode = barcode - _reden = reden(0) - _redenLabel = reden(1) - _onderdeel = onderdeel - _voorVoorraad = voorVoorraad - _opslaanArdis = True + Me.barcode = barcode + Me.reden = reden(0) + Me.redenLabel = reden(1) + Me.onderdeel = onderdeel + Me.VoorVoorraad = voorVoorraad + opslaanArdis = True End Sub #Region "properties" - Public Property onderdeel() As String - Get - Return _onderdeel - End Get - Set(ByVal value As String) - _onderdeel = value - End Set - End Property + Public Property Onderdeel As String + Public Property Barcode As String + Public Property Batch As String + Public Property Kar As String + Public Property Color As String = "-" + Public Property Length As String = "-" + Public Property Height As String = "-" + Public Property DossierCode As String + Public Property OpslaanArdis As Boolean + Public Property VoorVoorraad As Boolean + Public Property EtiketTekst As String + Public Property Reden As String + Public Property RedenLabel As String - Public Property barcode() As String - Get - Return _barcode - End Get - Set(ByVal value As String) - _barcode = value - End Set - End Property + 'Caché velden + Public Property DueOut As String + Public Property MachineID As String + Public Property PartijID As String + Public Property ProductID As String + Public Property SequentieNummer As String + Public Property StapNummer As String + Public Property TijdstipCreatie As String + Public Property TijdstipProductie As String + Public Property ToeleveringID As String + Public Property IsRework As String + Public Property OrigineelOnderdeel As String - Public Property reden() As String - Get - Return _reden - End Get - Set(ByVal value As String) - _reden = value - End Set - End Property - - Public Property redenLabel() As String - Get - Return _redenLabel - End Get - Set(ByVal value As String) - _redenLabel = value - End Set - End Property - - Public Property batch() As String - Get - Return _batch - End Get - Set(ByVal value As String) - _batch = value - End Set - End Property - - Public Property kar() As String - Get - Return _kar - End Get - Set(ByVal value As String) - _kar = value - End Set - End Property - - Public Property color() As String - Get - Return _color - End Get - Set(ByVal value As String) - _color = value - End Set - End Property - - Public Property length As String - Get - Return _length - End Get - Set(ByVal value As String) - _length = value - End Set - End Property - - Public Property height() As String - Get - Return _height - End Get - Set(ByVal value As String) - _height = value - End Set - End Property - - Public Property dossierCode() As String - Get - Return _dossierCode - End Get - Set(ByVal value As String) - _dossierCode = value - End Set - End Property - - Public Property opslaanArdis() As Boolean - Get - Return _opslaanArdis - End Get - Set(ByVal value As Boolean) - _opslaanArdis = value - End Set - End Property - - Public Property voorVoorraad() As Boolean - Get - Return _voorVoorraad - End Get - Set(ByVal value As Boolean) - _voorVoorraad = value - End Set - End Property - - Public Property etiketTekst() As String - Get - Return _etiketTekst - End Get - Set(ByVal value As String) - _etiketTekst = value - End Set - End Property - #End Region - Public Sub aanpassenData() + Public Sub AanpassenData() IsRework = "1" MachineID = "Rework" StapNummer = "0" End Sub - Public Function geefLinksOfRechts() As String - Dim linksofrechts As String = onderdeel.ToLower.Replace("zijkant", "").Replace("i", "").Replace("e", "").Replace("s", "").Trim.ToUpper() - If Not linksofrechts.Equals("") Then - Return linksofrechts + Public Function GeefLinksOfRechts() As String + Dim linksOfRechts As String = onderdeel.ToLower.Replace("zijkant", "").Replace("i", "").Replace("e", "").Replace("s", "").Trim.ToUpper() + If Not linksOfRechts.Equals("") Then + Return linksOfRechts End If Dim linksOfRechtsLetter As String = barcode.Substring(5).Substring(0, 1) Select Case linksOfRechtsLetter Case "L", "C", "E", "A" - linksofrechts = "L" + linksOfRechts = "L" Case "R", "D", "F", "B" - linksofrechts = "R" + linksOfRechts = "R" Case Else Throw New Exception($"Letter '{linksOfRechtsLetter}' onbekend om links of rechts te bepalen voor rework zijkant") End Select - Return linksofrechts + Return linksOfRechts End Function Public Overrides Function ToString() As String - Return "ONDERDEEL: " & _onderdeel & " --- BARCODE: " & _barcode & " --- BATCH: " & _batch & " " & " --- KAR: " & _kar & " " & " --- OPSLAAN ARDIS: " & _opslaanArdis & " " & " --- COLOR: " & _color & " " & " --- LENGTH: " & _length & " --- HEIGHT: " & _height + Return $"ONDERDEEL: {onderdeel} --- BARCODE: {barcode} --- BATCH: {batch} --- KAR: {kar} --- OPSLAAN ARDIS: {opslaanArdis} --- COLOR: {color} --- LENGTH: {length} --- HEIGHT: {height}" End Function - End Class \ No newline at end of file