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

Accept Merge Request #2194: (feature/修改产品名称 -> develop)

Browse Source 
Merge Request: 解决修改产品名称带来的影响

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2194?initial=true
This commit is contained in:
胡尧
2025-06-16 09:36:16 +08:00
committed by Coding
parent 1c1d1a74ad 1811dbf0fd
commit ceb7a02209
5 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jikimo_purchase_request/models/purchase_request.py
View File

@@ -150,6 +150,8 @@ class PurchaseRequestLine(models.Model):
# 如果匹配成功，提取结果
if match:
product_name = match.group(0)
else:
product_name = record.product_id.name
sale_order_name = ''
match_sale = re.search(r'S(\d+)', record.product_id.name)
if match_sale:

2
sf_manufacturing/models/mrp_production.py
View File

@@ -283,6 +283,8 @@ class MrpProduction(models.Model):
# 如果匹配成功，提取结果
if match:
product_name = match.group(0)
else:
product_name = production_id.product_id.name
if production_id.sale_order_id:
sale_order = production_id.sale_order_id
else:

2
sf_manufacturing/models/product_template.py
View File

@@ -799,6 +799,8 @@ class ResProductMo(models.Model):
# 如果匹配成功，提取结果
if match:
product_name = match.group(0)
else:
product_name = record.name
sale_order_name = ''
match_sale = re.search(r'S(\d+)', record.name)
if match_sale:

2
sf_manufacturing/models/purchase_order.py
View File

@@ -212,6 +212,8 @@ class PurchaseOrderLine(models.Model):
# 如果匹配成功，提取结果
if match:
product_name = match.group(0)
else:
product_name = record.product_id.name
sale_order_name = ''
match_sale = re.search(r'S(\d+)', record.product_id.name)
if match_sale:

4
sf_manufacturing/models/stock.py
View File

@@ -861,6 +861,8 @@ class ReStockMove(models.Model):
# 如果匹配成功，提取结果
if match:
product_name = match.group(0)
else:
product_name = move.product_id.name
if move.picking_id.sale_order_id:
sale_order = move.picking_id.sale_order_id
else:
@@ -893,6 +895,8 @@ class ReStockMove(models.Model):
# 如果匹配成功，提取结果
if match:
product_name = match.group(0)
else:
product_name = production_id.product_id.name
if move.picking_id.sale_order_id:
sale_order = move.picking_id.sale_order_id
else: