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

Accept Merge Request #2131: (feature/6694 -> develop)

Browse Source 
Merge Request: 解决库存单据零件图号零件名称不对的问题

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2131?initial=true
This commit is contained in:
胡尧
2025-05-16 09:15:46 +08:00
committed by Coding
parent 14700d6bf0 4b443e65f6
commit b626cbe217
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_manufacturing/models/mrp_production.py
View File

@@ -279,7 +279,7 @@ class MrpProduction(models.Model):
production_id.part_name = production_id.product_id.part_name
elif production_id.product_id.categ_id.type == '坯料':
product_name = ''
match = re.search(r'(S\d{5}-\d)', production_id.product_id.name)
match = re.search(r'(S\d{5}-\d+)', production_id.product_id.name)
# 如果匹配成功，提取结果
if match:
product_name = match.group(0)

2
sf_manufacturing/models/product_template.py
View File

@@ -795,7 +795,7 @@ class ResProductMo(models.Model):
for record in self:
if record.categ_id.name == '坯料':
product_name = ''
match = re.search(r'(S\d{5}-\d)', record.name)
match = re.search(r'(S\d{5}-\d+)', record.name)
# 如果匹配成功，提取结果
if match:
product_name = match.group(0)

2
sf_manufacturing/models/purchase_order.py
View File

@@ -208,7 +208,7 @@ class PurchaseOrderLine(models.Model):
continue
if record.product_id.categ_id.name == '坯料':
product_name = ''
match = re.search(r'(S\d{5}-\d)', record.product_id.name)
match = re.search(r'(S\d{5}-\d+)', record.product_id.name)
# 如果匹配成功，提取结果
if match:
product_name = match.group(0)

4
sf_manufacturing/models/stock.py
View File

@@ -849,7 +849,7 @@ class ReStockMove(models.Model):
move.part_name = move.product_id.part_name
elif move.product_id.categ_id.type == '坯料':
product_name = ''
match = re.search(r'(S\d{5}-\d)', move.product_id.name)
match = re.search(r'(S\d{5}-\d+)', move.product_id.name)
# 如果匹配成功，提取结果
if match:
product_name = match.group(0)
@@ -881,7 +881,7 @@ class ReStockMove(models.Model):
continue
product_name = ''
logging.info('制造订单的产品 %s', production_id.product_id.name)
match = re.search(r'(S\d{5}-\d)', production_id.product_id.name)
match = re.search(r'(S\d{5}-\d+)', production_id.product_id.name)
# 如果匹配成功，提取结果
if match:
product_name = match.group(0)