Index: APPS/Halux/PPS/TBXZaag/impl/MaakBatch.cls.xml
===================================================================
diff -u
--- APPS/Halux/PPS/TBXZaag/impl/MaakBatch.cls.xml (revision 0)
+++ APPS/Halux/PPS/TBXZaag/impl/MaakBatch.cls.xml (revision 2731)
@@ -0,0 +1,117 @@
+
+
+
+TECH.Error
+1
+%RegisteredObject,DOM.PM.TBXProduct.TBXProductVisitor
+0
+
+
+APPS.Halux.common.Batch
+
+
+
+DOM.PM.ProductAPI
+
+
+
+DS.PPS.TBX.Queue
+
+
+
+1
+GeslotenEvent:APPS.Halux.common.event.BatchGeslotenEvent
+
+
+
+
+
+TO BE DEPLOYED - ONCE
+1
+
+
+
+
+BatchID:%Integer
+%Status
+
+
+
+
+%SQLQuery
+BatchID:%Integer
+1
+ Select %ID from PPS.TBX_Queue where BatchId = :BatchID
+ order by Sequence
+
+
+
+
+
+
+
+
+
+Triggered by visitor
+LadeMetUitsparing:DOM.PM.TBXProduct.TBXLadeMetUitsparing
+
+
+
+
+
+Triggered by visitor
+Lade:DOM.PM.TBXProduct.TBXLade
+
+
+
+
+Lade:DOM.PM.TBXProduct.TBXLade,SubBatch:APPS.Halux.PPS.TBXZaag.enu.SubBatch
+1
+
+
+
+
Index: APPS/Halux/common/event/BatchGeslotenEvent.cls.xml
===================================================================
diff -u
--- APPS/Halux/common/event/BatchGeslotenEvent.cls.xml (revision 0)
+++ APPS/Halux/common/event/BatchGeslotenEvent.cls.xml (revision 2731)
@@ -0,0 +1,24 @@
+
+
+
+serial
+1
+TECH.PubSub.Event
+0
+
+
+Data:BatchGeslotenData
+1
+1
+%Status
+
+
+
+
+%Library.CacheSerialState
+
+
+
Index: APPS/Halux/common/event/BatchGeslotenData.cls.xml
===================================================================
diff -u
--- APPS/Halux/common/event/BatchGeslotenData.cls.xml (revision 0)
+++ APPS/Halux/common/event/BatchGeslotenData.cls.xml (revision 2731)
@@ -0,0 +1,39 @@
+
+
+
+serial
+1
+TECH.PubSub.EventData
+0
+
+
+%Integer
+
+
+
+BatchID:%Integer
+1
+1
+%Status
+
+
+
+
+%Library.CacheSerialState
+BatchGeslotenDataState
+
+listnode
+"APPS.Halux.common.event.BatchGeslotenData"
+
+BatchId
+
+
+BatchID
+
+
+
+
+
Index: BL/PPS/TBX/LeanBatch.cls.xml
===================================================================
diff -u -r2588 -r2731
--- BL/PPS/TBX/LeanBatch.cls.xml (.../LeanBatch.cls.xml) (revision 2588)
+++ BL/PPS/TBX/LeanBatch.cls.xml (.../LeanBatch.cls.xml) (revision 2731)
@@ -234,6 +234,9 @@
. Set Text=Text_"~Aantal lege vakken : "_$G(QtyEmpty)
. Set:$G(QtyLade)+$G(QtyEmpty) Text=Text_"~Bezettingsgraad : "_$J($G(QtyLade)/($G(QtyLade)+$G(QtyEmpty))*100,0,2)_"%"
. Set Text=Text_"~Aantal VHossen : "_$G(QtyVHoss)
+ . Set BatchService=##class(APPS.Halux.common.BatchService).%New()
+ . Set Batch=BatchService.GeefBatch(BatchNr)
+ . Do Batch.RaiseBatchGeslotenEvent()
If (Opties'="D") Do
. Set blDocsV1=##class(BL.PPS.TBX.DocsV1).%New()
. Do blDocsV1.Init(BatchID,"A")
@@ -267,6 +270,9 @@
If 'bl.ExistSequence() Do
. Do bl.BldLeanV1Sequence(.QtyLade) ; start with optimisation
. Set Text=Text_"~Aantal laden : "_$G(QtyLade)
+ . Set BatchService=##class(APPS.Halux.common.BatchService).%New()
+ . Set Batch=BatchService.GeefBatch(BatchNr)
+ . Do Batch.RaiseBatchGeslotenEvent()
;
Set bl=##class(BL.PPS.TBX.DocsV1).%New()
Do bl.Init(BatchID,ProdGrpBatch)
Index: APPS/Halux/PPS/TBXZaag/impl/VerwijderBatch.cls.xml
===================================================================
diff -u
--- APPS/Halux/PPS/TBXZaag/impl/VerwijderBatch.cls.xml (revision 0)
+++ APPS/Halux/PPS/TBXZaag/impl/VerwijderBatch.cls.xml (revision 2731)
@@ -0,0 +1,60 @@
+
+
+
+TECH.Error
+1
+%RegisteredObject
+0
+
+
+1
+VerwijderEvent:APPS.Halux.common.event.BatchRemovedEvent
+
+
+
+
+1
+HergeopendEvent:APPS.Halux.common.event.BatchHergeopendEvent
+
+
+
+
+
+TO BE DEPLOYED - ONCE
+1
+
+
+
+
+
+de Zaagbatches kunnen opgesplits worden in meerdere subatches voor de zaag
+1
+BatchID
+
+
+
+
Index: zTryout/PV/TBXZaag/Test.cls.xml
===================================================================
diff -u -r2686 -r2731
--- zTryout/PV/TBXZaag/Test.cls.xml (.../Test.cls.xml) (revision 2686)
+++ zTryout/PV/TBXZaag/Test.cls.xml (.../Test.cls.xml) (revision 2731)
@@ -32,8 +32,8 @@
Set BatchID=$LI(IDs,I)
;Do ..Sequence(BatchID)
Set bl=##class(APPS.Halux.PPS.TBXZaag.impl.Builder).%New(BatchID)
- Do bl.RemoveBatches()
- Do bl.BuildBatchesFromQueue()
+ Do ##class(APPS.Halux.PPS.TBXZaag.impl.VerwijderBatch).VerwijderBatches(BatchID)
+ Do bl.MaakZaagOpdrachten()
}
Set rs=##class(%ResultSet).%New("APPS.Halux.PPS.TBXZaag.impl.LijstHelper:qActieveBatchLijst")
@@ -60,9 +60,8 @@
Set Cnt=SeqService.HeeftSequentie(BatchID)
Do ..Sequence(BatchID)
w "Build batch ",BatchID," ",Cnt,!
- Set bl=##class(APPS.Halux.PPS.TBXZaag.impl.Builder).%New(BatchID)
- Do bl.RemoveBatches()
- Do bl.BuildBatchesFromQueue()
+ Do Batch.RaiseBatchHergeopendEvent()
+ Do Batch.RaiseBatchGeslotenEvent()
}
Set rs=##class(%ResultSet).%New("APPS.Halux.PPS.TBXZaag.impl.LijstHelper:qActieveBatchLijst")
Set sc=rs.Execute() w $$ParseStatus^vhLib(sc)
Index: APPS/Halux/common/event/BatchHergeopendEvent.cls.xml
===================================================================
diff -u
--- APPS/Halux/common/event/BatchHergeopendEvent.cls.xml (revision 0)
+++ APPS/Halux/common/event/BatchHergeopendEvent.cls.xml (revision 2731)
@@ -0,0 +1,24 @@
+
+
+
+serial
+1
+TECH.PubSub.Event
+0
+
+
+Data:BatchHergeopendData
+1
+1
+%Status
+
+
+
+
+%Library.CacheSerialState
+
+
+
Index: APPS/Halux/common/SequentieService.cls.xml
===================================================================
diff -u -r2686 -r2731
--- APPS/Halux/common/SequentieService.cls.xml (.../SequentieService.cls.xml) (revision 2686)
+++ APPS/Halux/common/SequentieService.cls.xml (.../SequentieService.cls.xml) (revision 2731)
@@ -27,12 +27,22 @@
If (Batch.GeefProductieGroep()=##class(APPS.Halux.common.enu.ProductieGroep).Kast()) || (Batch.GeefProductieGroep()=##class(APPS.Halux.common.enu.ProductieGroep).Plus())
{
Do blSequencer.BldVHossSequence(.QtyLade, .QtyEmpty, .QtyVHoss, .SkippedTekst)
+
}
Else
{
Do blSequencer.BldLeanV1Sequence(.QtyLade)
}
]]>
+
+
+Batch:APPS.Halux.common.impl.BatchImpl
+
+
FishEye: Tag 2731 refers to a dead (removed) revision in file `APPS/Halux/PPS/TBXZaag/impl/Builder.cls.xml'.
FishEye: No comparison available. Pass `N' to diff?
Index: APPS/Halux/common/event/BatchHergeopendData.cls.xml
===================================================================
diff -u
--- APPS/Halux/common/event/BatchHergeopendData.cls.xml (revision 0)
+++ APPS/Halux/common/event/BatchHergeopendData.cls.xml (revision 2731)
@@ -0,0 +1,36 @@
+
+
+
+serial
+1
+TECH.PubSub.EventData
+0
+
+
+%Integer
+
+
+
+BatchID:%Integer
+1
+1
+%Status
+
+
+
+
+%Library.CacheSerialState
+BatchHergeopendDataState
+
+listnode
+"APPS.Halux.common.event.BatchHergeopendData"
+
+BatchID
+
+
+
+
+
Index: APPS/Halux/common/Batch.cls.xml
===================================================================
diff -u -r2724 -r2731
--- APPS/Halux/common/Batch.cls.xml (.../Batch.cls.xml) (revision 2724)
+++ APPS/Halux/common/Batch.cls.xml (.../Batch.cls.xml) (revision 2731)
@@ -91,6 +91,22 @@
]]>
+
+
+
+
+
+
+
+
1
1
Index: APPS/Halux/PPS/TBXZaag/impl/EtiketHelper.cls.xml
===================================================================
diff -u -r2575 -r2731
--- APPS/Halux/PPS/TBXZaag/impl/EtiketHelper.cls.xml (.../EtiketHelper.cls.xml) (revision 2575)
+++ APPS/Halux/PPS/TBXZaag/impl/EtiketHelper.cls.xml (.../EtiketHelper.cls.xml) (revision 2731)
@@ -28,7 +28,7 @@
Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
Set Product=ProductAPI.GeefProduct(ZaagOpdracht.Product.%Id())
Set SequenceNr=ZaagOpdracht.Queue.Sequence
- If Product.IsSpoelbakLade()
+ If Product.IsSpoelbakLade()
{
Do blPrint.EtikettenSpoelbak(SequenceNr, SequenceNr)
}
Index: CHUI/PPS/TBX/LeanBatch.cls.xml
===================================================================
diff -u -r2588 -r2731
--- CHUI/PPS/TBX/LeanBatch.cls.xml (.../LeanBatch.cls.xml) (revision 2588)
+++ CHUI/PPS/TBX/LeanBatch.cls.xml (.../LeanBatch.cls.xml) (revision 2731)
@@ -827,9 +827,15 @@
Verwijderen van een sequence
BatchNr
Index: DOM/PM/TBXProduct/impl/TBXLadeImpl.cls.xml
===================================================================
diff -u -r2691 -r2731
--- DOM/PM/TBXProduct/impl/TBXLadeImpl.cls.xml (.../TBXLadeImpl.cls.xml) (revision 2691)
+++ DOM/PM/TBXProduct/impl/TBXLadeImpl.cls.xml (.../TBXLadeImpl.cls.xml) (revision 2731)
@@ -203,7 +203,7 @@
{
Set InTeKorten=1
}
- Else
+ Else ; ook een reeds gezaagde bodem kan ingekort worden
{
Set InTeKorten=Bodem.GeefBreedteVanLade()=..GeefInbouwBreedte()
}
Index: PV TBX Zaag.prj.xml
===================================================================
diff -u -r2686 -r2731
--- PV TBX Zaag.prj.xml (.../PV TBX Zaag.prj.xml) (revision 2686)
+++ PV TBX Zaag.prj.xml (.../PV TBX Zaag.prj.xml) (revision 2731)
@@ -1,6 +1,6 @@
-
+
@@ -21,19 +21,30 @@
+
+
+
+
+
+
+
+
+
+
+