Merge branch 'feature/平台下单优化' into feature/平台下单优化_1

sf_manufacturing/models/product_template.py

@@ -26,6 +26,7 @@ class ResProductMo(models.Model):
     model_file = fields.Binary('模型文件')
     categ_type = fields.Selection(string='产品的类别', related='categ_id.type', store=True)
     model_name = fields.Char('模型名称')
+    blank_type = fields.Selection([('圆料', '圆料'), ('方料', '方料')], string='坯料分类')
     model_long = fields.Float('模型长(mm)', digits=(16, 3))
     model_width = fields.Float('模型宽(mm)', digits=(16, 3))
     model_height = fields.Float('模型高(mm)', digits=(16, 3))
@@ -895,6 +896,7 @@ class ResProductMo(models.Model):
         product_name = self.generate_product_name(order_id, item, i)
         vals = {
             'name': product_name,
+            'blank_type': item.get('blank_type'),
             'model_long': self.format_float(item['model_long'] + embryo_redundancy_id.long),
             'model_width': self.format_float(item['model_width'] + embryo_redundancy_id.width),
             'model_height': self.format_float(item['model_height'] + embryo_redundancy_id.height),

sf_manufacturing/models/sale_order.py

@@ -193,6 +193,19 @@ class SaleOrder(models.Model):
             'target': 'new',
             'res_id': wizard.id,
         }
+
+    def write_sale_documents(self, kw):
+        """BFM 内部下单 内容补充 """
+        val = {}
+        if kw.get('contract_file_name') and kw.get('contract_file'):
+            document_id = self.create_sale_documents(kw.get('contract_file_name'), kw.get('contract_file'))
+            val.update({'contract_document_id': document_id.id})
+        if kw.get('contract_code') or kw.get('contract_date'):
+            val.update({'contract_code': kw.get('contract_code'), 'contract_date': kw.get('contract_date')})
+        if kw.get('customer_name'):
+            val.update({'customer_name': kw.get('customer_name')})
+        self.write(val)
+
     def create_sale_documents(self, contract_file_name, contract_file):
         # 创建ir.attachment记录
         attachment = self.env['ir.attachment'].sudo().create({
@@ -214,9 +227,7 @@ class SaleOrder(models.Model):
             'res_id': self.id,
         })
 
-        self.write({
-            'contract_document_id': document.id
-        })
+        return document
 
 class SaleOrderLine(models.Model):
     _inherit = 'sale.order.line'