Merge PR #1343 into 15.0

Signed-off-by LoisRForgeFlow
This commit is contained in:
OCA-git-bot
2024-08-29 13:38:02 +00:00

View File

@@ -723,30 +723,39 @@ class MultiLevelMrp(models.TransientModel):
"""Improve extensibility being able to exclude special moves.""" """Improve extensibility being able to exclude special moves."""
return False return False
@api.model def _get_mrp_initialization_groups_of_params(self, mrp_lowest_llc, mrp_areas):
def _mrp_calculation(self, mrp_lowest_llc, mrp_areas):
logger.info("Start MRP calculation")
product_mrp_area_obj = self.env["product.mrp.area"] product_mrp_area_obj = self.env["product.mrp.area"]
counter = 0 groups = {}
if not mrp_areas:
mrp_areas = self.env["mrp.area"].search([])
for mrp_area in mrp_areas: for mrp_area in mrp_areas:
llc = 0 llc = 0
while mrp_lowest_llc > llc: while mrp_lowest_llc > llc:
product_mrp_areas = product_mrp_area_obj.search( groups[mrp_area, llc] = product_mrp_area_obj.search(
[("product_id.llc", "=", llc), ("mrp_area_id", "=", mrp_area.id)] [("product_id.llc", "=", llc), ("mrp_area_id", "=", mrp_area.id)]
) )
llc += 1 llc += 1
return groups
for product_mrp_area in product_mrp_areas: @api.model
if product_mrp_area.mrp_nbr_days == 0: def _mrp_calculation(self, mrp_lowest_llc, mrp_areas):
self._init_mrp_move_non_grouped_demand(product_mrp_area) logger.info("Start MRP calculation")
else: if not mrp_areas:
self._init_mrp_move_grouped_demand(product_mrp_area) mrp_areas = self.env["mrp.area"].search([])
counter += 1 keyed_groups = self._get_mrp_initialization_groups_of_params(
mrp_lowest_llc, mrp_areas
)
for (mrp_area, llc), product_mrp_areas in keyed_groups.items():
counter = 0
for product_mrp_area in product_mrp_areas:
if product_mrp_area.mrp_nbr_days == 0:
self._init_mrp_move_non_grouped_demand(product_mrp_area)
else:
self._init_mrp_move_grouped_demand(product_mrp_area)
counter += 1
log_msg = "MRP Calculation LLC {} Finished - Nbr. products: {}".format( log_msg = (
llc - 1, counter "MRP Calculation LLC {} at {} Finished - Nbr. products: {}".format(
llc, mrp_area.name, counter
)
) )
logger.info(log_msg) logger.info(log_msg)