jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #1861: (feature/tool_standard_library_process -> develop)

Browse Source 
Merge Request: 匹配规则修改

Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1861
This commit is contained in:
廖丹龙
2025-02-26 10:48:29 +08:00
committed by Coding
parent e4c729e8e0 85c8e834cb
commit fd76863daa
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_manufacturing/models/purchase_order.py
View File

@@ -131,7 +131,7 @@ class PurchaseOrderLine(models.Model):
[('name', '=', sale_order_name)]) [('name', '=', sale_order_name)])
if sale_order: if sale_order:
filtered_order_line = sale_order.order_line.filtered( filtered_order_line = sale_order.order_line.filtered(
lambda order_line: product_name in order_line.product_id.name lambda order_line: re.search(f'S{product_name}$', order_line.product_id.name)
) )
record.part_number = filtered_order_line.product_id.part_number if filtered_order_line else None record.part_number = filtered_order_line.product_id.part_number if filtered_order_line else None
record.part_name = filtered_order_line.product_id.part_name if filtered_order_line else None record.part_name = filtered_order_line.product_id.part_name if filtered_order_line else None

3
sf_manufacturing/models/stock.py
View File

@@ -770,8 +770,9 @@ class ReStockMove(models.Model):
sale_order = self.env['sale.order'].sudo().search( sale_order = self.env['sale.order'].sudo().search(
[('name', '=', sale_order_name)]) [('name', '=', sale_order_name)])
filtered_order_line = sale_order.order_line.filtered( filtered_order_line = sale_order.order_line.filtered(
lambda production: product_name in production.product_id.name lambda production: re.search(f'S{product_name}$', production.product_id.name)
) )
if filtered_order_line: if filtered_order_line:
move.part_number = filtered_order_line.part_number move.part_number = filtered_order_line.part_number
move.part_name = filtered_order_line.part_name move.part_name = filtered_order_line.part_name