This commit is contained in:
胡尧
2024-11-11 10:22:53 +08:00
parent 2798ce6183
commit 0f37b45b30
26 changed files with 70 additions and 357 deletions

View File

@@ -133,7 +133,8 @@ 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')
'is_incoming_material': item.get('is_incoming_material'),
'manual_quotation': item.get('manual_quotation')
}
return self.env['sale.order.line'].with_context(skip_procurement=True).create(vals)
@@ -175,6 +176,7 @@ class ResaleOrderLine(models.Model):
remark = fields.Char('备注')
is_incoming_material = fields.Boolean('客供料', default=False)
manual_quotation = fields.Boolean('人工编程', default=False)
@api.depends('product_template_id')
def _compute_model_glb_file(self):

View File

@@ -118,7 +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"/>
<field name="manual_quotation" readonly="1"/>
<field name="is_incoming_material" readonly="1"/>
</xpath>
<field name="user_id" position="attributes">
<attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
@@ -165,6 +166,7 @@
</xpath>
<!--新增带料字段-->
<xpath expr="//field[@name='order_line']/form//group//group//field[@name='analytic_distribution']" position="after">
<field name="manual_quotation" />
<field name="is_incoming_material"/>
</xpath>
</field>