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

Accept Merge Request #2130: (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/2130
This commit is contained in:
胡尧
2025-05-15 16:49:05 +08:00
committed by Coding
parent 0821ed021a a3c0fd3ccf
commit 14700d6bf0
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jikimo_purchase_request/models/purchase_request.py
View File

@@ -92,7 +92,7 @@ class PurchaseRequestLine(models.Model):
continue continue
if record.product_id.categ_id.name == '坯料': if record.product_id.categ_id.name == '坯料':
product_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: if match:
product_name = match.group(0) product_name = match.group(0)

6
sf_manufacturing/models/mrp_workorder.py
View File

@@ -440,12 +440,12 @@ class ResMrpWorkOrder(models.Model):
action['context'] = dict(self._context, default_origin=self.name) action['context'] = dict(self._context, default_origin=self.name)
return action return action
@api.depends('state', 'production_id.name')
def _compute_surface_technics_purchase_ids(self): def _compute_surface_technics_purchase_ids(self):
for order in self: for order in self:
if order.routing_type == '表面工艺' and order.state not in ['cancel']: if order.routing_type == '表面工艺' and order.state not in ['cancel']:
domain = [('group_id', '=', self.production_id.procurement_group_id.id), domain = [('purchase_type', '=', 'consignment'),
('purchase_type', '=', 'consignment'), ('state', '!=', 'cancel')] ('origin', 'like', '%' + self.production_id.name + '%'),
('state', '!=', 'cancel')]
# domain = [('purchase_type', '=', 'consignment'), # domain = [('purchase_type', '=', 'consignment'),
# ('origin', 'like', '%' + self.production_id.name + '%'), # ('origin', 'like', '%' + self.production_id.name + '%'),
# ('state', '!=', 'cancel')] # ('state', '!=', 'cancel')]

2
sf_manufacturing/models/sale_order.py
View File

@@ -76,7 +76,7 @@ class SaleOrder(models.Model):
'embryo_redundancy_id': line.embryo_redundancy_id, 'embryo_redundancy_id': line.embryo_redundancy_id,
} }
product_name = '' product_name = ''
match = re.search(r'(S\d{5}-\d*)', product.name) match = re.search(r'(S\d{5}-\d+)', product.name)
# 如果匹配成功，提取结果 # 如果匹配成功，提取结果
if match: if match:
product_name = match.group(0) product_name = match.group(0)