Skip to content

erp5
erp5
Commit 1e5a8154 authored by Xiaowu Zhang's avatar Xiaowu Zhang Committed by Cédric Le Ninivin
Browse files
Options

erp5_production_planning: speed up

parent 66989ebc
Hide whitespace changes
Inline Side-by-side
Showing with 432 additions and 16 deletions
bt5/erp5_production_planning/ExtensionTemplateItem/portal_components/document.erp5.ProductionPlanning.py 0 → 100644
View file @ 1e5a8154
# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2016 Nexedi SA and Contributors. All Rights Reserved.
# Cédric Le Ninivin <cedric.leninivin@nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsability of assessing all potential
# consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial
# garantees and support are strongly adviced to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
from AccessControl import ClassSecurityInfo
from Products.ERP5.Document.Delivery import Delivery
from Products.ERP5Type import Permissions
from Products.ERP5Type.Cache import transactional_cached
class ProductionPlanning(Delivery):
portal_type = 'Production Planning'
security = ClassSecurityInfo()
security.declareProtected(Permissions.AccessContentsInformation,
'getProductionPlanningCell')
def getProductionPlanningCell(self, *cell_index, **kw):
_production_planning_dict = self.getProductionPlanningDict()
return _production_planning_dict.get(cell_index)
security.declareProtected(Permissions.AccessContentsInformation,
'getProductionPlanningDict')
def getProductionPlanningDict(self, **kw):
return self._getProductionPlanningDict(**kw)
@transactional_cached(key_method=lambda self, **kw:
(self.getRelativeUrl(), tuple(kw.items())))
def _getProductionPlanningDict(self, **kw):
production_planning_dict = {}
cell_getter = self.getCell
for cell_key in self.getCellKeys():
production_planning_dict[(cell_key[0], cell_key[1])] = cell_getter(*cell_key)
return production_planning_dict
\ No newline at end of file
bt5/erp5_production_planning/ExtensionTemplateItem/portal_components/document.erp5.ProductionPlanning.xml 0 → 100644
View file @ 1e5a8154
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Document Component" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_recorded_property_dict</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>ProductionPlanning</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>document.erp5.ProductionPlanning</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Document Component</string> </value>
</item>
<item>
<key> <string>sid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>text_content_error_message</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>text_content_warning_message</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>version</string> </key>
<value> <string>erp5</string> </value>
</item>
<item>
<key> <string>workflow_history</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>component_validation_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>validate</string> </value>
</item>
<item>
<key> <string>validation_state</string> </key>
<value> <string>validated</string> </value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
</ZopeData>
bt5/erp5_production_planning/ExtensionTemplateItem/portal_components/document.erp5.ProductionPlanningCell.py
View file @ 1e5a8154
...@@ -34,8 +34,9 @@ class ProductionPlanningCell(MappedValue): ...@@ -34,8 +34,9 @@ class ProductionPlanningCell(MappedValue):
portal_type = 'Production Planning Cell' portal_type = 'Production Planning Cell'
security = ClassSecurityInfo() security = ClassSecurityInfo()
security.declareObjectProtected(Permissions.AccessContentsInformation) security.declareObjectProtected(Permissions.AccessContentsInformation)
def getProductionPlanningCellClass(self):
def getRelatedProductionOrderUrl(self, brain, cell_index, cell_position): default_quantity = self.getDefaultQuantity()
production_order_line = self.getSpecialiseValue() quantity = self.getQuantity()
if production_order_line: if (default_quantity is None and quantity) or (default_quantity is not None and default_quantity != quantity):
return production_order_line.getParentValue().getAbsoluteUrl() return 'warning'
return ''
bt5/erp5_production_planning/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
View file @ 1e5a8154
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
<item>Task</item> <item>Task</item>
</portal_type> </portal_type>
<portal_type id="Production Planning Cell"> <portal_type id="Production Planning Cell">
<item>Measure</item> <item>ProductionPlanningCell</item>
</portal_type> </portal_type>
</property_sheet_list> </property_sheet_list>
\ No newline at end of file
bt5/erp5_production_planning/PortalTypeTemplateItem/portal_types/Production%20Planning.xml
View file @ 1e5a8154
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</item> </item>
<item> <item>
<key> <string>type_class</string> </key> <key> <string>type_class</string> </key>
<value> <string>Delivery</string> </value> <value> <string>ProductionPlanning</string> </value>
</item> </item>
<item> <item>
<key> <string>type_interface</string> </key> <key> <string>type_interface</string> </key>
......
bt5/erp5_production_planning/PropertySheetTemplateItem/portal_property_sheets/ProductionPlanningCell.xml 0 → 100644
View file @ 1e5a8154
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Property Sheet" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ProductionPlanningCell</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Property Sheet</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
bt5/erp5_production_planning/PropertySheetTemplateItem/portal_property_sheets/ProductionPlanningCell/default_quantity_property.xml 0 → 100644
View file @ 1e5a8154
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Standard Property" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>mode</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>elementary_type/float</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Value of the measure, expressed in the selected quantity unit.</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>default_quantity_property</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Standard Property</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_production_planning/PropertySheetTemplateItem/portal_property_sheets/ProductionPlanningCell/quantity_property.xml 0 → 100644
View file @ 1e5a8154
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Standard Property" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>mode</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>elementary_type/float</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Value of the measure, expressed in the selected quantity unit.</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>quantity_property</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Standard Property</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_production_planning/PropertySheetTemplateItem/portal_property_sheets/ProductionPlanningCell/related_url_property.xml 0 → 100644
View file @ 1e5a8154
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Standard Property" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>mode</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>elementary_type/string</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Value of the measure, expressed in the selected quantity unit.</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>related_url_property</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Standard Property</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_production_planning/SkinTemplateItem/portal_skins/erp5_production_planning/ProductionPlanning_view/matrixbox.xml
View file @ 1e5a8154
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
</item> </item>
<item> <item>
<key> <string>cell_getter_method</string> </key> <key> <string>cell_getter_method</string> </key>
<value> <string></string> </value> <value> <string>getProductionPlanningCell</string> </value>
</item> </item>
<item> <item>
<key> <string>cell_portal_type</string> </key> <key> <string>cell_portal_type</string> </key>
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
<list> <list>
<tuple> <tuple>
<string>link</string> <string>link</string>
<string>getRelatedProductionOrderUrl</string> <string>getRelatedUrl</string>
</tuple> </tuple>
</list> </list>
</value> </value>
......
bt5/erp5_production_planning/SkinTemplateItem/portal_skins/erp5_production_planning/ProductionPlanning_view/matrixbox_quantity.xml
View file @ 1e5a8154
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: "warning" if (cell and ((not cell.getSpecialise() and cell.getQuantity()) or (cell.getSpecialiseValue().getQuantity() != cell.getQuantity()))) else ""</string> </value> <value> <string>python: cell.getProductionPlanningCellClass() if field.get_value("editable") else ""</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: cell.getQuantity() or 0 if cell else 0</string> </value> <value> <string>python: cell.getQuantity() if cell else 0</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_production_planning/WorkflowTemplateItem/portal_workflow/production_planning_interaction_workflow/scripts/ProductionPlanning_applyProductionPlanningChanges.py
View file @ 1e5a8154
...@@ -54,7 +54,10 @@ for cell_keys in production_planning.getCellKeys(): ...@@ -54,7 +54,10 @@ for cell_keys in production_planning.getCellKeys():
portal_type='Production Order Line', portal_type='Production Order Line',
resource_uid = resource_uid, resource_uid = resource_uid,
quantity = cell_quantity) quantity = cell_quantity)
cell.edit(specialise_value = production_order_line) cell.edit(
specialise_value = production_order_line,
related_url = production_order.getAbsoluteUrl()
)
portal.portal_workflow.doActionFor( portal.portal_workflow.doActionFor(
production_order_line, production_order_line,
"edit_action", "edit_action",
......
bt5/erp5_production_planning/WorkflowTemplateItem/portal_workflow/production_planning_interaction_workflow/scripts/ProductionPlanning_renderProductionPlanningStatus.py
View file @ 1e5a8154
...@@ -27,13 +27,17 @@ for product in portal.portal_catalog(portal_type='Product', product_line_relativ ...@@ -27,13 +27,17 @@ for product in portal.portal_catalog(portal_type='Product', product_line_relativ
kd = {'portal_type':'Production Planning Cell', 'base_id':'cell'} kd = {'portal_type':'Production Planning Cell', 'base_id':'cell'}
for production_order in production_order_list: for production_order in production_order_list:
column = '%s' % production_order.getStartDate().Date() column = '%s' % production_order.getStartDate().Date()
related_url = production_order.getAbsoluteUrl()
for production_order_line in production_order.searchFolder(portal_type='Production Order Line', strict_resource_uid=product_uid): for production_order_line in production_order.searchFolder(portal_type='Production Order Line', strict_resource_uid=product_uid):
k = (line, column) k = (line, column)
if not production_planning.hasInRange(*k, **kd): if not production_planning.hasInRange(*k, **kd):
production_planning.log('Waring: Production order date %s is not in range which should not be, need to check' % start_date) production_planning.log('Waring: Production order date %s is not in range which should not be, need to check' % start_date)
if not production_planning.hasCell(*k, **kd): if not production_planning.hasCell(*k, **kd):
new_cell = production_planning.newCell(*k, **kd) new_cell = production_planning.newCell(*k, **kd)
quantity = production_order_line.getQuantity()
new_cell.edit( new_cell.edit(
quantity = production_order_line.getQuantity(), quantity = quantity,
default_quantity = quantity,
related_url = related_url,
specialise_value = production_order_line) specialise_value = production_order_line)
production_planning.record() production_planning.record()
bt5/erp5_production_planning/bt/template_extension_id_list
View file @ 1e5a8154
document.erp5.ProductionPlanningCell document.erp5.ProductionPlanningCell
\ No newline at end of file document.erp5.ProductionPlanning
\ No newline at end of file
bt5/erp5_production_planning/bt/template_portal_type_property_sheet_list
View file @ 1e5a8154
Production Planning Cell | Measure Production Planning Cell | ProductionPlanningCell
Production Planning | Task Production Planning | Task
\ No newline at end of file
bt5/erp5_production_planning/bt/template_property_sheet_id_list
View file @ 1e5a8154
ProductionPlanningPreference ProductionPlanningPreference
\ No newline at end of file ProductionPlanningCell
\ No newline at end of file
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