创建胚料的bug修复

sf_sale/models/sale_order.py

@@ -15,20 +15,23 @@ class ReSaleOrder(models.Model):
     # 业务平台分配工厂后在智能工厂先创建销售订单
 
     def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address,
-                          deadline_of_delivery):
+                          deadline_of_delivery,user_id):
         now_time = datetime.datetime.now()
+        partner = self.env.user.partner_id
+        logging.info('partner:%s' % partner)
         order_id = self.env['sale.order'].sudo().create({
             'company_id': company_id.id,
             'date_order': now_time,
             'name': self.env['ir.sequence'].next_by_code('sale.order', sequence_date=now_time),
-            'partner_id': 1,
-            'state': 'sale',
-            'user_id': 1,
+            'partner_id': partner.id,
+            'state': 'draft',
+            'user_id': user_id.id,
             'person_of_delivery': delivery_name,
             'telephone_of_delivery': delivery_telephone,
             'address_of_delivery': delivery_address,
             'deadline_of_delivery': deadline_of_delivery
         })
+        logging.info('sale_order_create:%s' % order_id)
         return order_id
 
     # 业务平台分配工厂时在创建完产品后再创建销售明细信息
@@ -36,10 +39,11 @@ class ReSaleOrder(models.Model):
         vals = {
             'order_id': self.id,
             'product_id': product.id,
-            'name': '%s/%s/%s/%s/%s' % (
-            item['model_long'], item['model_width'], item['model_height'], item['model_volume'],
-            product.materials_id.name),
-            'price_unit': item['price'],
+            'name': '%s/%s/%s/%s/%s/%s' % (
+                product.model_long, product.model_width, product.model_height, product.model_volume,
+                product.model_machining_precision,
+                product.materials_id.name),
+            'price_unit': product.list_price,
             'product_uom_qty': item['number']
         }
         return self.env['sale.order.line'].create(vals)