Skip to content

erp5
erp5
Commit ed910a41 authored by Cédric Le Ninivin's avatar Cédric Le Ninivin
Browse files
Options

erp5_mrp_quality_assurance: Add base logic to add more traceability 

erp5_mrp_quality_assurance: Fix and prevent double control
parent 3eafe21c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1397 additions and 10 deletions
bt5/erp5_mrp_quality_assurance/SkinTemplateItem/portal_skins/erp5_mrp_quality_assurance/Base_getTraceabilityServiceList.py 0 → 100644
View file @ ed910a41
from Products.ERP5Type.Cache import CachingMethod
from AccessControl import getSecurityManager
portal = context.getPortalObject()
def getQualityControlServiceList():
service_list = portal.portal_catalog(
portal_type='Service',
strict_use_uid=portal.portal_categories.use.manufacturing.traceability.getUid(),
validation_state = ('draft', 'validated'),
sort_on = (('creation_date', 'descending'),)
)
new_service_list = []
for x in service_list:
transformation_line = x.getResourceRelatedValue(portal_type='Transformation Operation')
if transformation_line and transformation_line.getTradePhase() == 'manufacturing/electronic_insurance':
continue
new_service_list.append(x.getId())
return new_service_list
getQualityControlServiceList = CachingMethod(
getQualityControlServiceList,
id='getTraceabilityServiceList-%s-%s' % (
portal.service_module.getLastId(),
getSecurityManager().getUser().getIdOrUserName()),
cache_factory='erp5_ui_long')
id_list = getQualityControlServiceList()
return [portal.service_module[service_id] for service_id in id_list]
bt5/erp5_mrp_quality_assurance/SkinTemplateItem/portal_skins/erp5_mrp_quality_assurance/Base_getTraceabilityServiceList.xml 0 → 100644
View file @ ed910a41
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="_reconstructor" module="copy_reg"/>
</klass>
<tuple>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
<global name="object" module="__builtin__"/>
<none/>
</tuple>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>**kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_getTraceabilityServiceList</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_mrp_quality_assurance/SkinTemplateItem/portal_skins/erp5_mrp_quality_assurance/ManufacturingExecutionModule_addQualityControl.py
View file @ ed910a41
......@@ -20,7 +20,18 @@ if not manufacturing_execution_list:
if new_control_list:
new_control_list = list(set(new_control_list))
expected_use_list = ['manufacturing/quality_control']
if expected_use:
expected_use_list = [expected_use]
else:
expected_use_list = ['manufacturing/quality_control']
portal_type_dict = {
"manufacturing/gate": "Gate",
"manufacturing/traceability": "Traceability",
"manufacturing/quality_control": "Quality Control",
"manufacturing/smon": "SMON",
"manufacturing/acom": "ACOM"
}
quality_portal_type = portal_type_dict.get(expected_use_list[0])
for control in control_list:
value = portal.restrictedTraverse(control)
if value.getUse() not in expected_use_list:
......@@ -30,7 +41,7 @@ for control in control_list:
"portal_status_message": translate(
"${control} has no valid use",
mapping = {
'control': control.getTitle()
'control': value.getTitle()
}),
'portal_status_level': 'error'
}
......@@ -118,11 +129,21 @@ if not control_value_list:
for me_quality in me_quality_list:
base_application_list = []
line_id_list = []
pending_control_list = []
for i in me_quality.objectValues(portal_type='Manufacturing Execution Line'):
base_application_list = i.getBaseApplicationList()
if base_application_list:
break
if not base_application_list and i.getBaseApplicationList():
base_application_list = i.getBaseApplicationList()
# Check for pending control
target_control = i.getAggregateValue(portal_type=quality_portal_type)
if not target_control or (target_control.getValidationState() in ("queued", "expected")):
# Did not fix yet, so pending
pending_control_list.append(i.getResource())
continue
for control_value in control_value_list:
if control_value.getRelativeUrl() in pending_control_list:
context.log("%s already expected in %s" % (control_value.getRelativeUrl(), me_quality.getRelativeUrl()))
continue
line = me_quality.newContent(
base_application_list = base_application_list,
portal_type='Manufacturing Execution Line',
......
bt5/erp5_mrp_quality_assurance/SkinTemplateItem/portal_skins/erp5_mrp_quality_assurance/ManufacturingExecutionModule_addQualityControl.xml
View file @ ed910a41
......@@ -50,7 +50,7 @@
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>control_list=\'\', new_control_list=\'\', **kw</string> </value>
<value> <string>control_list=\'\', new_control_list=\'\', expected_use="", **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
......
bt5/erp5_mrp_quality_assurance/SkinTemplateItem/portal_skins/erp5_mrp_quality_assurance/ManufacturingExecutionModule_viewAddTraceabilityDialog.xml 0 → 100644
View file @ ed910a41
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ERP5 Form" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value> <string>ManufacturingExecutionModule_addQualityControl</string> </value>
</item>
<item>
<key> <string>action_title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>edit_order</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>enctype</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
</item>
<item>
<key> <string>groups</string> </key>
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
</list>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
<list>
<string>listbox_delivery_start_date</string>
<string>listbox_delivery_stop_date</string>
<string>listbox_effective_date</string>
</list>
</value>
</item>
<item>
<key> <string>left</string> </key>
<value>
<list>
<string>your_control_list</string>
<string>expected_use</string>
</list>
</value>
</item>
<item>
<key> <string>right</string> </key>
<value>
<list/>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ManufacturingExecutionModule_viewAddTraceabilityDialog</string> </value>
</item>
<item>
<key> <string>method</string> </key>
<value> <string>POST</string> </value>
</item>
<item>
<key> <string>name</string> </key>
<value> <string>ManufacturingExecutionModule_viewAddTraceabilityDialog</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
<value> <string>form_dialog</string> </value>
</item>
<item>
<key> <string>row_length</string> </key>
<value> <int>4</int> </value>
</item>
<item>
<key> <string>stored_encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Add Traceability Requirements</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>update_action</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>update_action_title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_mrp_quality_assurance/SkinTemplateItem/portal_skins/erp5_mrp_quality_assurance/ManufacturingExecutionModule_viewAddTraceabilityDialog/listbox_delivery_start_date.xml 0 → 100644
View file @ ed910a41
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>editable</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_delivery_start_date</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_start_date</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewMRPFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_mrp_quality_assurance/SkinTemplateItem/portal_skins/erp5_mrp_quality_assurance/ManufacturingExecutionModule_viewAddTraceabilityDialog/listbox_delivery_stop_date.xml 0 → 100644
View file @ ed910a41
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>editable</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_delivery_stop_date</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_stop_date</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewMRPFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_mrp_quality_assurance/SkinTemplateItem/portal_skins/erp5_mrp_quality_assurance/ManufacturingExecutionModule_viewAddTraceabilityDialog/listbox_effective_date.xml 0 → 100644
View file @ ed910a41
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>editable</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_effective_date</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_stop_date</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewMRPFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_mrp_quality_assurance/SkinTemplateItem/portal_skins/erp5_mrp_quality_assurance/ManufacturingExecutionModule_viewAddTraceabilityDialog/your_control_list.xml 0 → 100644
View file @ ed910a41
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>items</string>
<string>required</string>
<string>size</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_control_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_multi_list_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <int>10</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Existing Traceability</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: [(x.getTitle(), x.getRelativeUrl()) for x in context.Base_getTraceabilityServiceList()]</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_mrp_quality_assurance/SkinTemplateItem/portal_skins/erp5_mrp_quality_assurance/ManufacturingExecutionMovement_getOpenManufacturingExecutionList.py
View file @ ed910a41
......@@ -3,7 +3,6 @@ portal = context.getPortalObject()
# hardcode form id to make sure we get the correct ME
form_id = 'ManufacturingExecutionModule_viewManufacturingExecutionList'
form = getattr(context, form_id, None)
if form:
listbox = form.Base_getListbox()
selection_name = listbox.get_value('selection_name')
......@@ -15,9 +14,11 @@ if form:
selection_params = portal.portal_selections.getSelectionParamsFor(selection_name)
selection_params.update(
{
'simulation_state': ('started', 'stopped'),
'simulation_state': ('ready', 'started', 'stopped'),
'strict_ledger_uid': portal.portal_categories.ledger.manufacturing.execution.getUid()
})
context.log(" %s %s" % (len(portal.portal_catalog(**selection_params)), [x.getRelativeUrl() for x in portal.portal_catalog(**selection_params)]))
context.log(" %s" % (portal.portal_catalog(src__=1, **selection_params)))
return portal.portal_catalog(**selection_params)
return []
bt5/erp5_mrp_quality_assurance/SkinTemplateItem/portal_skins/erp5_mrp_quality_assurance/ManufacturingExecution_addAndConfirmNewQualityControl.py
View file @ ed910a41
if context.getPortalType() != 'Manufacturing Execution':
raise ValueError(' %s type error' % context.getRelativeUrl())
if context.getSimulationState() in ('started', 'stopped'):
if context.getSimulationState() in ('ready', 'started', 'stopped'):
for line in context.objectValues(portal_type='Manufacturing Execution Line'):
if line.getIntIndex() == -1:
line.fixConsistency()
quality_control = line.getAggregateValue(portal_type='Quality Control')
if quality_control.getValidationState() == 'queued':
if quality_control and quality_control.getValidationState() == 'queued':
quality_control.confirm()
traceability = line.getAggregateValue(portal_type='Traceability')
if traceability and traceability.getValidationState() == 'queued':
traceability.confirm()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7