Merge branch 'refs/heads/develop' into feature/commercially_launched
This commit is contained in:
@@ -280,8 +280,8 @@ class MrpProduction(models.Model):
|
|||||||
# 如果匹配成功,提取结果
|
# 如果匹配成功,提取结果
|
||||||
if match:
|
if match:
|
||||||
product_name = match.group(0)
|
product_name = match.group(0)
|
||||||
if production_id.picking_id.sale_order_id:
|
if production_id.sale_order_id:
|
||||||
sale_order = production_id.picking_id.sale_order_id
|
sale_order = production_id.sale_order_id
|
||||||
else:
|
else:
|
||||||
sale_order_name = ''
|
sale_order_name = ''
|
||||||
match = re.search(r'(S\d+)', production_id.product_id.name)
|
match = re.search(r'(S\d+)', production_id.product_id.name)
|
||||||
@@ -289,10 +289,10 @@ class MrpProduction(models.Model):
|
|||||||
sale_order_name = match.group(0)
|
sale_order_name = match.group(0)
|
||||||
sale_order = self.env['sale.order'].sudo().search(
|
sale_order = self.env['sale.order'].sudo().search(
|
||||||
[('name', '=', sale_order_name)])
|
[('name', '=', sale_order_name)])
|
||||||
|
logging.info("product_name is :%s" % product_name)
|
||||||
filtered_order_line = sale_order.order_line.filtered(
|
filtered_order_line = sale_order.order_line.filtered(
|
||||||
lambda production: re.search(f'{product_name}$', production.product_id.name)
|
lambda production: re.search(f'{product_name}$', production.product_id.name)
|
||||||
)
|
)
|
||||||
|
|
||||||
if filtered_order_line:
|
if filtered_order_line:
|
||||||
production_id.part_number = filtered_order_line.part_number
|
production_id.part_number = filtered_order_line.part_number
|
||||||
production_id.part_name = filtered_order_line.part_name
|
production_id.part_name = filtered_order_line.part_name
|
||||||
|
|||||||
Reference in New Issue
Block a user