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

Merge Request: 工艺相关展示调整

Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2027

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',