Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单（工艺退回调整）

sf_sale/models/sale_order.py

@@ -133,7 +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'),
+            'embryo_redundancy_id': item.get('embryo_redundancy_id'),
             'manual_quotation': item.get('manual_quotation')
         }
         return self.env['sale.order.line'].with_context(skip_procurement=True).create(vals)
@@ -175,7 +175,8 @@ class ResaleOrderLine(models.Model):
     check_status = fields.Selection(related='order_id.check_status')
     remark = fields.Char('备注')
 
-    is_incoming_material = fields.Boolean('客供料', default=False)
+    # is_incoming_material = fields.Boolean('客供料', default=False)
+    embryo_redundancy_id = fields.Many2one('sf.embryo.redundancy', '坯料冗余')
     manual_quotation = fields.Boolean('人工编程', default=False)
 
     @api.depends('product_template_id')

sf_sale/views/sale_order_view.xml

@@ -119,7 +119,7 @@
                     <field name="name" widget="section_and_note_text" optional="show"
                            string="参数说明(长/宽/高/体积/精度/材质)"/>
                     <field name="manual_quotation" readonly="1"/>
-                    <field name="is_incoming_material" readonly="1"/>
+                    <field name="embryo_redundancy_id" readonly="1"/>
                 </xpath>
                 <field name="user_id" position="attributes">
                     <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
@@ -167,7 +167,7 @@
                 <!--新增带料字段-->
                  <xpath expr="//field[@name='order_line']/form//group//group//field[@name='analytic_distribution']" position="after">
                     <field name="manual_quotation" />
-                    <field name="is_incoming_material"/>
+                    <field name="embryo_redundancy_id"/>
                 </xpath>
             </field>
         </record>