开发

sf_sale/models/sale_order.py

@@ -60,7 +60,7 @@ class ReSaleOrder(models.Model):
 
     # 业务平台分配工厂后在智能工厂先创建销售订单
     def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address,
-                          deadline_of_delivery, payments_way, pay_way):
+                          deadline_of_delivery, payments_way, pay_way, state='sale'):
         now_time = datetime.datetime.now()
         partner = self.get_customer()
         data = {
@@ -69,7 +69,7 @@ class ReSaleOrder(models.Model):
             'name': self.env['ir.sequence'].next_by_code('sale.order', sequence_date=now_time),
             'partner_id': partner.id,
             'check_status': 'approved',
-            'state': 'sale',
+            'state': state,
             'user_id': partner.user_id.id,
             'person_of_delivery': delivery_name,
             'telephone_of_delivery': delivery_telephone,
@@ -133,8 +133,7 @@ class ReSaleOrder(models.Model):
             'product_uom_qty': item['number'],
             'model_glb_file': base64.b64decode(item['model_file']),
             'remark': item.get('remark'),
-            'is_incoming_material': item.get('is_incoming_material'),
-            'incoming_size': item.get('incoming_size'),
+            'is_incoming_material': item.get('is_incoming_material')
         }
         return self.env['sale.order.line'].with_context(skip_procurement=True).create(vals)
 
@@ -175,8 +174,7 @@ class ResaleOrderLine(models.Model):
     check_status = fields.Selection(related='order_id.check_status')
     remark = fields.Char('备注')
 
-    is_incoming_material = fields.Boolean('是否带料', default=False)
-    incoming_size = fields.Char('带料尺寸')
+    is_incoming_material = fields.Boolean('客供料', default=False)
 
     @api.depends('product_template_id')
     def _compute_model_glb_file(self):