解决冲突

sf_sale/models/quick_easy_order_old.py

@@ -228,6 +228,7 @@ class QuickEasyOrder(models.Model):
                     'quality_standard_mimetype': '',
                     'machining_drawings': item.machining_drawings,
                     'quality_standard': '',
+                    'part_name': '',
                 })
             # res['bfm_process_order_list'] = json.dumps(res['bfm_process_order_list'])
             product_id = self.env.ref('sf_dlm.product_template_sf').sudo()

sf_sale/models/sale_order.py

@@ -208,7 +208,8 @@ class RePurchaseOrder(models.Model):
         compute='_compute_user_id',
         store=True)
 
-    purchase_type = fields.Selection([('standard', '标准采购'), ('consignment', '委外加工')], string='采购类型', default='standard')
+    purchase_type = fields.Selection([('standard', '标准采购'), ('consignment', '委外加工')], string='采购类型',
+                                     default='standard')
 
     @api.depends('partner_id')
     def _compute_user_id(self):
@@ -273,6 +274,7 @@ class RePurchaseOrder(models.Model):
                 'partner_id': server_template.seller_ids.partner_id.id,
                 'origin': ','.join(production_process),
                 'state': 'draft',
+                'purchase_type': 'consignment',
                 'order_line': server_product_process})
             # self.env.cr.commit()