jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工艺退回调整

Browse Source
This commit is contained in:
jinling.yang
2024-11-12 09:12:37 +08:00
parent 359fd40ed3 fdcd825142
commit 026bf17a68
23 changed files with 729 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sf_sale/models/sale_order.py
View File

@@ -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,
@@ -134,7 +134,7 @@ class ReSaleOrder(models.Model):
'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'),
'manual_quotation': item.get('manual_quotation')
}
return self.env['sale.order.line'].with_context(skip_procurement=True).create(vals)
@@ -175,8 +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)
incoming_size = 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):

16
sf_sale/views/sale_order_view.xml
View File

@@ -118,8 +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"/>
<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,11 +165,9 @@
<attribute name="string">拒绝接单</attribute>
</xpath>
<!--新增带料字段-->
<xpath expr="//field[@name='order_line']/form//group//group//field[@name='analytic_distribution']"
position="after">
<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="incoming_size"
attrs="{'invisible': [('is_incoming_material', '=', False)],'readonly':1}"/>
</xpath>
</field>
</record>
@@ -219,12 +217,12 @@
<field name="create_date" position="attributes">
<attribute name="string">下单时间</attribute>
</field>
<field name="state" position="after">
<field name="check_status" widget="badge" invisible="1"
<!-- <field name="state" position="after">
<field name="check_status" widget="badge"
decoration-success="check_status == 'approved'"
decoration-warning="check_status == 'pending'"
decoration-danger="check_status == 'fail'"/>
</field>
</field> -->
</field>
</record>