Skip to content

erp5
erp5
Commit c906b34c authored by Sebastien Robin's avatar Sebastien Robin
Browse files
Options

commit changes of guillaume 


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1516 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 4cd54037
Hide whitespace changes
Inline Side-by-side
Showing with 384 additions and 186 deletions
product/ERP5/Tool/SimulationTool.py
View file @ c906b34c
...@@ -212,6 +212,34 @@ class SimulationTool (Folder, UniqueObject): ...@@ -212,6 +212,34 @@ class SimulationTool (Folder, UniqueObject):
def collectMovement(self, movement_list, def collectMovement(self, movement_list,
check_order = 1, check_path = 1, check_date = 1, check_criterion = 0, check_order = 1, check_path = 1, check_date = 1, check_criterion = 0,
check_resource = 1, check_base_variant = 0, check_variant = 1): check_resource = 1, check_base_variant = 0, check_variant = 1):
current_order = 2
check_list = [check_order, check_path, check_date, check_criterion, check_resource, check_base_variant, check_variant]
for i in range(len(check_list)):
if check_list[i]:
check_list[i] = current_order
current_order += 1
check_order = check_list[0]
check_path = check_list[1]
check_date = check_list[2]
check_criterion = check_list[3]
check_resource = check_list[4]
check_base_variant = check_list[5]
check_variant = check_list[6]
return self.orderedCollectMovement(movement_list=movement_list,
check_order=check_order,
check_path=check_path,
check_date=check_date,
check_criterion=check_criterion,
check_resource=check_resource,
check_base_variant=check_base_variant,
check_variant=check_variant)
def orderedCollectMovement(self, movement_list,
check_order = 2, check_path = 3, check_date = 4, check_criterion = 0,
check_resource = 5, check_base_variant = 0, check_variant = 6):
LOG('orderedCollectMovement :', 0, 'movement_list = %s' % repr(movement_list))
class RootGroup: class RootGroup:
...@@ -225,7 +253,10 @@ class SimulationTool (Folder, UniqueObject): ...@@ -225,7 +253,10 @@ class SimulationTool (Folder, UniqueObject):
""" """
This sets an appropriate nested class. This sets an appropriate nested class.
""" """
class_list = ((1, RootGroup), def cmpfunc(a,b):
return cmp(a[0],b[0])
class_list = [(1, RootGroup),
(check_order, OrderGroup), (check_order, OrderGroup),
(check_path, PathGroup), (check_path, PathGroup),
(check_date, DateGroup), (check_date, DateGroup),
...@@ -233,7 +264,8 @@ class SimulationTool (Folder, UniqueObject): ...@@ -233,7 +264,8 @@ class SimulationTool (Folder, UniqueObject):
(check_resource, ResourceGroup), (check_resource, ResourceGroup),
(check_base_variant, BaseVariantGroup), (check_base_variant, BaseVariantGroup),
(check_variant, VariantGroup), (check_variant, VariantGroup),
) ]
class_list.sort(cmpfunc)
for i in range(len(class_list)): for i in range(len(class_list)):
if class_list[i][1] == self.__class__: if class_list[i][1] == self.__class__:
break break
...@@ -562,202 +594,368 @@ class SimulationTool (Folder, UniqueObject): ...@@ -562,202 +594,368 @@ class SimulationTool (Folder, UniqueObject):
return order_list return order_list
def buildDeliveryList(self, movement_group): def buildDeliveryList(self, movement_group):
# Build deliveries from a list of movements # Build deliveries from a list of movements
delivery_list = []
reindexable_movement_list = [] def orderGroupProcessing(order_group, delivery_list, reindexable_movement_list, **kw):
if movement_group is not None: # Order should never be None
for order_group in movement_group.group_list: LOG("buildDeliveryList", 0, str(order_group.__dict__))
# Order should never be None if order_group.order is not None:
LOG("buildDeliveryList", 0, str(order_group.__dict__)) order = self.portal_categories.resolveCategory(order_group.order)
if order_group.order is not None: if order is not None:
order = self.portal_categories.resolveCategory(order_group.order) # define some variables
if order is not None: LOG("order", 0, str(order.__dict__))
# define some variables if order.getPortalType() == 'Purchase Order' :
LOG("order", 0, str(order.__dict__)) delivery_module = order.getPortalObject().livraison_achat
if order.getPortalType() == 'Purchase Order' : delivery_type = 'Purchase Packing List'
delivery_module = order.getPortalObject().livraison_achat
delivery_type = 'Purchase Packing List'
delivery_line_type = delivery_type + ' Line'
delivery_cell_type = 'Delivery Cell'
else :
delivery_module = order.getPortalObject().livraison_vente
delivery_type = 'Sales Packing List'
delivery_line_type = delivery_type + ' Line'
delivery_cell_type = 'Delivery Cell'
else : # should never be none
LOG("order is None", 0, str(order.__dict__))
return delivery_list
else: # order is None
order = None
# possible when we build deliveries for tranfer of property
delivery_module = self.getPortalObject().livraison_vente
delivery_type = 'Sales Packing List'
delivery_line_type = delivery_type + ' Line'
delivery_cell_type = 'Delivery Cell'
for path_group in order_group.group_list :
# we create a new delivery for each DateGroup
# if path is internal ???
# JPS NEW
if path_group.source is None or path_group.destination is None:
# Production Path
LOG("Builder",0, "Strange Path %s " % path_group.source)
LOG("Builder",0, "Strange Path %s " % path_group.destination)
if path_group.source is None or path_group.destination is None:
delivery_module = self.rapport_fabrication
delivery_type = 'Production Report'
delivery_line_type = 'Production Report Line'
delivery_cell_type = 'Production Report Cell'
elif path_group.destination.find('site/Stock_PF') >= 0 and \
path_group.source.find('site/Piquage') >= 0:
delivery_module = self.livraison_fabrication
delivery_type = 'Production Packing List'
delivery_line_type = delivery_type + ' Line' delivery_line_type = delivery_type + ' Line'
delivery_cell_type = 'Delivery Cell' delivery_cell_type = 'Delivery Cell'
elif path_group.source.find('site/Stock_MP') >= 0 and \ else :
path_group.destination.find('site/Piquage') >= 0: delivery_module = order.getPortalObject().livraison_vente
delivery_module = self.livraison_fabrication delivery_type = 'Sales Packing List'
delivery_type = 'Production Packing List'
delivery_line_type = delivery_type + ' Line' delivery_line_type = delivery_type + ' Line'
delivery_cell_type = 'Delivery Cell' delivery_cell_type = 'Delivery Cell'
else : # should never be none
LOG("order is None", 0, str(order.__dict__))
return -1
else: # order is None
order = None
# possible when we build deliveries for tranfer of property
delivery_module = self.getPortalObject().livraison_vente
delivery_type = 'Sales Packing List'
delivery_line_type = delivery_type + ' Line'
delivery_cell_type = 'Delivery Cell'
for path_group in order_group.group_list:
pathGroupProcessing(path_group=path_group,
delivery_module=delivery_module,
delivery_type=delivery_type,
delivery_line_type=delivery_line_type,
delivery_cell_type=delivery_cell_type,
order=order,
delivery_list=delivery_list,
reindexable_movement_list=reindexable_movement_list, **kw)
return 0
def pathGroupProcessing(path_group, delivery_module, delivery_type, delivery_line_type, delivery_cell_type, order, delivery_list, reindexable_movement_list, default_rule_id=None, **kw):
# we create a new delivery for each DateGroup
if default_rule_id is 'default_amortisation_rule':
pass
else:
# if path is internal ???
# JPS NEW
if path_group.source is None or path_group.destination is None:
# Production Path
LOG("Builder",0, "Strange Path %s " % path_group.source)
LOG("Builder",0, "Strange Path %s " % path_group.destination)
if path_group.source is None or path_group.destination is None:
delivery_module = self.rapport_fabrication
delivery_type = 'Production Report'
delivery_line_type = 'Production Report Line'
delivery_cell_type = 'Production Report Cell'
elif path_group.destination.find('site/Stock_PF') >= 0 and \
path_group.source.find('site/Piquage') >= 0:
delivery_module = self.livraison_fabrication
delivery_type = 'Production Packing List'
delivery_line_type = delivery_type + ' Line'
delivery_cell_type = 'Delivery Cell'
elif path_group.source.find('site/Stock_MP') >= 0 and \
path_group.destination.find('site/Piquage') >= 0:
delivery_module = self.livraison_fabrication
delivery_type = 'Production Packing List'
delivery_line_type = delivery_type + ' Line'
delivery_cell_type = 'Delivery Cell'
for date_group in path_group.group_list : for date_group in path_group.group_list :
dateGroupProcessing(date_group=date_group,
# Create a new packing list path_group=path_group,
delivery_module=delivery_module,
delivery_type=delivery_type,
delivery_line_type=delivery_line_type,
delivery_cell_type=delivery_cell_type,
order=order,
delivery_list=delivery_list,
reindexable_movement_list=reindexable_movement_list,
default_rule_id=default_rule_id, **kw)
def dateGroupProcessing(date_group, path_group, delivery_module, delivery_type, delivery_line_type, delivery_cell_type, order, delivery_list, reindexable_movement_list, default_rule_id=None, resource=None, **kw):
if default_rule_id == 'default_amortisation_rule':
accounting_transaction_data_list = {}
for path_group in date_group.group_list:
source_section = path_group.source_section
destination_section = path_group.destination_section
source = path_group.source
destination = path_group.destination
accounting_transaction_data = accounting_transaction_data_list.get( (source_section, destination_section), None)
if accounting_transaction_data is None:
accounting_transaction_data_list[ (source_section, destination_section) ] = {}
accounting_transaction_data = accounting_transaction_data_list.get( (source_section, destination_section), None)
quantity = 0
source_movement_list = []
for movement in path_group.movement_list:
if movement.getDeliveryValue() is None:
quantity += movement.getQuantity()
source_movement_list.append(movement)
LOG('buildDeliveryList :', 0, 'adding movement %s : quantity = %s' % (repr(movement), repr(movement.getQuantity())))
else:
LOG('buildDeliveryList :', 0, 'movement %s... delivery value = %s' % (repr(movement), repr(movement.getDeliveryValue())))
accounting_transaction_data[ (source, destination) ] = (quantity, source_movement_list)
if len(source_movement_list) == 0:
LOG('buildDeliveryList :', 0, 'deleting transaction line because no source movement list... path_group.movement_list = %s' % repr(path_group.movement_list))
del accounting_transaction_data[ (source, destination) ]
for (source_section, destination_section), accounting_transaction_data in accounting_transaction_data_list.items():
if len(accounting_transaction_data.items()) > 0:
new_delivery_id = str(delivery_module.generateNewId()) new_delivery_id = str(delivery_module.generateNewId())
self.portal_types.constructContent(type_name = delivery_type, self.portal_types.constructContent(type_name = delivery_type,
container = delivery_module, container = delivery_module,
id = new_delivery_id, id = new_delivery_id,
target_start_date = date_group.start_date, target_start_date = date_group.start_date,
target_stop_date = date_group.stop_date, target_stop_date = date_group.stop_date,
start_date = date_group.start_date, start_date = date_group.start_date,
stop_date = date_group.stop_date, stop_date = date_group.stop_date,
source = path_group.source, source_section = source_section,
destination = path_group.destination, destination_section = destination_section
source_section = path_group.source_section, )
destination_section = path_group.destination_section accounting_transaction = delivery_module[new_delivery_id]
) accounting_transaction.setResource(resource)
delivery = delivery_module[new_delivery_id] for (source, destination), (quantity, source_movement_list) in accounting_transaction_data.items():
if order is not None : new_transaction_line_id = str(accounting_transaction.generateNewId())
delivery.edit(title = order.getTitle(),
causality_value = order,
incoterm = order.getIncoterm(),
delivery_mode = order.getDeliveryMode()
)
# the new delivery is added to the delivery_list
delivery_list.append(delivery)
# LOG('Livraison cre',0,str(delivery.getId()))
# Create each delivery_line in the new delivery
for resource_group in date_group.group_list :
if delivery_type == 'Production Report':
if resource_group.resource.find('operation') == 0:
delivery_line_type = 'Production Report Operation'
else:
delivery_line_type = 'Production Report Component'
new_delivery_line_id = str(delivery.generateNewId())
self.portal_types.constructContent(type_name = delivery_line_type, self.portal_types.constructContent(type_name = delivery_line_type,
container = delivery, container = accounting_transaction,
id = new_delivery_line_id, id = new_transaction_line_id,
resource = resource_group.resource, source = source,
) destination = destination)
delivery_line = delivery[new_delivery_line_id] accounting_transaction_line = accounting_transaction[new_transaction_line_id]
#LOG('Ligne cre',0,str(delivery_line.getId())+' '+str(delivery_line.getResource())) accounting_transaction_line.setQuantity(quantity)
LOG('buildDeliveryList :', 0, 'setting resource for line %s... resource = %s' % (repr(accounting_transaction_line), repr(resource)))
line_variation_category_list = [] accounting_transaction_line.setResource(resource)
line_variation_base_category_dict = {} for movement in source_movement_list:
LOG('buildDeliveryList :', 0, 'setting delivery value... movement = %s, accounting_transaction_line = %s' % (repr(movement), repr(accounting_transaction_line)))
# compute line_variation_base_category_list and movement.setDeliveryValue(accounting_transaction_line)
# line_variation_category_list for new delivery_line LOG('buildDeliveryList :', 0, 'after setting it, movement.delivery_value = %s' % repr(movement.getDeliveryValue()))
for variant_group in resource_group.group_list : movement.recursiveImmediateReindexObject()
for variation_item in variant_group.category_list :
if not variation_item in line_variation_category_list : else:
line_variation_category_list.append(variation_item) # Create a new packing list
variation_base_category_items = variation_item.split('/') new_delivery_id = str(delivery_module.generateNewId())
if len(variation_base_category_items) > 0 : self.portal_types.constructContent(type_name = delivery_type,
line_variation_base_category_dict[variation_base_category_items[0]] = 1 container = delivery_module,
id = new_delivery_id,
# update variation_base_category_list and line_variation_category_list for delivery_line target_start_date = date_group.start_date,
line_variation_base_category_list = line_variation_base_category_dict.keys() target_stop_date = date_group.stop_date,
delivery_line._setVariationBaseCategoryList(line_variation_base_category_list) start_date = date_group.start_date,
delivery_line.setVariationCategoryList(line_variation_category_list) stop_date = date_group.stop_date,
source = path_group.source,
# IMPORTANT : delivery cells are automatically created during setVariationCategoryList destination = path_group.destination,
source_section = path_group.source_section,
# update target_quantity for each delivery_cell destination_section = path_group.destination_section
for variant_group in resource_group.group_list : )
#LOG('Variant_group examin?,0,str(variant_group.category_list)) delivery = delivery_module[new_delivery_id]
object_to_update = None if order is not None :
# if there is no variation of the resource, update delivery_line with quantities and price delivery.edit(title = order.getTitle(),
if len(variant_group.category_list) == 0 : causality_value = order,
object_to_update = delivery_line incoterm = order.getIncoterm(),
# else find which delivery_cell is represented by variant_group delivery_mode = order.getDeliveryMode()
)
# the new delivery is added to the delivery_list
delivery_list.append(delivery)
# LOG('Livraison cre',0,str(delivery.getId()))
# Create each delivery_line in the new delivery
for resource_group in date_group.group_list :
resourceGroupProcessing(resource_group=resource_group,
delivery=delivery,
delivery_type=delivery_type,
delivery_line_type=delivery_line_type,
delivery_cell_type=delivery_cell_type,
delivery_list=delivery_list,
reindexable_movement_list=reindexable_movement_list, **kw)
def resourceGroupProcessing(resource_group, delivery, delivery_type, delivery_line_type, delivery_cell_type, delivery_list, reindexable_movement_list, delivery_module=None, default_rule_id=None, **kw):
if default_rule_id == 'default_amortisation_rule':
resource = resource_group.resource
for date_group in resource_group.group_list:
dateGroupProcessing(date_group=date_group,
path_group=None,
delivery_module=delivery_module,
delivery_type=delivery_type,
delivery_line_type=delivery_line_type,
delivery_cell_type=delivery_cell_type,
order=None,
delivery_list=delivery_list,
reindexable_movement_list=reindexable_movement_list,
default_rule_id=default_rule_id,
resource=resource)
else:
if delivery_type == 'Production Report':
if resource_group.resource.find('operation') == 0:
delivery_line_type = 'Production Report Operation'
else:
delivery_line_type = 'Production Report Component'
new_delivery_line_id = str(delivery.generateNewId())
self.portal_types.constructContent(type_name = delivery_line_type,
container = delivery,
id = new_delivery_line_id,
resource = resource_group.resource,
)
delivery_line = delivery[new_delivery_line_id]
line_variation_category_list = []
line_variation_base_category_dict = {}
# compute line_variation_base_category_list and
# line_variation_category_list for new delivery_line
for variant_group in resource_group.group_list :
for variation_item in variant_group.category_list :
if not variation_item in line_variation_category_list :
line_variation_category_list.append(variation_item)
variation_base_category_items = variation_item.split('/')
if len(variation_base_category_items) > 0 :
line_variation_base_category_dict[variation_base_category_items[0]] = 1
# update variation_base_category_list and line_variation_category_list for delivery_line
line_variation_base_category_list = line_variation_base_category_dict.keys()
delivery_line._setVariationBaseCategoryList(line_variation_base_category_list)
delivery_line.setVariationCategoryList(line_variation_category_list)
# IMPORTANT : delivery cells are automatically created during setVariationCategoryList
# update target_quantity for each delivery_cell
for variant_group in resource_group.group_list :
#LOG('Variant_group examin?,0,str(variant_group.category_list))
object_to_update = None
# if there is no variation of the resource, update delivery_line with quantities and price
if len(variant_group.category_list) == 0 :
object_to_update = delivery_line
# else find which delivery_cell is represented by variant_group
else :
categories_identity = 0
#LOG('Before Check cell',0,str(delivery_cell_type))
#LOG('Before Check cell',0,str(delivery_line.contentValues()))
for delivery_cell in delivery_line.contentValues(
filter={'portal_type':delivery_cell_type}) :
#LOG('Check cell',0,str(delivery_cell))
if len(variant_group.category_list) == len(delivery_cell.getVariationCategoryList()) :
#LOG('Parse category',0,str(delivery_cell.getVariationCategoryList()))
for category in delivery_cell.getVariationCategoryList() :
if not category in variant_group.category_list :
#LOG('Not found category',0,str(category))
break
else : else :
categories_identity = 0 categories_identity = 1
#LOG('Before Check cell',0,str(delivery_cell_type))
#LOG('Before Check cell',0,str(delivery_line.contentValues())) if categories_identity :
for delivery_cell in delivery_line.contentValues( object_to_update = delivery_cell
filter={'portal_type':delivery_cell_type}) : break
#LOG('Check cell',0,str(delivery_cell))
if len(variant_group.category_list) == len(delivery_cell.getVariationCategoryList()) : # compute target_quantity, quantity and price for delivery_cell or delivery_line and
#LOG('Parse category',0,str(delivery_cell.getVariationCategoryList())) # build relation between simulation_movement and delivery_cell or delivery_line
for category in delivery_cell.getVariationCategoryList() : if object_to_update is not None :
if not category in variant_group.category_list : cell_target_quantity = 0
#LOG('Not found category',0,str(category)) cell_total_price = 0
break for movement in variant_group.movement_list :
else : LOG('SimulationTool, movement.getPhysicalPath',0,movement.getPhysicalPath())
categories_identity = 1 LOG('SimulationTool, movement.showDict',0,movement.showDict())
cell_target_quantity += movement.getNetConvertedTargetQuantity()
if categories_identity : try:
object_to_update = delivery_cell cell_total_price += movement.getNetConvertedTargetQuantity()*movement.getPrice() # XXX WARNING - ADD PRICED QUANTITY
break except:
cell_total_price = None
# compute target_quantity, quantity and price for delivery_cell or delivery_line and
# build relation between simulation_movement and delivery_cell or delivery_line if movement.getPortalType() == 'Simulation Movement' :
if object_to_update is not None : # update every simulation_movement
cell_target_quantity = 0 # we set delivery_value and target dates and quantity
cell_total_price = 0 movement._setDeliveryValue(object_to_update)
for movement in variant_group.movement_list : movement._setTargetQuantity(movement.getTargetQuantity())
LOG('SimulationTool, movement.getPhysicalPath',0,movement.getPhysicalPath()) movement._setQuantity(movement.getTargetQuantity())
LOG('SimulationTool, movement.showDict',0,movement.showDict()) movement._setEfficiency(movement.getTargetEfficiency())
cell_target_quantity += movement.getNetConvertedTargetQuantity() movement._setTargetStartDate(movement.getTargetStartDate())
try: movement._setTargetStopDate(movement.getTargetStopDate())
cell_total_price += movement.getNetConvertedTargetQuantity()*movement.getPrice() # XXX WARNING - ADD PRICED QUANTITY movement._setStartDate(movement.getTargetStartDate())
except: movement._setStopDate(movement.getTargetStopDate())
cell_total_price = None # We will reindex later
reindexable_movement_list.append(movement)
if movement.getPortalType() == 'Simulation Movement' :
# update every simulation_movement if cell_target_quantity <> 0 and cell_total_price is not None:
# we set delivery_value and target dates and quantity average_price = cell_total_price/cell_target_quantity
movement._setDeliveryValue(object_to_update) else :
movement._setTargetQuantity(movement.getTargetQuantity()) average_price = 0
movement._setQuantity(movement.getTargetQuantity()) #LOG('object mis ?jour',0,str(object_to_update.getRelativeUrl()))
movement._setEfficiency(movement.getTargetEfficiency()) object_to_update._edit(target_quantity = cell_target_quantity,
movement._setTargetStartDate(movement.getTargetStartDate()) quantity = cell_target_quantity,
movement._setTargetStopDate(movement.getTargetStopDate()) price = average_price,
movement._setStartDate(movement.getTargetStartDate()) force_update = 1,
movement._setStopDate(movement.getTargetStopDate()) )
# We will reindex later
reindexable_movement_list.append(movement)
if cell_target_quantity <> 0 and cell_total_price is not None: delivery_list = []
average_price = cell_total_price/cell_target_quantity reindexable_movement_list = []
else :
average_price = 0
#LOG('object mis ?jour',0,str(object_to_update.getRelativeUrl()))
object_to_update._edit(target_quantity = cell_target_quantity,
quantity = cell_target_quantity,
price = average_price,
force_update = 1,
)
if movement_group is not None:
# Verify the rule used to build the movements
default_rule_id = None
if len(movement_group.movement_list) > 0:
f = getattr(movement_group.movement_list[0], 'getRootAppliedRule', None)
if f is not None:
applied_rule = f()
default_rule_id = applied_rule.getSpecialiseId()
LOG('buildDeliveryList :', 0, 'default_rule = %s' % repr(default_rule_id))
if default_rule_id == 'default_amortisation_rule':
LOG('buildDeliveryList :', 0, 'default_rule is default_amortisation_rule')
delivery_module = self.getPortalObject().accounting
delivery_type = 'Amortisation Transaction'
delivery_line_type = delivery_type + ' Line'
delivery_cell_type = None
for resource_group in movement_group.group_list:
resourceGroupProcessing(resource_group=resource_group,
delivery=None,
delivery_module=delivery_module,
delivery_type=delivery_type,
delivery_line_type=delivery_line_type,
delivery_cell_type=delivery_cell_type,
delivery_list=delivery_list,
reindexable_movement_list=reindexable_movement_list,
default_rule_id=default_rule_id)
for movement in movement_group.movement_list:
movement.immediateReindexObject()
else:
for order_group in movement_group.group_list:
if orderGroupProcessing(order_group=order_group,
delivery_list=delivery_list,
reindexable_movement_list=reindexable_movement_list) == -1:
return delivery_list
# If we reach this point, it means we could # If we reach this point, it means we could
# create deliveries # create deliveries
# get_transaction().commit() # get_transaction().commit()
......
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