Datazooi. Toegevoegd en gecontroleerd met verslag

2 files changed, 246 insertions, 232 deletions

diff --git a/Woflan/PartyParty/Hoofdproces.scr b/Woflan/PartyParty/Hoofdproces.scr
index 964d8d3..4ea40ef 100644
--- a/Woflan/PartyParty/Hoofdproces.scr
+++ b/Woflan/PartyParty/Hoofdproces.scr
@@ -2,7 +2,7 @@
 **

 **   COVC scriptfile: D:\My Documents\Protos\Classic\Woflan\PartyParty\Hoofdproces.scr

 **   Generated by Protos Exspect generator version 3.0.1

-**   Generated at: Fri Apr 11 16:11:47 2008

+**   Generated at: Mon Apr 14 21:53:16 2008

 **

 */

 declare flow Hoofdproces

@@ -99,8 +99,31 @@ declare condition Paid(990.0,870.0)
 end condition

 ;

 

+    declare activity Inspect_Order (60.0,855.0)

+//<FONT face=Arial size=2></FONT>

+memo "Inspect Order"ENG

+        input

+            Complete

+

+        output

+                Process_Goods

+                Goods_Ready

+

+        process

+            "res_ar Warehouse_Employee 1" analysis

+            "res_usage costs 2.000000e0" analysis

+            "abs_frequ 1.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

+            "priority expression 1.000000e0" analysis

+            "xor-split" analysis

+            "and-join" analysis

+

+access "Warehouse_Employee"

+    priority

+        0

+    end activity

     declare activity Pick_Order (60.0,600.0)

-//<FONT face="Arial" size=2></FONT>

+//<FONT face=Arial size=2></FONT>

 memo "Pick Order"ENG

         input

             Process_Goods

@@ -111,9 +134,9 @@ memo "Pick Order"ENG
 

         process

             "res_ar Warehouse_Employee 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_usage costs 5.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 4.000000e1 5.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "xor-split" analysis

             "and-join" analysis

@@ -122,26 +145,48 @@ access "Warehouse_Employee"
     priority

         0

     end activity

-    declare activity Inspect_Order (60.0,855.0)

-//<FONT face="Arial" size=2></FONT>

-memo "Inspect Order"ENG

+    declare activity Send_Fine (165.0,1950.0)

+//<FONT face=Arial size=2></FONT>

+memo "Send Fine"ENG

         input

-            Complete

+            Goods_Not_Ok

 

         output

-                Process_Goods

-                Goods_Ready

+                Fine_Send

 

         process

-            "res_ar Warehouse_Employee 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_ar Administrative_Employee 1" analysis

+            "res_usage costs 2.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

+            "priority expression 1.000000e0" analysis

+            "and-split" analysis

+            "and-join" analysis

+

+access "Administrative_Employee"

+    priority

+        0

+    end activity

+    declare activity Fine_Time_Out (165.0,2115.0)

+//<FONT face=Arial size=2></FONT>

+memo "Fine Time Out"ENG

+        input

+            Fine_Send

+

+        output

+                Goods_Not_Ok

+                Fine_Never_Paid

+

+        process

+            "res_ar Administrative_Manager 1" analysis

+            "res_usage costs 2.000000e0" analysis

+            "abs_frequ 1.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "xor-split" analysis

             "and-join" analysis

 

-access "Warehouse_Employee"

+access "Administrative_Manager"

     priority

         0

     end activity

@@ -156,9 +201,9 @@ memo "Pick Up Goods"ENG
 

         process

             "res_ar Chauffeur 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_usage costs 5.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 4.000000e1 5.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "and-split" analysis

             "and-join" analysis

@@ -168,7 +213,7 @@ access "Chauffeur"
         0

     end activity

     declare activity AND_Split_2 (165.0,405.0)

-//

+//<FONT face=Arial size=2></FONT>

 memo "AND-Split 2"ENG

         input

             Process_Order

@@ -178,6 +223,7 @@ memo "AND-Split 2"ENG
                 Process_Logistics

 

         process

+            "res_ar System 1" analysis

             "res_usage costs 0.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

             "duration expression 0.000000e0" analysis

@@ -185,6 +231,7 @@ memo "AND-Split 2"ENG
             "and-split" analysis

             "and-join" analysis

 

+access "System"

     priority

         0

     end activity

@@ -199,9 +246,9 @@ memo "Plan & Confirm Logistics"ENG
 

         process

             "res_ar Logistics_Manager 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_usage costs 2.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "and-split" analysis

             "and-join" analysis

@@ -220,20 +267,20 @@ memo "Pay Logistics 2"ENG
                 Logistics_Paid

 

         process

-            "res_ar Administration_Manager 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_ar Administrative_Manager 1" analysis

+            "res_usage costs 2.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "and-split" analysis

             "and-join" analysis

 

-access "Administration_Manager"

+access "Administrative_Manager"

     priority

         0

     end activity

     declare activity Deliver_Goods (165.0,1470.0)

-//<FONT face="Arial" size=2></FONT>

+//<FONT face=Arial size=2></FONT>

 memo "Deliver Goods"ENG

         input

             Ready_for_Party

@@ -243,9 +290,9 @@ memo "Deliver Goods"ENG
 

         process

             "res_ar Chauffeur 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_usage costs 5.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 4.000000e1 5.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "and-split" analysis

             "and-join" analysis

@@ -266,9 +313,9 @@ memo "Inspect Goods"ENG
 

         process

             "res_ar Warehouse_Manager 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_usage costs 2.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "xor-split" analysis

             "and-join" analysis

@@ -277,48 +324,25 @@ access "Warehouse_Manager"
     priority

         0

     end activity

-    declare activity Send_Fine (165.0,1950.0)

-//<FONT face="Arial" size=2></FONT>

-memo "Send Fine"ENG

-        input

-            Goods_Not_Ok

-

-        output

-                Fine_Send

-

-        process

-            "res_ar Administration_Employee 1" analysis

-            "res_usage costs 0.000000e0" analysis

-            "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

-            "priority expression 1.000000e0" analysis

-            "and-split" analysis

-            "and-join" analysis

-

-access "Administration_Employee"

-    priority

-        0

-    end activity

-    declare activity Fine_Time_Out (165.0,2115.0)

+    declare activity Order_Goods (240.0,735.0)

 //<FONT face=Arial size=2></FONT>

-memo "Fine Time Out"ENG

+memo "Order Goods"ENG

         input

-            Fine_Send

+            Not_Complete

 

         output

-                Goods_Not_Ok

-                Fine_Never_Paid

+                Goods_Ordered

 

         process

-            "res_ar Administration_Manager 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_ar Warehouse_Manager 1" analysis

+            "res_usage costs 2.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

             "priority expression 1.000000e0" analysis

-            "xor-split" analysis

+            "and-split" analysis

             "and-join" analysis

 

-access "Administration_Manager"

+access "Warehouse_Manager"

     priority

         0

     end activity

@@ -345,30 +369,8 @@ access "System"
     priority

         0

     end activity

-    declare activity Order_Goods (240.0,735.0)

-//<FONT face="Arial" size=2></FONT>

-memo "Order Goods"ENG

-        input

-            Not_Complete

-

-        output

-                Goods_Ordered

-

-        process

-            "res_ar Warehouse_Manager 1" analysis

-            "res_usage costs 0.000000e0" analysis

-            "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

-            "priority expression 1.000000e0" analysis

-            "and-split" analysis

-            "and-join" analysis

-

-access "Warehouse_Manager"

-    priority

-        0

-    end activity

     declare activity Receive_Goods (255.0,555.0)

-//<FONT face="Arial" size=2></FONT>

+//<FONT face=Arial size=2></FONT>

 memo "Receive Goods"ENG

         input

             Goods_Ordered

@@ -377,20 +379,20 @@ memo "Receive Goods"ENG
                 Process_Goods

 

         process

-            "res_ar Administration_Employee 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_ar Administrative_Employee 1" analysis

+            "res_usage costs 2.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "and-split" analysis

             "and-join" analysis

 

-access "Administration_Employee"

+access "Administrative_Employee"

     priority

         0

     end activity

     declare activity And_Join_1 (360.0,1320.0)

-//<FONT face="Arial" size=2></FONT>

+//<FONT face=Arial size=2></FONT>

 memo "And-Join 1"ENG

         input

             Order_Ready

@@ -400,6 +402,7 @@ memo "And-Join 1"ENG
                 Ready_for_Party

 

         process

+            "res_ar System 1" analysis

             "res_usage costs 0.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

             "duration expression 0.000000e0" analysis

@@ -407,11 +410,12 @@ memo "And-Join 1"ENG
             "and-split" analysis

             "and-join" analysis

 

+access "System"

     priority

         0

     end activity

     declare activity Receive_Fine (375.0,2025.0)

-//<FONT face="Arial" size=2></FONT>

+//<FONT face=Arial size=2></FONT>

 memo "Receive Fine"ENG

         input

             Fine_Send

@@ -420,20 +424,20 @@ memo "Receive Fine"ENG
                 End

 

         process

-            "res_ar Administration_Manager 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_ar Administrative_Manager 1" analysis

+            "res_usage costs 2.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "and-split" analysis

             "and-join" analysis

 

-access "Administration_Manager"

+access "Administrative_Manager"

     priority

         0

     end activity

     declare activity Confirm_Logistics_1 (435.0,780.0)

-//<FONT face="Arial" size=2></FONT>

+//<FONT face=Arial size=2></FONT>

 memo "Confirm Logistics 1"ENG

         input

             Logistics_Planned

@@ -445,9 +449,9 @@ memo "Confirm Logistics 1"ENG
 

         process

             "res_ar Logistics_Manager 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_usage costs 2.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "and-split" analysis

             "and-join" analysis

@@ -457,7 +461,7 @@ access "Logistics_Manager"
         0

     end activity

     declare activity Plan_Logistics_1 (435.0,585.0)

-//<FONT face="Arial" size=2></FONT>

+//<FONT face=Arial size=2></FONT>

 memo "Plan Logistics 1"ENG

         input

             Process_Logistics

@@ -467,9 +471,9 @@ memo "Plan Logistics 1"ENG
 

         process

             "res_ar Logistics_Manager 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_usage costs 2.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "and-split" analysis

             "and-join" analysis

@@ -479,7 +483,7 @@ access "Logistics_Manager"
         0

     end activity

     declare activity Pay_Logistics (435.0,930.0)

-//<FONT face="Arial" size=2></FONT>

+//<FONT face=Arial size=2></FONT>

 memo "Pay Logistics"ENG

         input

             Logistics_Confirmed

@@ -488,18 +492,20 @@ memo "Pay Logistics"ENG
                 Logistics_Ready

 

         process

-            "res_usage costs 0.000000e0" analysis

+            "res_ar Administrative_Manager 1" analysis

+            "res_usage costs 2.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "and-split" analysis

             "and-join" analysis

 

+access "Administrative_Manager"

     priority

         0

     end activity

     declare activity Cancel_Party (465.0,1470.0)

-//<FONT face="Arial" size=2></FONT>

+//<FONT face=Arial size=2></FONT>

 memo "Cancel Party"ENG

         input

             Ready_for_Party

@@ -521,7 +527,7 @@ access "Manager"
         0

     end activity

     declare activity Paid_By_Lawsuit (510.0,2175.0)

-//<FONT face="Arial" size=2></FONT>

+//<FONT face=Arial size=2></FONT>

 memo "Paid By Lawsuit"ENG

         input

             Fine_Never_Paid

@@ -530,20 +536,20 @@ memo "Paid By Lawsuit"ENG
                 End

 

         process

-            "res_ar Administration_Manager 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_ar Administrative_Manager 1" analysis

+            "res_usage costs 2.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "and-split" analysis

             "and-join" analysis

 

-access "Administration_Manager"

+access "Administrative_Manager"

     priority

         0

     end activity

     declare activity Order (555.0,120.0)

-//<FONT face="Arial" size=2></FONT>

+//<FONT face=Arial size=2></FONT>

 memo "Order"ENG

         input

             Start

@@ -553,9 +559,9 @@ memo "Order"ENG
 

         process

             "res_ar Store_Employee 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_usage costs 2.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "and-split" analysis

             "and-join" analysis

@@ -575,6 +581,7 @@ memo "AND-Split 1"ENG
                 Process_Order

 

         process

+            "res_ar System 1" analysis

             "res_usage costs 0.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

             "duration expression 0.000000e0" analysis

@@ -582,6 +589,7 @@ memo "AND-Split 1"ENG
             "and-split" analysis

             "and-join" analysis

 

+access "System"

     priority

         0

     end activity

@@ -597,15 +605,16 @@ memo "Start Pocess"ENG
             "gen_iatime nexp 2.500000e0" analysis

             "gen_nrbatches 1000000" analysis

             "gen_batchsize 1" analysis

-            "res_available Warehouse_Employee 1" analysis

-            "res_available Warehouse_Manager 1" analysis

-            "res_available Store_Employee 1" analysis

-            "res_available Administration_Employee 1" analysis

-            "res_available Administration_Manager 1" analysis

-            "res_available Chauffeur 1" analysis

-            "res_available Logistics_Manager 1" analysis

+            "res_available Warehouse_Employee 15" analysis

+            "res_available Warehouse_Manager 2" analysis

+            "res_available Store_Employee 3" analysis

+            "res_available Administrative_Employee 2" analysis

+            "res_available Administrative_Manager 1" analysis

+            "res_available Chauffeur 5" analysis

+            "res_available Logistics_Manager 2" analysis

             "res_available Manager 1" analysis

-            "res_available System 1" analysis

+            "res_available System 10" analysis

+            "res_ar System 1" analysis

             "res_usage costs 0.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

             "duration expression 0.000000e0" analysis

@@ -613,56 +622,59 @@ memo "Start Pocess"ENG
             "and-split" analysis

             "and-join" analysis

 

+access "System"

     priority

         0

     end activity

-    declare activity Cancel_Order (690.0,990.0)

-//<FONT face="Arial" size=2></FONT>

-memo "Cancel Order"ENG

+    declare activity Payment_Timeout (690.0,675.0)

+//<FONT face=Arial size=2></FONT>

+memo "Payment Timeout"ENG

         input

-            Goods_Ready

-            Logistics_Planned

-            Not_Paid

+            Bill_Send

 

         output

-                Order_Cancelled

+                Bill_Created

+                Not_Paid

 

         process

-            "res_ar Manager 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_ar System 1" analysis

+            "res_usage costs 2.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

             "priority expression 1.000000e0" analysis

-            "and-split" analysis

+            "xor-split" analysis

             "and-join" analysis

 

-access "Manager"

+access "System"

     priority

         0

     end activity

-    declare activity Payment_Timeout (705.0,660.0)

+    declare activity Cancel_Order (690.0,990.0)

 //<FONT face=Arial size=2></FONT>

-memo "Payment Timeout"ENG

+memo "Cancel Order"ENG

         input

-            Bill_Send

+            Goods_Ready

+            Logistics_Planned

+            Not_Paid

 

         output

-                Bill_Created

-                Not_Paid

+                Order_Cancelled

 

         process

-            "res_usage costs 0.000000e0" analysis

+            "res_ar Manager 1" analysis

+            "res_usage costs 2.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

             "priority expression 1.000000e0" analysis

-            "xor-split" analysis

+            "and-split" analysis

             "and-join" analysis

 

+access "Manager"

     priority

         0

     end activity

     declare activity Refund (735.0,1590.0)

-//<FONT face="Arial" size=2></FONT>

+//<FONT face=Arial size=2></FONT>

 memo "Refund"ENG

         input

             Party_Cancelled

@@ -671,63 +683,63 @@ memo "Refund"ENG
                 End

 

         process

-            "res_ar Administration_Manager 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_ar Administrative_Manager 1" analysis

+            "res_usage costs 2.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "and-split" analysis

             "and-join" analysis

 

-access "Administration_Manager"

+access "Administrative_Manager"

     priority

         0

     end activity

-    declare activity Send_Bill (780.0,570.0)

-//<FONT face="Arial" size=2></FONT>

-memo "Send Bill"ENG

+    declare activity Create_Bill (780.0,405.0)

+//<FONT face=Arial size=2></FONT>

+memo "Create Bill"ENG

         input

-            Bill_Created

+            Process_Payment

 

         output

-                Bill_Send

+                Bill_Created

 

         process

-            "res_ar Administration_Employee 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_ar Administrative_Employee 1" analysis

+            "res_usage costs 2.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "and-split" analysis

             "and-join" analysis

 

-access "Administration_Employee"

+access "Administrative_Employee"

     priority

         0

     end activity

-    declare activity Create_Bill (780.0,405.0)

-//<FONT face="Arial" size=2></FONT>

-memo "Create Bill"ENG

+    declare activity Send_Bill (780.0,570.0)

+//<FONT face=Arial size=2></FONT>

+memo "Send Bill"ENG

         input

-            Process_Payment

+            Bill_Created

 

         output

-                Bill_Created

+                Bill_Send

 

         process

-            "res_ar Administration_Employee 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_ar Administrative_Employee 1" analysis

+            "res_usage costs 2.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "and-split" analysis

             "and-join" analysis

 

-access "Administration_Employee"

+access "Administrative_Employee"

     priority

         0

     end activity

-    declare activity Payment_Received (900.0,675.0)

+    declare activity Payment_Received (915.0,675.0)

 //<FONT face=Arial size=2></FONT>

 memo "Payment Received"ENG

         input

@@ -737,60 +749,62 @@ memo "Payment Received"ENG
                 Paid

 

         process

-            "res_ar Administration_Manager 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_ar Administrative_Manager 1" analysis

+            "res_usage costs 2.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "and-split" analysis

             "and-join" analysis

 

-access "Administration_Manager"

+access "Administrative_Manager"

     priority

         0

     end activity

-    declare activity Put_Back_Goods (960.0,1170.0)

-//<FONT face="Arial" size=2></FONT>

-memo "Put Back Goods"ENG

+    declare activity End_Process (960.0,2070.0)

+//<FONT face=Arial size=2></FONT>

+memo "End Process"ENG

         input

-            Order_Cancelled

+            End

 

-        output

-                End

 

         process

-            "res_ar Warehouse_Employee 1" analysis

+            "res_ar System 1" analysis

             "res_usage costs 0.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

             "duration expression 0.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "and-split" analysis

-            "and-join" analysis

+            "xor-join" analysis

 

-access "Warehouse_Employee"

+access "System"

     priority

         0

     end activity

-    declare activity End_Process (960.0,2070.0)

+    declare activity Put_Back_Goods (960.0,1170.0)

 //<FONT face=Arial size=2></FONT>

-memo "End Process"ENG

+memo "Put Back Goods"ENG

         input

-            End

+            Order_Cancelled

 

+        output

+                End

 

         process

-            "res_usage costs 0.000000e0" analysis

+            "res_ar Warehouse_Employee 1" analysis

+            "res_usage costs 5.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 4.000000e1 5.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "and-split" analysis

-            "xor-join" analysis

+            "and-join" analysis

 

+access "Warehouse_Employee"

     priority

         0

     end activity

     declare activity Receive_Cash (975.0,420.0)

-//<FONT face="Arial" size=2></FONT>

+//<FONT face=Arial size=2></FONT>

 memo "Receive Cash"ENG

         input

             Process_Payment

@@ -800,9 +814,9 @@ memo "Receive Cash"ENG
 

         process

             "res_ar Store_Employee 1" analysis

-            "res_usage costs 0.000000e0" analysis

+            "res_usage costs 2.000000e0" analysis

             "abs_frequ 1.000000e0" analysis

-            "duration expression 0.000000e0" analysis

+            "duration normal 5.000000e0 2.000000e0" analysis

             "priority expression 1.000000e0" analysis

             "and-split" analysis

             "and-join" analysis

diff --git a/Woflan/PartyParty/Hoofdproces.tpn b/Woflan/PartyParty/Hoofdproces.tpn
index 26fe91d..9e54da1 100644
--- a/Woflan/PartyParty/Hoofdproces.tpn
+++ b/Woflan/PartyParty/Hoofdproces.tpn
@@ -23,42 +23,48 @@ trans "Receive_Cash"
     out "Paid"

 ;

 -- end activity: Receive_Cash

--- declare activity: End_Process

-trans "End_Process"

-    in "End"

-    out "end flow"

-;

--- end activity: End_Process

 -- declare activity: Put_Back_Goods

 trans "Put_Back_Goods"

     in "Order_Cancelled"

     out "End"

 ;

 -- end activity: Put_Back_Goods

+-- declare activity: End_Process

+trans "End_Process"

+    in "End"

+    out "end flow"

+;

+-- end activity: End_Process

 -- declare activity: Payment_Received

 trans "Payment_Received"

     in "Bill_Send"

     out "Paid"

 ;

 -- end activity: Payment_Received

--- declare activity: Create_Bill

-trans "Create_Bill"

-    in "Process_Payment"

-    out "Bill_Created"

-;

--- end activity: Create_Bill

 -- declare activity: Send_Bill

 trans "Send_Bill"

     in "Bill_Created"

     out "Bill_Send"

 ;

 -- end activity: Send_Bill

+-- declare activity: Create_Bill

+trans "Create_Bill"

+    in "Process_Payment"

+    out "Bill_Created"

+;

+-- end activity: Create_Bill

 -- declare activity: Refund

 trans "Refund"

     in "Party_Cancelled"

     out "End"

 ;

 -- end activity: Refund

+-- declare activity: Cancel_Order

+trans "Cancel_Order"

+    in "Not_Paid" "Logistics_Planned" "Goods_Ready"

+    out "Order_Cancelled"

+;

+-- end activity: Cancel_Order

 -- declare activity: Payment_Timeout

 trans "Payment_Timeout+Not_Paid"

     in "Bill_Send"

@@ -69,12 +75,6 @@ trans "Payment_Timeout+Bill_Created"
     out "Bill_Created"

 ;

 -- end activity: Payment_Timeout

--- declare activity: Cancel_Order

-trans "Cancel_Order"

-    in "Not_Paid" "Logistics_Planned" "Goods_Ready"

-    out "Order_Cancelled"

-;

--- end activity: Cancel_Order

 -- declare activity: Start_Pocess

 trans "Start_Pocess"

     in "start flow"

@@ -141,34 +141,18 @@ trans "Receive_Goods"
     out "Process_Goods"

 ;

 -- end activity: Receive_Goods

--- declare activity: Order_Goods

-trans "Order_Goods"

-    in "Not_Complete"

-    out "Goods_Ordered"

-;

--- end activity: Order_Goods

 -- declare activity: And_Join_2

 trans "And_Join_2"

     in "Logistics_Ready" "Goods_Ready"

     out "Order_Ready"

 ;

 -- end activity: And_Join_2

--- declare activity: Fine_Time_Out

-trans "Fine_Time_Out+Fine_Never_Paid"

-    in "Fine_Send"

-    out "Fine_Never_Paid"

-;

-trans "Fine_Time_Out+Goods_Not_Ok"

-    in "Fine_Send"

-    out "Goods_Not_Ok"

-;

--- end activity: Fine_Time_Out

--- declare activity: Send_Fine

-trans "Send_Fine"

-    in "Goods_Not_Ok"

-    out "Fine_Send"

+-- declare activity: Order_Goods

+trans "Order_Goods"

+    in "Not_Complete"

+    out "Goods_Ordered"

 ;

--- end activity: Send_Fine

+-- end activity: Order_Goods

 -- declare activity: Inspect_Goods

 trans "Inspect_Goods+Goods_Not_Ok"

     in "Goods_Back"

@@ -209,16 +193,22 @@ trans "Pick_Up_Goods"
     out "Goods_Back"

 ;

 -- end activity: Pick_Up_Goods

--- declare activity: Inspect_Order

-trans "Inspect_Order+Goods_Ready"

-    in "Complete"

-    out "Goods_Ready"

+-- declare activity: Fine_Time_Out

+trans "Fine_Time_Out+Fine_Never_Paid"

+    in "Fine_Send"

+    out "Fine_Never_Paid"

 ;

-trans "Inspect_Order+Process_Goods"

-    in "Complete"

-    out "Process_Goods"

+trans "Fine_Time_Out+Goods_Not_Ok"

+    in "Fine_Send"

+    out "Goods_Not_Ok"

 ;

--- end activity: Inspect_Order

+-- end activity: Fine_Time_Out

+-- declare activity: Send_Fine

+trans "Send_Fine"

+    in "Goods_Not_Ok"

+    out "Fine_Send"

+;

+-- end activity: Send_Fine

 -- declare activity: Pick_Order

 trans "Pick_Order+Not_Complete"

     in "Process_Goods"

@@ -229,4 +219,14 @@ trans "Pick_Order+Complete"
     out "Complete"

 ;

 -- end activity: Pick_Order

+-- declare activity: Inspect_Order

+trans "Inspect_Order+Goods_Ready"

+    in "Complete"

+    out "Goods_Ready"

+;

+trans "Inspect_Order+Process_Goods"

+    in "Complete"

+    out "Process_Goods"

+;

+-- end activity: Inspect_Order

 -- end flow: Hoofdproces