Index: TAOR-rework-bugfixing/TAOR rework/formulieren/Specials/FormSifonLade.vb
===================================================================
diff -u -r1655 -r1658
--- TAOR-rework-bugfixing/TAOR rework/formulieren/Specials/FormSifonLade.vb (.../FormSifonLade.vb) (revision 1655)
+++ TAOR-rework-bugfixing/TAOR rework/formulieren/Specials/FormSifonLade.vb (.../FormSifonLade.vb) (revision 1658)
@@ -493,7 +493,7 @@
SifonLadeController.GetInstance().VerdeelDubbeleSifonLadenOverReworkTrays()
End If
- FormController.getInstance.laadFormReworkTrayPrinter(Me)
+ FormController.getInstance.laadFormReworkTrayPrinter(Me, true, DubbelCheckBox.Checked)
Catch ex As Exception
MessageBox.Show(ex.Message, "Er is een fout opgetreden...", MessageBoxButtons.OK, MessageBoxIcon.Error)
End Try
Index: TAOR-rework-bugfixing/TAOR rework/controllers/SifonLadeController.vb
===================================================================
diff -u -r1655 -r1658
--- TAOR-rework-bugfixing/TAOR rework/controllers/SifonLadeController.vb (.../SifonLadeController.vb) (revision 1655)
+++ TAOR-rework-bugfixing/TAOR rework/controllers/SifonLadeController.vb (.../SifonLadeController.vb) (revision 1658)
@@ -5,6 +5,7 @@
Private ReadOnly _sifonladeManager As MustInheritSifonLadeManager(Of ISifonLade)
Private ReadOnly _sifonladeDubbelManager As MustInheritSifonLadeManager(Of ISifonLadeDubbel)
+ Private ReadOnly _reworkTrayRepository As ReworkTrayRepository
'''
''' Singleton instantie opvragen.
@@ -19,17 +20,20 @@
Public Sub New()
'Rework tray slot engine.
- dim reworkTrayEngine As New ReworkTrayEngine(new ReworkTraySlotRepository())
+ Dim reworkTrayEngine As New ReworkTrayEngine(New ReworkTraySlotRepository())
+ 'Rework tray repository
+ _reworkTrayRepository = New ReworkTrayRepository()
+
'Special lade engine initialiseren met de juiste mapper.
Dim sifonLadeEngine = New SpecialLadeEngine(Of ISifonLade)(New SifonLadenMapper)
'Manager initialiseren met de engine.
- _sifonladeManager = New SifonLadeManager(sifonLadeEngine, reworkTrayEngine)
+ _sifonladeManager = New SifonLadeManager(sifonLadeEngine, reworkTrayEngine, _reworkTrayRepository)
'Dubbele special lade engine initialiseren met de juiste mapper.
Dim sifonladeDubbelEngine = New SpecialLadeEngine(Of ISifonLadeDubbel)(New SifonLadenDubbelMapper)
'Manager initialiseren met de engine.
- _sifonladeDubbelManager = New DubbeleSifonLadeManager(sifonladeDubbelEngine, reworkTrayEngine)
+ _sifonladeDubbelManager = New DubbeleSifonLadeManager(sifonladeDubbelEngine, reworkTrayEngine, _reworkTrayRepository)
End Sub
#Region "Normale sifon lade"
@@ -98,8 +102,13 @@
''' Sifonlade bouwen en zijkanten verdelen over rework trays.
'''
Public Sub VerdeelSifonLadenOverReworkTrays()
- _sifonladeManager.BouwLaden
+ _sifonladeManager.BouwLaden()
End Sub
+
+ Public Sub ProduceerSifonladen()
+ _sifonladeManager.Produceer()
+ _reworkTrayRepository.verwijderReworkTraysSpecialLade()
+ End Sub
#End Region
#Region "Dubbele sifon lade"
@@ -168,15 +177,68 @@
'''
''' Dubbele sifonlade bouwen en zijkanten verdelen over rework trays.
'''
- public Sub VerdeelDubbeleSifonLadenOverReworkTrays()
- _sifonladeManager.BouwLaden
+ Public Sub VerdeelDubbeleSifonLadenOverReworkTrays()
+ _sifonladeManager.BouwLaden()
End Sub
+ Public Sub ProduceerDubbeleSifonladen()
+ _sifonladeDubbelManager.Produceer()
+ _reworkTrayRepository.verwijderReworkTraysSpecialLade()
+ End Sub
+
#End Region
- Private Sub slaSifonLadenOp()
- 'todo Dim hoofdAansturingSifonLade As HoofdAansturingSpecialLade = New HoofdAansturingSifonLade(reworkTrayRep)
- 'hoofdAansturingSifonLade.verwerkenSpecialLadeMetTrays(_specialLadenRep.sifonLaden)
- End Sub
+ Public Function GeefAantalTrays() As Integer
+ Return _reworkTrayRepository.aantalReworkTraysSpecial
+ End Function
+ Public Function GeefSpecialLadeReworkTrayNummer(index As Integer) As String
+ Return _reworkTrayRepository.geefSpecialLadeReworkTrayNummer(index)
+ End Function
+
+ '''
+ ''' inhoud van alle slots van een reworktray geven
+ '''
+ '''
+ '''
+ Public Function GeefSlotsSpecialReworkTray(index As Integer) As List(Of List(Of String))
+ Dim trays As New List(Of List(Of String))
+ Try
+ For teller As Integer = 0 To _reworkTrayRepository.reworkTraysSpecialLaden(index).slots.Count - 1
+ Dim slot As Slot = _reworkTrayRepository.reworkTraysSpecialLaden(index).slots(teller)
+ Dim content As New List(Of String)
+ If Not (slot.zijkantenSpeciaal Is Nothing OrElse slot.zijkantenSpeciaal.Count <= 0) Then
+ 'voorraad
+ content.Add(slot.nummer)
+ content.Add(slot.zijkantenSpeciaal(0).PartCalc)
+ content.Add(slot.zijkantenSpeciaal(0).GeefBatch)
+ If slot.zijkantenSpeciaal.Count = 4 Then 'voorraad
+ content.Add(slot.zijkantenSpeciaal(0).geefColorDubbelVoorraad(slot.zijkantenSpeciaal(1), slot.zijkantenSpeciaal(2), slot.zijkantenSpeciaal(3)))
+ ElseIf slot.type = SlotType.enkel Then 'voorraad met 1 zijkant
+ content.Add(slot.zijkantenSpeciaal(0).geefColorEnkel(slot.zijkantenSpeciaal(1)))
+ Else
+ content.Add(slot.zijkantenSpeciaal(0).geefColorDubbel(slot.zijkantenSpeciaal(1)))
+ End If
+
+ content.Add(slot.zijkantenSpeciaal(0).PartL)
+ content.Add(slot.zijkantenSpeciaal(0).PartW)
+ Else 'leeg slot
+ 'de cijfers wel, maar gewoon geen andere informatie meegeven
+ content.Add(teller + 1)
+ content.Add("")
+ content.Add("")
+ content.Add("")
+ content.Add("")
+ content.Add("")
+ End If
+
+ trays.Add(content)
+ Next
+ Return trays
+ Catch ex As Exception
+ MessageBox.Show("Er is een fout opgetreden bij het opvragen van een special lade reworktray" & ex.Message, "Er is een fout opgetreden...", MessageBoxButtons.OK, MessageBoxIcon.Error)
+ Return Nothing
+ End Try
+ End Function
+
End Class
Index: TAOR-rework-bugfixing/TAOR rework/nieuwdomein/managers/MustInheritSifonLadeManager.vb
===================================================================
diff -u -r1657 -r1658
--- TAOR-rework-bugfixing/TAOR rework/nieuwdomein/managers/MustInheritSifonLadeManager.vb (.../MustInheritSifonLadeManager.vb) (revision 1657)
+++ TAOR-rework-bugfixing/TAOR rework/nieuwdomein/managers/MustInheritSifonLadeManager.vb (.../MustInheritSifonLadeManager.vb) (revision 1658)
@@ -7,20 +7,14 @@
Private ReadOnly _reworkTrayEngine As IReworkTrayEngine
Private ReadOnly _reworkTrayRepository As ReworkTrayRepository
- Public ReadOnly Property SpecialLaden() As List(Of TLadeType)
- Get
- Return New List(Of TLadeType)(Laden)
- End Get
- End Property
-
'''
''' Initialiseren met een special laden engine.
'''
''' De special laden engine
- Public Sub New(specialLadenEngine As ISpecialLadeEngine(Of TLadeType), reworkTrayEngine As IReworkTrayEngine)
+ Public Sub New(specialLadenEngine As ISpecialLadeEngine(Of TLadeType), reworkTrayEngine As IReworkTrayEngine, reworkTrayRepository As ReworkTrayRepository)
_specialLadenEngine = specialLadenEngine
_reworkTrayEngine = reworkTrayEngine
- _reworkTrayRepository = New ReworkTrayRepository()
+ _reworkTrayRepository = reworkTrayRepository
End Sub
'''
Index: TAOR-rework-bugfixing/TAOR rework/controllers/Domeincontroller.vb
===================================================================
diff -u -r1628 -r1658
--- TAOR-rework-bugfixing/TAOR rework/controllers/Domeincontroller.vb (.../Domeincontroller.vb) (revision 1628)
+++ TAOR-rework-bugfixing/TAOR rework/controllers/Domeincontroller.vb (.../Domeincontroller.vb) (revision 1658)
@@ -5,7 +5,7 @@
Private Shared instance As Domeincontroller
Private reworkRep As ReworkRepository
Private reworkTrayslotRep As ReworkTraySlotRepository
- Private reworkTrayRep As ReworkTrayRepository
+ private reworkTrayRep As ReworkTrayRepository
Private reworkRedenenRep As ReworkRedenenRepository
Private testLadenRep As TestLadenRepository
Private hoofdAansturingRework As HoofdAansturingRework
Index: TAOR-rework-bugfixing/TAOR rework/formulieren/FormController.vb
===================================================================
diff -u -r1625 -r1658
--- TAOR-rework-bugfixing/TAOR rework/formulieren/FormController.vb (.../FormController.vb) (revision 1625)
+++ TAOR-rework-bugfixing/TAOR rework/formulieren/FormController.vb (.../FormController.vb) (revision 1658)
@@ -101,7 +101,7 @@
Public Sub laadEnRefreshFormGrid(sender As Form)
registreerVorigeForm(sender)
- _formGrid.laadData(_kolom, _waarde)
+ _formGrid.LaadData(_kolom, _waarde)
_formGrid.Show()
_sender.Hide()
@@ -125,7 +125,7 @@
_waarde = waarde
_dataReader = dataReader
- _formGrid.laadData(_kolom, _waarde, dataReader)
+ _formGrid.LaadData(_kolom, _waarde, dataReader)
_formGrid.Show()
_sender.Hide()
@@ -154,10 +154,16 @@
End Sub
'LADEN VAN FORMREWORKTRAYPRINTER
- Public Sub laadFormReworkTrayPrinter(sender As Form)
+ Public Sub laadFormReworkTrayPrinter(sender As Form, Optional isNieuwDomeinSifonlade As Boolean = False, Optional isdubbeleSifonlade As Boolean = False)
registreerVorigeForm(sender)
- _formReworkTrayPrinter = New FormReworkTrayPrinter()
+ If isNieuwDomeinSifonlade Then
+ 'Nieuw domein
+ _formReworkTrayPrinter = New FormReworkTrayPrinter(True, isdubbeleSifonlade)
+ Else
+ 'Geen nieuw domein
+ _formReworkTrayPrinter = New FormReworkTrayPrinter()
+ End If
_formReworkTrayPrinter.Show()
_sender.Hide()
Index: TAOR-rework-bugfixing/TAOR rework/nieuwdomein/managers/implementaties/SifonLadeManager.vb
===================================================================
diff -u -r1657 -r1658
--- TAOR-rework-bugfixing/TAOR rework/nieuwdomein/managers/implementaties/SifonLadeManager.vb (.../SifonLadeManager.vb) (revision 1657)
+++ TAOR-rework-bugfixing/TAOR rework/nieuwdomein/managers/implementaties/SifonLadeManager.vb (.../SifonLadeManager.vb) (revision 1658)
@@ -5,8 +5,8 @@
''' Initialiseren met een special laden engine.
'''
''' De special laden engine
- Public Sub New(specialLadenEngine As ISpecialLadeEngine(Of ISifonLade), reworkTrayEngine As IReworkTrayEngine)
- MyBase.New(specialLadenEngine, reworkTrayEngine)
+ Public Sub New(specialLadenEngine As ISpecialLadeEngine(Of ISifonLade), reworkTrayEngine As IReworkTrayEngine, reworkTrayRepository As ReworkTrayRepository)
+ MyBase.New(specialLadenEngine, reworkTrayEngine, reworkTrayRepository)
End Sub
'''
Index: TAOR-rework-bugfixing/TAOR rework/nieuwdomein/managers/implementaties/DubbeleSifonLadeManager.vb
===================================================================
diff -u -r1657 -r1658
--- TAOR-rework-bugfixing/TAOR rework/nieuwdomein/managers/implementaties/DubbeleSifonLadeManager.vb (.../DubbeleSifonLadeManager.vb) (revision 1657)
+++ TAOR-rework-bugfixing/TAOR rework/nieuwdomein/managers/implementaties/DubbeleSifonLadeManager.vb (.../DubbeleSifonLadeManager.vb) (revision 1658)
@@ -5,8 +5,8 @@
''' Initialiseren met een special laden engine.
'''
''' De special laden engine
- Public Sub New(specialLadenEngine As ISpecialLadeEngine(Of ISifonLadeDubbel), reworkTrayEngine As IReworkTrayEngine)
- MyBase.New(specialLadenEngine, reworkTrayEngine)
+ Public Sub New(specialLadenEngine As ISpecialLadeEngine(Of ISifonLadeDubbel), reworkTrayEngine As IReworkTrayEngine, reworkTrayRepository As ReworkTrayRepository)
+ MyBase.New(specialLadenEngine, reworkTrayEngine, reworkTrayRepository)
End Sub
'''
Index: TAOR-rework-bugfixing/TAOR rework/formulieren/FormReworkTrayPrinter.vb
===================================================================
diff -u -r1626 -r1658
--- TAOR-rework-bugfixing/TAOR rework/formulieren/FormReworkTrayPrinter.vb (.../FormReworkTrayPrinter.vb) (revision 1626)
+++ TAOR-rework-bugfixing/TAOR rework/formulieren/FormReworkTrayPrinter.vb (.../FormReworkTrayPrinter.vb) (revision 1658)
@@ -1,25 +1,30 @@
Imports System.Text
-Imports TA_OR_rework.rework
+Imports TA_OR_rework.Rework
Public Class FormReworkTrayPrinter
Private _aantalTrays As Integer
Private _nummerTray As Integer
+ Private _isNieuweSifonDomein As Boolean
+ Private _isDubbeleSifonlade As Boolean
- Public Sub New()
+ Public Sub New(Optional isNieuweSifonDomein As Boolean = False, Optional isDubbeleSifonLade As Boolean = False)
InitializeComponent()
- Try
+ 'nummer welke special tray er getoond wordt instellen
+ _nummerTray = 1
+
+ If isNieuweSifonDomein Then
+ _aantalTrays = SifonLadeController.GetInstance().GeefAantalTrays()
+ _isNieuweSifonDomein = isNieuweSifonDomein
+ _isDubbeleSifonlade = isDubbeleSifonLade
+ Else
'origineel aantal instellen
- If Domeincontroller.getInstance.geefTypeInReworkTray = ItemType.REWORK Then
+ If Domeincontroller.getInstance.geefTypeInReworkTray = ItemType.Rework Then
_aantalTrays = Domeincontroller.getInstance.geefAantalReworkTrays
Else
_aantalTrays = Domeincontroller.getInstance.geefSpecialAantalReworkTrays
End If
- 'nummer welke special tray er getoond wordt instellen
- _nummerTray = 1
- Catch ex As Exception
- Throw ex
- End Try
+ End If
End Sub
Private Sub FormReworkTrayPrinter_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load
@@ -62,36 +67,43 @@
_builder = New StringBuilder
Dim typelade As String
Dim reworkTrayNummer As String
- Select Case Domeincontroller.getInstance.geefTypeInReworkTray
- Case ItemType.SIFONLADE
- typelade = "sifon lade"
- reworkTrayNummer = Domeincontroller.getInstance.geefSpecialLadeReworkTrayNummer(_nummerTray - 1)
- Case ItemType.DUBBELESIFONLADE
- typelade = "spoelbak lade"
- reworkTrayNummer = Domeincontroller.getInstance.geefSpecialLadeReworkTrayNummer(_nummerTray - 1)
- Case ItemType.VOORRAAD
- typelade = "voorraad"
- reworkTrayNummer = Domeincontroller.getInstance.geefSpecialLadeReworkTrayNummer(_nummerTray - 1)
- Case ItemType.TESTLADE
- typelade = "test lade"
- reworkTrayNummer = Domeincontroller.getInstance.geefSpecialLadeReworkTrayNummer(_nummerTray - 1)
- Case ItemType.REWORK
- typelade = "rework"
- reworkTrayNummer = Domeincontroller.getInstance.geefReworkTrayNummer(_nummerTray - 1)
- Case Else
- Throw New Exception("Het type: " & EnumMapper.GeefTekstVanEnumOptie(Domeincontroller.getInstance.geefTypeInReworkTray) & " kon niet gebruikt worden voor tray printer te visualiseren")
- End Select
+
+ If _isNieuweSifonDomein Then
+ typelade = "sifonlade"
+ reworkTrayNummer = SifonLadeController.GetInstance.GeefSpecialLadeReworkTrayNummer(_nummerTray - 1)
+ Else
+ Select Case Domeincontroller.getInstance.geefTypeInReworkTray
+ Case ItemType.Voorraad
+ typelade = "voorraad"
+ reworkTrayNummer = Domeincontroller.getInstance.geefSpecialLadeReworkTrayNummer(_nummerTray - 1)
+ Case ItemType.Testlade
+ typelade = "test lade"
+ reworkTrayNummer = Domeincontroller.getInstance.geefSpecialLadeReworkTrayNummer(_nummerTray - 1)
+ Case ItemType.Rework
+ typelade = "rework"
+ reworkTrayNummer = Domeincontroller.getInstance.geefReworkTrayNummer(_nummerTray - 1)
+ Case Else
+ Throw New Exception("Het type: " & EnumMapper.GeefTekstVanEnumOptie(Domeincontroller.getInstance.geefTypeInReworkTray) & " kon niet gebruikt worden voor tray printer te visualiseren")
+ End Select
+ End If
+
_builder.AppendLine("Rework tray " & reworkTrayNummer & " | " & typelade)
_builder.AppendLine()
_builder.AppendLine(String.Format("{0,4}{1,13}{2,7}{3,13}{4,8}{5,8}", "Slot", "Barcode", "Batch", "Color", "Length", "Height"))
'elk "slot" overlopen en toevoegen als lijn
Dim lijnen As List(Of List(Of String))
- If Domeincontroller.getInstance.geefTypeInReworkTray = ItemType.REWORK Then
- lijnen = Domeincontroller.getInstance.geefSlotsReworkTray(_nummerTray - 1)
+
+ If _isNieuweSifonDomein Then
+ lijnen = SifonLadeController.GetInstance.GeefSlotsSpecialReworkTray(_nummerTray - 1)
Else
- lijnen = Domeincontroller.getInstance.geefSlotsSpecialReworkTray(_nummerTray - 1)
+ If Domeincontroller.getInstance.geefTypeInReworkTray = ItemType.Rework Then
+ lijnen = Domeincontroller.getInstance.geefSlotsReworkTray(_nummerTray - 1)
+ Else
+ lijnen = Domeincontroller.getInstance.geefSlotsSpecialReworkTray(_nummerTray - 1)
+ End If
End If
+
For Each lijn As List(Of String) In lijnen
_builder.AppendLine(String.Format("{0,4}{1,13}{2,7}{3,13}{4,8}{5,8}", lijn(0), lijn(1), lijn(2), lijn(3), lijn(4), lijn(5)))
Next
@@ -107,10 +119,14 @@
gaVerder()
ElseIf _nummerTray + 1 <= _aantalTrays Then 'er zijn nog trays te tonen
If _nummerTray + 1 = _aantalTrays Then 'er is nog 1 tray
- If Domeincontroller.getInstance.geefTypeInReworkTray = ItemType.TESTLADE Then
- btnPrintEnToonVolgende.Text = "Ga verder"
- Else
+ If _isNieuweSifonDomein Then
btnPrintEnToonVolgende.Text = "Verwerk en ga verder"
+ Else
+ If Domeincontroller.getInstance.geefTypeInReworkTray = ItemType.Testlade Then
+ btnPrintEnToonVolgende.Text = "Ga verder"
+ Else
+ btnPrintEnToonVolgende.Text = "Verwerk en ga verder"
+ End If
End If
End If
'de index verhogen met 1
@@ -140,30 +156,45 @@
End Sub
Private Sub verwerkDeItems() 'verwerken, onderscheid tussen reworks en special laden
- Select Case Domeincontroller.getInstance.geefTypeInReworkTray
- Case ItemType.SIFONLADE, ItemType.DUBBELESIFONLADE, ItemType.VOORRAAD
- Domeincontroller.getInstance.verwerkSpecialLaden()
- Case ItemType.REWORK
- Domeincontroller.getInstance.verwerkReworks()
- Case ItemType.TESTLADE
- Domeincontroller.getInstance.verwerkTestLaden()
- Case Else
- Throw New Exception("Het type: " & EnumMapper.GeefTekstVanEnumOptie(Domeincontroller.getInstance.geefTypeInReworkTray) & " kon niet gebruikt worden voor te verwerken")
- End Select
+ If _isNieuweSifonDomein Then
+ If _isDubbeleSifonlade Then
+ SifonLadeController.GetInstance().ProduceerDubbeleSifonladen()
+ Else
+ SifonLadeController.GetInstance().ProduceerSifonladen()
+ End If
+ Else
+ Select Case Domeincontroller.getInstance.geefTypeInReworkTray
+ Case ItemType.Sifonlade, ItemType.DubbeleSifonlade, ItemType.Voorraad
+ Domeincontroller.getInstance.verwerkSpecialLaden()
+ Case ItemType.Rework
+ Domeincontroller.getInstance.verwerkReworks()
+ Case ItemType.Testlade
+ Domeincontroller.getInstance.verwerkTestLaden()
+ Case Else
+ Throw New Exception("Het type: " & EnumMapper.GeefTekstVanEnumOptie(Domeincontroller.getInstance.geefTypeInReworkTray) & " kon niet gebruikt worden voor te verwerken")
+ End Select
+ End If
+
End Sub
Private Sub opslaanBacklog()
'alle trays overlopen en builder opnieuw vullen
For _nummerTray = 1 To _aantalTrays
vulBuilderMetInfo(_nummerTray - 1)
- Select Case Domeincontroller.getInstance.geefTypeInReworkTray
- Case ItemType.SIFONLADE, ItemType.DUBBELESIFONLADE, ItemType.VOORRAAD, ItemType.TESTLADE
- PrinterBacklogDocMapper.addPrinterBacklogDoc(Domeincontroller.getInstance.geefSpecialLadeReworkTrayNummer(_nummerTray - 1), _builder.ToString(), True)
- Case ItemType.REWORK
- PrinterBacklogDocMapper.addPrinterBacklogDoc(Domeincontroller.getInstance.geefReworkTrayNummer(_nummerTray - 1), _builder.ToString(), False)
- Case Else
- Throw New Exception("Het type: " & EnumMapper.GeefTekstVanEnumOptie(Domeincontroller.getInstance.geefTypeInReworkTray) & " kon niet gebruikt worden voor opslag backlog")
- End Select
+
+ If _isNieuweSifonDomein Then
+ PrinterBacklogDocMapper.addPrinterBacklogDoc(SifonLadeController.GetInstance.GeefSpecialLadeReworkTrayNummer(_nummerTray - 1), _builder.ToString(), True)
+ Else
+ Select Case Domeincontroller.getInstance.geefTypeInReworkTray
+ Case ItemType.Sifonlade, ItemType.DubbeleSifonlade, ItemType.Voorraad, ItemType.Testlade
+ PrinterBacklogDocMapper.addPrinterBacklogDoc(Domeincontroller.getInstance.geefSpecialLadeReworkTrayNummer(_nummerTray - 1), _builder.ToString(), True)
+ Case ItemType.Rework
+ PrinterBacklogDocMapper.addPrinterBacklogDoc(Domeincontroller.getInstance.geefReworkTrayNummer(_nummerTray - 1), _builder.ToString(), False)
+ Case Else
+ Throw New Exception("Het type: " & EnumMapper.GeefTekstVanEnumOptie(Domeincontroller.getInstance.geefTypeInReworkTray) & " kon niet gebruikt worden voor opslag backlog")
+ End Select
+ End If
+
Next
End Sub
@@ -177,64 +208,11 @@
'de tekst printen op het scherm
Dim font As New Font("Courier New", 15, FontStyle.Regular)
TextBoxReworkTraySlots.CreateGraphics.DrawString(_builder.ToString, font, Brushes.Black, 30, 100)
- 'de afbeeldingen tekenen op de textbox
- If Domeincontroller.getInstance.geefTypeSpecialLade = ItemType.SIFONLADE Then
- tekenAfbeeldingMetInfoOpSchermSifonLade()
- ElseIf Domeincontroller.getInstance.geefTypeSpecialLade = ItemType.DUBBELESIFONLADE Then
- tekenAfbeeldingMetInfoOpSchermSpoelbakLade()
- End If
Catch ex As Exception
MessageBox.Show(ex.Message, "Er is een fout opgetreden...", MessageBoxButtons.OK, MessageBoxIcon.Error)
End Try
End Sub
- Private Sub tekenAfbeeldingMetInfoOpSchermSifonLade()
- Dim font As New Font("Courier New", 15, FontStyle.Bold)
- Dim posX As Integer = 150
- Dim posY As Integer = 350
-
- Dim image As Image = My.Resources.ResourceManager.GetObject("sifonLadeTekening")
- TextBoxReworkTraySlots.CreateGraphics.DrawImage(image, posX, posY)
-
- Dim info As List(Of String) = Domeincontroller.getInstance.geefInformatieSifonLade()
- Dim breedte As String = info(5) 'breedte van de lade
- Dim breedteUitsparing As String = info(6)
- Dim diepteLade As String = info(7) 'diepte van de volledige lade
- Dim diepteUitsparing As String = info(8)
- Dim positie As String = info(9)
- Dim rest As String = info(10)
- TextBoxReworkTraySlots.CreateGraphics.DrawString(breedte, font, Brushes.Black, posX + 185, posY + 200)
- TextBoxReworkTraySlots.CreateGraphics.DrawString(diepteLade, font, Brushes.Black, posX + 430, posY + 100)
- TextBoxReworkTraySlots.CreateGraphics.DrawString(positie, font, Brushes.Black, posX + 300, posY - 15)
- TextBoxReworkTraySlots.CreateGraphics.DrawString(breedteUitsparing, font, Brushes.Black, posX + 185, posY - 15)
- TextBoxReworkTraySlots.CreateGraphics.DrawString(diepteUitsparing, font, Brushes.Black, posX + 272, posY + 70)
- TextBoxReworkTraySlots.CreateGraphics.DrawString(rest, font, Brushes.Black, posX + 60, posY - 15)
- End Sub
-
- Private Sub tekenAfbeeldingMetInfoOpSchermSpoelbakLade()
- Dim font As New Font("Courier New", 15, FontStyle.Bold)
- Dim posX As Integer = 150
- Dim posY As Integer = 350
-
- Dim image As Image = My.Resources.ResourceManager.GetObject("spoelbakLadeTekening")
- TextBoxReworkTraySlots.CreateGraphics.DrawImage(image, posX, posY)
-
- Dim info As List(Of String) = Domeincontroller.getInstance.geefInformatieSpoelbakLade()
- Dim breedte As String = info(5) 'breedte van de lade
- Dim breedteUitsparing As String = info(6)
- Dim diepteLade As String = info(7) 'diepte van de volledige lade
- Dim diepteUitsparing As String = info(8)
- Dim positie As String = info(9)
- Dim restBreedte As String = info(10)
-
- TextBoxReworkTraySlots.CreateGraphics.DrawString(breedte, font, Brushes.Black, posX + 185, posY + 250)
- TextBoxReworkTraySlots.CreateGraphics.DrawString(diepteLade, font, Brushes.Black, posX + 415, posY + 100)
- TextBoxReworkTraySlots.CreateGraphics.DrawString(positie, font, Brushes.Black, posX + 330, posY - 15)
- TextBoxReworkTraySlots.CreateGraphics.DrawString(breedteUitsparing, font, Brushes.Black, posX + 185, posY - 15)
- TextBoxReworkTraySlots.CreateGraphics.DrawString(restBreedte, font, Brushes.Black, posX + 35, posY - 15)
- TextBoxReworkTraySlots.CreateGraphics.DrawString(diepteUitsparing, font, Brushes.Black, posX + 397, posY + 70)
- End Sub
-
#End Region
#Region "printen"
@@ -247,83 +225,21 @@
vulBuilderMetInfo(_nummerTray - 1)
'de tekst "tekenen" op het printerdocument
e.Graphics.DrawString(_builder.ToString, font, Brushes.Black, 30, 100)
- 'de afbeelding tekenen met waarden tekenen op het document
- If Domeincontroller.getInstance.geefTypeSpecialLade = ItemType.SIFONLADE Then
- tekenAfbeeldingMetInfoVoorPrinterSifonLade(e)
- ElseIf Domeincontroller.getInstance.geefTypeSpecialLade = ItemType.DUBBELESIFONLADE Then
- tekenAfbeeldingMetInfoVoorPrinterSpoelbakLade(e)
- End If
'e.HasMorePages = _aantalTrays > 1
Catch ex As Exception
MessageBox.Show(ex.Message, "Er is een fout opgetreden...", MessageBoxButtons.OK, MessageBoxIcon.Error)
End Try
End Sub
- Private Sub tekenAfbeeldingMetInfoVoorPrinterSifonLade(e As Printing.PrintPageEventArgs)
- Try
- Dim font As New Font("Courier New", 15, FontStyle.Bold)
- Dim posX As Integer = 150
- Dim posY As Integer = 350
-
- Dim image As Image = My.Resources.ResourceManager.GetObject("sifonLadeTekening")
- e.Graphics.DrawImage(image, posX, posY)
-
- Dim info As List(Of String) = Domeincontroller.getInstance.geefInformatieSifonLade()
- Dim breedte As String = info(5) 'breedte van de lade
- Dim breedteUitsparing As String = info(6)
- Dim diepteLade As String = info(7) 'diepte van de volledige lade
- Dim diepteUitsparing As String = info(8)
- Dim positie As String = info(9)
- Dim rest As String = info(10)
-
- posX += 8
- e.Graphics.DrawString(breedte, font, Brushes.Black, posX + 185, posY + 200)
- e.Graphics.DrawString(diepteLade, font, Brushes.Black, posX + 430, posY + 100)
- e.Graphics.DrawString(positie, font, Brushes.Black, posX + 300, posY - 15)
- e.Graphics.DrawString(breedteUitsparing, font, Brushes.Black, posX + 185, posY - 15)
- e.Graphics.DrawString(diepteUitsparing, font, Brushes.Black, posX + 272, posY + 70)
- e.Graphics.DrawString(rest, font, Brushes.Black, posX + 53, posY - 15)
- Catch ex As Exception
- MessageBox.Show(ex.Message, "Er is een fout opgetreden...", MessageBoxButtons.OK, MessageBoxIcon.Error)
- End Try
- End Sub
-
- Private Sub tekenAfbeeldingMetInfoVoorPrinterSpoelbakLade(e As Printing.PrintPageEventArgs)
- Try
- Dim font As New Font("Courier New", 15, FontStyle.Bold)
- Dim posX As Integer = 150
- Dim posY As Integer = 350
-
- Dim image As Image = My.Resources.ResourceManager.GetObject("spoelbakLadeTekening")
- e.Graphics.DrawImage(image, posX, posY)
-
- Dim info As List(Of String) = Domeincontroller.getInstance.geefInformatieSpoelbakLade()
- Dim breedte As String = info(5) 'breedte van de lade
- Dim breedteUitsparing As String = info(6)
- Dim diepteLade As String = info(7) 'diepte van de volledige lade
- Dim diepteUitsparing As String = info(8)
- Dim positie As String = info(9)
- Dim restBreedte As String = info(10)
-
- posX += 7
- e.Graphics.DrawString(breedte, font, Brushes.Black, posX + 185, posY + 250)
- e.Graphics.DrawString(diepteLade, font, Brushes.Black, posX + 415, posY + 100)
- e.Graphics.DrawString(positie, font, Brushes.Black, posX + 330, posY - 15)
- e.Graphics.DrawString(breedteUitsparing, font, Brushes.Black, posX + 185, posY - 15)
- e.Graphics.DrawString(restBreedte, font, Brushes.Black, posX + 35, posY - 15)
- e.Graphics.DrawString(diepteUitsparing, font, Brushes.Black, posX + 397, posY + 70)
- Catch ex As Exception
- MessageBox.Show(ex.Message, "Er is een fout opgetreden...", MessageBoxButtons.OK, MessageBoxIcon.Error)
- End Try
- End Sub
-
#End Region
Private Sub gaVerder()
- Domeincontroller.getInstance.verwijderAlleReworks()
- Domeincontroller.getInstance.verwijderAlleSpecialLaden()
- Domeincontroller.getInstance.verwijderReworkTrays()
- Domeincontroller.getInstance.verwijderVolledigeVoorraad()
+ If Not _isNieuweSifonDomein Then
+ Domeincontroller.getInstance.verwijderAlleReworks()
+ Domeincontroller.getInstance.verwijderAlleSpecialLaden()
+ Domeincontroller.getInstance.verwijderReworkTrays()
+ Domeincontroller.getInstance.verwijderVolledigeVoorraad()
+ End If
FormController.getInstance.laadVorige(Me)
End Sub