From 41e4d2656ad1f57958b9b81f1eb8fcdc39cff05a Mon Sep 17 00:00:00 2001 From: liaodanlong Date: Tue, 22 Apr 2025 13:39:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=94=B3=E8=AF=B7=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_workorder.py | 9 +++++++-- sf_manufacturing/views/mrp_workorder_view.xml | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 3b5d4006..e204a5b5 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -70,13 +70,16 @@ class ResMrpWorkOrder(models.Model): tracking=True) back_button_display = fields.Boolean(default=False, compute='_compute_back_button_display', store=True) pr_mp_count = fields.Integer('采购申请单数量', compute='_compute_pr_mp_count', store=True) + @api.depends('state') def _compute_pr_mp_count(self): for item in self: if not item.is_subcontract: item.pr_mp_count = 0 continue - pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name),('is_subcontract','=','True')]) + pr_ids = self.env['purchase.request'].sudo().search( + [('origin', 'like', item.production_id.name), ('is_subcontract', '=', 'True'), + ('state', '!=', 'rejected')]) if pr_ids: item.pr_mp_count = len(pr_ids) else: @@ -461,7 +464,9 @@ class ResMrpWorkOrder(models.Model): 采购请求 """ self.ensure_one() - pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name),('is_subcontract', '=', True)]) + pr_ids = self.env['purchase.request'].sudo().search( + [('origin', 'like', self.production_id.name), ('is_subcontract', '=', 'True'), + ('state', '!=', 'rejected')]) action = { 'res_model': 'purchase.request', 'type': 'ir.actions.act_window', diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml index 1720a418..b63b7dbd 100644 --- a/sf_manufacturing/views/mrp_workorder_view.xml +++ b/sf_manufacturing/views/mrp_workorder_view.xml @@ -152,7 +152,7 @@ - 采购 + 采购申请