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

Merge Request: 解决工艺外协采购单不显示的问题

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2130

jikimo_purchase_request/models/purchase_request.py

@@ -92,7 +92,7 @@ class PurchaseRequestLine(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)

sf_manufacturing/models/mrp_workorder.py

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

sf_manufacturing/models/sale_order.py

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