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

Accept Merge Request #358: (feature/快速订单Bug修复 -> develop)

Browse Source 
Merge Request: 快速订单Bug修复

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/358?initial=true
This commit is contained in:
杨金灵
2023-08-31 17:38:39 +08:00
committed by Coding
parent e51fc8a68e 7351ea675b
commit c56be1641e
4 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sf_base/views/base_view.xml
View File

@@ -159,11 +159,11 @@
<field name="feed_speed" required="1"/> <field name="feed_speed" required="1"/>
<label for="precision_min" string="X轴定位精度(mm)"/> <label for="precision_min" string="X轴定位精度(mm)"/>
<div class="test_model"> <div class="test_model">
<label for="precision_min" string="最小(min)"/> <label for="precision_min" string="最小"/>
<field name="precision_min" class="o_address_zip" required="1" <field name="precision_min" class="o_address_zip" required="1"
options="{'format': false}"/> options="{'format': false}"/>
<span>&amp;nbsp;</span> <span>&amp;nbsp;</span>
<label for="precision_max" string="最大(max)"/> <label for="precision_max" string="最大"/>
<field name="precision_max" class="o_address_zip" required="1" <field name="precision_max" class="o_address_zip" required="1"
options="{'format': false}"/> options="{'format': false}"/>
</div> </div>
@@ -210,27 +210,28 @@
<field name="motor_power" required="1"/> <field name="motor_power" required="1"/>
<label for="distance_min" string="主轴端面-工作台距离(mm)"/> <label for="distance_min" string="主轴端面-工作台距离(mm)"/>
<div class="test_model"> <div class="test_model">
<label for="distance_min" string="最小(min)"/> <label for="distance_min" string="最小"/>
<field name="distance_min" class="o_address_zip" required="1" <field name="distance_min" class="o_address_zip" required="1"
options="{'format': false}"/> options="{'format': false}"/>
<span>&amp;nbsp;</span> <span>&amp;nbsp;</span>
<label for="distance_max" string="最大(max)"/> <label for="distance_max" string="最大"/>
<field name="distance_max" class="o_address_zip" required="1" <field name="distance_max" class="o_address_zip" required="1"
options="{'format': false}"/> options="{'format': false}"/>
</div> </div>
<field name="guide_rail" required="1"/> <field name="guide_rail" required="1"/>
</group> </group>
<group></group>
<group string="刀具"> <group string="刀具">
<field name="knife_type" required="1"/> <field name="knife_type" required="1"/>
<field name="tool_speed" required="1"/> <field name="tool_speed" required="1"/>
<field name="tool_long_max" required="1"/> <field name="tool_long_max" required="1"/>
<label for="tool_diameter_min" string="刀具刀径(mm)"/> <label for="tool_diameter_min" string="刀具刀径(mm)"/>
<div class="test_model"> <div class="test_model">
<label for="tool_diameter_min" string="最小(min)"/> <label for="tool_diameter_min" string="最小"/>
<field name="tool_diameter_min" class="o_address_zip" required="1" <field name="tool_diameter_min" class="o_address_zip" required="1"
options="{'format': false}"/>Φ options="{'format': false}"/>Φ
<span>&amp;nbsp;</span> <span>&amp;nbsp;</span>
<label for="tool_diameter_max" string="最大(max)"/> <label for="tool_diameter_max" string="最大"/>
<field name="tool_diameter_max" class="o_address_zip" required="1" <field name="tool_diameter_max" class="o_address_zip" required="1"
options="{'format': false}"/>Φ options="{'format': false}"/>Φ
</div> </div>

2
sf_base/views/common_view.xml
View File

@@ -350,7 +350,7 @@
<field name="name">加工工艺</field> <field name="name">加工工艺</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">sf.processing.technology</field> <field name="res_model">sf.processing.technology</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree</field>
</record> </record>
<record id="sf_production_process_category" model="ir.actions.act_window"> <record id="sf_production_process_category" model="ir.actions.act_window">

7
sf_sale/models/quick_easy_order.py
View File

@@ -37,11 +37,11 @@ class QuickEasyOrder(models.Model):
quantity = fields.Integer('数量', default=1) quantity = fields.Integer('数量', default=1)
unit_price = fields.Float('单价') unit_price = fields.Float('单价')
price = fields.Float('总价') price = fields.Float('总价')
model_file = fields.Binary('模型文件') model_file = fields.Binary('glb模型文件')
upload_model_file = fields.Many2many('ir.attachment', 'upload_qf_model_file_attachment_ref', string='模型文件') upload_model_file = fields.Many2many('ir.attachment', 'upload_qf_model_file_attachment_ref', string='上传模型文件')
delivery_time = fields.Date('交货日期') delivery_time = fields.Date('交货日期')
customer_id = fields.Many2one('res.partner', string='客户', default=lambda self: self.env.user.partner_id.id) customer_id = fields.Many2one('res.partner', string='客户', default=lambda self: self.env.user.partner_id.id)
state = fields.Selection([('草稿', '草稿'), ('待付款', '待付款'), ('待派单', '待派单'), state = fields.Selection([('草稿', '草稿'), ('待派单', '待派单'),
('待接单', '待接单'), ('加工中', '加工中'), ('待接单', '待接单'), ('加工中', '加工中'),
('物流中', '物流中'), ('已交付', '已交付')], string='订单状态', default='草稿', ('物流中', '物流中'), ('已交付', '已交付')], string='订单状态', default='草稿',
readonly=True) readonly=True)
@@ -82,6 +82,7 @@ class QuickEasyOrder(models.Model):
obj = super(QuickEasyOrder, self).create(vals) obj = super(QuickEasyOrder, self).create(vals)
self.model_coloring(obj) self.model_coloring(obj)
self.distribute_to_factory(obj) self.distribute_to_factory(obj)
obj.state = '待接单'
return obj return obj
# 将attach的datas内容转为glb文件 # 将attach的datas内容转为glb文件

22
sf_sale/views/quick_easy_order_view.xml
View File

@@ -16,13 +16,16 @@
<field name="model">quick.easy.order</field> <field name="model">quick.easy.order</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="快速订单"> <tree string="快速订单">
<field optional="show" name="name" string="订单号"/> <field name="state" widget="label_selection"
<field optional="show" name="customer_id" string="客户"/> options="{'classes': {'待接单': 'default', '加工中':'primary','物流中':'warning','已交付': 'success'}}"/>
<field optional="show" name="material_id"/> <field name="name" string="订单号"/>
<field optional="show" name="material_model_id"/> <field name="customer_id" string="客户"/>
<field optional="show" name="parameter_ids"/> <field name="material_id"/>
<field optional="show" name="quantity"/> <field name="material_model_id"/>
<field optional="show" name="price"/> <field name="parameter_ids" string="表面工艺参数" widget="many2many_tags"/>
<field name="quantity"/>
<field name="unit_price"/>
<field name="price"/>
<field optional="hide" name="delivery_time"/> <field optional="hide" name="delivery_time"/>
</tree> </tree>
</field> </field>
@@ -33,6 +36,9 @@
<field name="model">quick.easy.order</field> <field name="model">quick.easy.order</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="快速订单"> <form string="快速订单">
<header>
<field name="state" widget="statusbar"/>
</header>
<sheet> <sheet>
<h1> <h1>
<field name="name" readonly="True"/> <field name="name" readonly="True"/>
@@ -81,7 +87,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="快速订单"> <search string="快速订单">
<field name="name" string="模糊搜索" <field name="name" string="模糊搜索"
filter_domain="['|', ('name', 'ilike', self), '|', ('receive_name', 'ilike', self),'|', ('receive_phone', 'ilike', self),('customer_id', 'ilike', self)]"/> filter_domain="['|', ('name', 'ilike', self), '|',('customer_id', 'ilike', self)]"/>
<separator/> <separator/>
<field name="customer_id"/> <field name="customer_id"/>
</search> </search>