Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Hugo Ricateau
erp5
Commits
8863d75c
Commit
8863d75c
authored
Nov 08, 2017
by
Cédric Le Ninivin
Committed by
Cédric Le Ninivin
Nov 16, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testMRP: Improve Documentation and categories naming
parent
e15c4fd6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
43 additions
and
29 deletions
+43
-29
product/ERP5/tests/testMRP.py
product/ERP5/tests/testMRP.py
+43
-29
No files found.
product/ERP5/tests/testMRP.py
View file @
8863d75c
...
@@ -114,11 +114,11 @@ class TestMRPMixin(TestBPMMixin):
...
@@ -114,11 +114,11 @@ class TestMRPMixin(TestBPMMixin):
self
.
createCategoriesInCategory
(
category_tool
.
quantity_unit
.
weight
,
[
'kg'
])
self
.
createCategoriesInCategory
(
category_tool
.
quantity_unit
.
weight
,
[
'kg'
])
self
.
createCategoriesInCategory
(
category_tool
.
trade_phase
,
[
'mrp'
,])
self
.
createCategoriesInCategory
(
category_tool
.
trade_phase
,
[
'mrp'
,])
self
.
createCategoriesInCategory
(
category_tool
.
trade_phase
.
mrp
,
self
.
createCategoriesInCategory
(
category_tool
.
trade_phase
.
mrp
,
(
'
p
'
+
str
(
i
)
for
i
in
xrange
(
2
)))
(
'
manufacturing_step_
'
+
str
(
i
)
for
i
in
xrange
(
2
)))
self
.
createCategoriesInCategory
(
category_tool
.
trade_phase
.
mrp
,
self
.
createCategoriesInCategory
(
category_tool
.
trade_phase
.
mrp
,
(
's'
+
str
(
i
)
for
i
in
xrange
(
1
)))
(
's
ourcing_
'
+
str
(
i
)
for
i
in
xrange
(
1
)))
self
.
createCategoriesInCategory
(
category_tool
.
trade_state
,
self
.
createCategoriesInCategory
(
category_tool
.
trade_state
,
(
's'
+
str
(
i
)
for
i
in
xrange
(
6
)))
(
's
tep_
'
+
str
(
i
)
for
i
in
xrange
(
6
)))
def
createDefaultOrder
(
self
,
business_process
,
transformation
=
None
):
def
createDefaultOrder
(
self
,
business_process
,
transformation
=
None
):
if
transformation
is
None
:
if
transformation
is
None
:
...
@@ -142,36 +142,44 @@ class TestMRPMixin(TestBPMMixin):
...
@@ -142,36 +142,44 @@ class TestMRPMixin(TestBPMMixin):
resource_value
=
self
.
consumed_resource_1
,
resource_value
=
self
.
consumed_resource_1
,
quantity
=
3
,
quantity
=
3
,
quantity_unit_list
=
[
'weight/kg'
],
quantity_unit_list
=
[
'weight/kg'
],
trade_phase
=
'mrp/
p
0'
)
trade_phase
=
'mrp/
manufacturing_step_
0'
)
self
.
consumed_resource_2
=
resource
()
self
.
consumed_resource_2
=
resource
()
self
.
createTransformedResource
(
transformation
=
transformation
,
self
.
createTransformedResource
(
transformation
=
transformation
,
resource_value
=
self
.
consumed_resource_2
,
resource_value
=
self
.
consumed_resource_2
,
quantity
=
1
,
quantity
=
1
,
quantity_unit_list
=
[
'weight/kg'
],
quantity_unit_list
=
[
'weight/kg'
],
trade_phase
=
'mrp/
p
0'
)
trade_phase
=
'mrp/
manufacturing_step_
0'
)
self
.
consumed_resource_3
=
resource
()
self
.
consumed_resource_3
=
resource
()
self
.
createTransformedResource
(
transformation
=
transformation
,
self
.
createTransformedResource
(
transformation
=
transformation
,
resource_value
=
self
.
consumed_resource_3
,
resource_value
=
self
.
consumed_resource_3
,
quantity
=
4
,
quantity
=
4
,
quantity_unit_list
=
[
'weight/kg'
],
quantity_unit_list
=
[
'weight/kg'
],
trade_phase
=
'mrp/
p
1'
)
trade_phase
=
'mrp/
manufacturing_step_
1'
)
self
.
consumed_resource_4
=
resource
()
self
.
consumed_resource_4
=
resource
()
self
.
createTransformedResource
(
transformation
=
transformation
,
self
.
createTransformedResource
(
transformation
=
transformation
,
resource_value
=
self
.
consumed_resource_4
,
resource_value
=
self
.
consumed_resource_4
,
quantity
=
1
,
quantity
=
1
,
quantity_unit_list
=
[
'weight/kg'
],
quantity_unit_list
=
[
'weight/kg'
],
trade_phase
=
'mrp/
p
1'
)
trade_phase
=
'mrp/
manufacturing_step_
1'
)
return
transformation
return
transformation
def
createBusinessProcess1
(
self
,
node_p0
):
def
createBusinessProcess1
(
self
,
node_p0
):
"""
"""
Terms
Terms
=====
=====
PPL : Production Packing List
ME : Manufacturing Execution
PO : Production Order
PO : Production Order
Used to Order the delivery of a final product from a workshop
PPL : Production Packing List
Production Packing List is used to deliver the final product
from the Workshop
MO : Manufacturing Order
MO : Manufacturing Order
Used to Order the manufacturing of a product. The Transformation defines
the list of products and services needed to manufacture the final product
ME : Manufacturing Execution
Oversees the Manufacturing Process on workshop, it is responsible for
the movement of product and services consumption
IPL : Internal Packing List
IPL : Internal Packing List
Used to moves parts inside the factory.
Context
Context
=======
=======
...
@@ -184,24 +192,28 @@ class TestMRPMixin(TestBPMMixin):
...
@@ -184,24 +192,28 @@ class TestMRPMixin(TestBPMMixin):
The Business process will proceed this way:
The Business process will proceed this way:
1/ Generate Production Order and confirm it
1/ Generate Production Order and confirm it
2/ Generate Manufacturing Order and confirm it
2/ Generate Manufacturing Order and confirm it
2/ Generate Manufacturing Execution
p
0 which generate a
2/ Generate Manufacturing Execution
manufacturing_step_
0 which generate a
the product with a variation to indicate it is a partial product.
the product with a variation to indicate it is a partial product.
The variation is trade_phase/mrp/
p
0. It takes place in workshop2
The variation is trade_phase/mrp/
manufacturing_step_
0. It takes place in workshop2
3/ Delivering the first Manufacturing Execution leads to the build
3/ Delivering the first Manufacturing Execution leads to the build
of a
Production
Packing List to move the delivered half built product
of a
Internal
Packing List to move the delivered half built product
from "workshop2" to "workshop" the next fabrication line.
from "workshop2" to "workshop" the next fabrication line.
4/ Delivering the PPL will build the second Manufacturing Execution p1
4/ Delivering the IPL will build the second Manufacturing Execution
which takes as input the variated expected product and resource 3 and 4.
manufacturing_step_1 which takes as input the variated expected product
and resource 3 and 4.
It takes place in "workshop" node
It takes place in "workshop" node
5/ Delivering p1 will build the last production packing List with source
5/ Delivering p1 will build the last production packing List with source
"workshop" and destination "destination"
"workshop" and destination "destination"
Business Process Schema
Business Process Schema
=======================
=======================
order
order p0 s0 p1 deliver
order
order manufacturing_step_0 sourcing_0
-------
S0 ----- S1 ---- S2 ---- S3 ---- S4 -------- S5
-------
step_0 ----- step_1 -------------------- step_2 -------- step_3 -->
PO
MO ME1 IPL ME2 P
PL
PO
MO ME1 I
PL
manufacturing_step_1 deliver
--> step_3 ------------------- step_4 -------- step_5
ME2 PPL
Simulation Tree
Simulation Tree
===============
===============
* PO / new_order_root_simulation_rule
* PO / new_order_root_simulation_rule
...
@@ -232,14 +244,14 @@ class TestMRPMixin(TestBPMMixin):
...
@@ -232,14 +244,14 @@ class TestMRPMixin(TestBPMMixin):
phase_list
=
[
phase_list
=
[
(
'default/order'
,
None
,
(
'confirmed'
,)),
(
'default/order'
,
None
,
(
'confirmed'
,)),
(
'manufacturing/order'
,
manufacturing_order_builder
,
(
'confirmed'
,)),
(
'manufacturing/order'
,
manufacturing_order_builder
,
(
'confirmed'
,)),
(
'mrp/
p
0'
,
manufacturing_execution_builder
,
completed
),
(
'mrp/
manufacturing_step_
0'
,
manufacturing_execution_builder
,
completed
),
(
'mrp/s0'
,
sourcing_builder
,
completed
),
(
'mrp/s
ourcing_
0'
,
sourcing_builder
,
completed
),
(
'mrp/
p
1'
,
manufacturing_execution_builder
,
completed
),
(
'mrp/
manufacturing_step_
1'
,
manufacturing_execution_builder
,
completed
),
(
'default/delivery'
,
production_packing_list_builder
,
completed
)
(
'default/delivery'
,
production_packing_list_builder
,
completed
)
]
]
predecessor
=
None
predecessor
=
None
for
i
,
(
phase
,
builder
,
completed
)
in
enumerate
(
phase_list
):
for
i
,
(
phase
,
builder
,
completed
)
in
enumerate
(
phase_list
):
successor
=
'trade_state/s'
+
str
(
i
)
successor
=
'trade_state/s
tep_
'
+
str
(
i
)
self
.
createBusinessLink
(
business_process
,
self
.
createBusinessLink
(
business_process
,
completed_state
=
completed
,
completed_state
=
completed
,
predecessor
=
predecessor
,
predecessor
=
predecessor
,
...
@@ -329,13 +341,15 @@ class TestMRPImplementation(TestMRPMixin):
...
@@ -329,13 +341,15 @@ class TestMRPImplementation(TestMRPMixin):
reference
,
sm
.
getIndustrialPhaseList
()))
reference
,
sm
.
getIndustrialPhaseList
()))
movement_list
.
sort
()
movement_list
.
sort
()
self
.
assertEqual
(
movement_list
,
sorted
((
self
.
assertEqual
(
movement_list
,
sorted
((
(
'mrp/p0'
,
-
10
,
None
,
[]),
(
'mrp/manufacturing_step_0'
,
-
10.0
,
None
,
[]),
(
'mrp/p0'
,
-
30
,
None
,
[]),
(
'mrp/manufacturing_step_0'
,
-
30.0
,
None
,
[]),
(
'mrp/p0'
,
10
,
'pr/mrp/p0'
,
[
'trade_phase/mrp/p0'
]),
(
'mrp/manufacturing_step_0'
,
10.0
,
(
'mrp/p1'
,
-
10
,
'cr/mrp/p1'
,
[
'trade_phase/mrp/p0'
]),
'pr/mrp/manufacturing_step_0'
,
[
'trade_phase/mrp/manufacturing_step_0'
]),
(
'mrp/p1'
,
-
10
,
None
,
[]),
(
'mrp/manufacturing_step_1'
,
-
10.0
,
(
'mrp/p1'
,
-
40
,
None
,
[]),
'cr/mrp/manufacturing_step_1'
,
[
'trade_phase/mrp/manufacturing_step_0'
]),
(
'mrp/p1'
,
10
,
'pr'
,
[]),
(
'mrp/manufacturing_step_1'
,
-
10.0
,
None
,
[]),
(
'mrp/manufacturing_step_1'
,
-
40.0
,
None
,
[]),
(
'mrp/manufacturing_step_1'
,
10.0
,
'pr'
,
[]),
)))
)))
order
.
confirm
()
order
.
confirm
()
...
@@ -357,7 +371,7 @@ class TestMRPImplementation(TestMRPMixin):
...
@@ -357,7 +371,7 @@ class TestMRPImplementation(TestMRPMixin):
me1
.
deliver
()
me1
.
deliver
()
order
.
localBuild
()
order
.
localBuild
()
self
.
tic
()
self
.
tic
()
variation
=
'industrial_phase/trade_phase/mrp/
p
0'
variation
=
'industrial_phase/trade_phase/mrp/
manufacturing_step_
0'
self
.
checkStock
(
resource
,
(
self
.
workshop2
,
variation
,
10
))
self
.
checkStock
(
resource
,
(
self
.
workshop2
,
variation
,
10
))
ipl
,
=
getRelatedDeliveryList
(
"Internal Packing List"
)
ipl
,
=
getRelatedDeliveryList
(
"Internal Packing List"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment