sf销售订单详情新增是否带料，带料尺寸，修改bfm分配工厂，sf接收订单生成销售订单新增两个字段，并修改订单详情及订单详情表单新增字段显示

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:

sf_sale/views/sale_order_view.xml

@@ -118,6 +118,8 @@
                 <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="replace">
                     <field name="name" widget="section_and_note_text" optional="show"
                            string="参数说明(长/宽/高/体积/精度/材质)"/>
+                    <field name="is_incoming_material" optional="hide"/>
+                    <field name="incoming_size" optional="hide"/>
                 </xpath>
                 <field name="user_id" position="attributes">
                     <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
@@ -162,6 +164,11 @@
                 <xpath expr="//button[@name='action_cancel']" position="attributes">
                     <attribute name="string">拒绝接单</attribute>
                 </xpath>
+                <!--新增带料字段-->
+                 <xpath expr="//field[@name='order_line']/form//group//group//field[@name='analytic_distribution']" position="after">
+                    <field name="is_incoming_material"/>
+                    <field name="incoming_size" attrs="{'invisible': [('is_incoming_material', '=', False)],'readonly':1}"/>
+                </xpath>
             </field>
         </record>
 
@@ -265,7 +272,6 @@
                 </field>
             </field>
         </record>
-
         <record id="sale.product_template_action" model="ir.actions.act_window">
             <field name="context">{"search_default_categ_id":1,
                 "search_default_filter_to_sell":1,"sale_multi_pricelist_product_template": 1}