diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index f28a76c4..d3ec1aa0 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -57,7 +57,6 @@ class ReSaleOrder(models.Model): delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效') - # 业务平台分配工厂后在智能工厂先创建销售订单 def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address, deadline_of_delivery, payments_way, pay_way): @@ -128,7 +127,9 @@ class ReSaleOrder(models.Model): 'price_unit': product.list_price, 'product_uom_qty': item['number'], 'model_glb_file': base64.b64decode(item['model_file']), - 'remark': item.get('remark') + 'remark': item.get('remark'), + 'is_incoming_material': item.get('is_incoming_material'), + 'incoming_size': item.get('incoming_size'), } return self.env['sale.order.line'].with_context(skip_procurement=True).create(vals) @@ -169,6 +170,9 @@ 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('带料尺寸') + @api.depends('product_template_id') def _compute_model_glb_file(self): for line in self: diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml index 61b53b08..be8c469b 100644 --- a/sf_sale/views/sale_order_view.xml +++ b/sf_sale/views/sale_order_view.xml @@ -118,6 +118,8 @@ + + {'readonly': [('state', 'in', ['cancel','sale'])]} @@ -162,6 +164,11 @@ 拒绝接单 + + + + + @@ -265,7 +272,6 @@ - {"search_default_categ_id":1, "search_default_filter_to_sell":1,"sale_multi_pricelist_product_template": 1}