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

1、功能刀具清单模型添加功能刀具类型、加工材料、寿命字段；2、删除供应商的地址和email必填；3、优化功能刀具组装单模型，新增五种物料的货位字段，修改继承关系，添加根据货位获取刀具物料信息功能；

Browse Source
This commit is contained in:
yuxianghui
2024-04-09 16:53:15 +08:00
parent 0a4c86f601
commit 85649daef6
6 changed files with 94 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sf_base/models/tool_base_new.py
View File

@@ -316,6 +316,7 @@ class ToolInventory(models.Model):
name = fields.Char('功能刀具名称', required=True)
type = fields.Char('类型')
functional_cutting_tool_model_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型')
prefix = fields.Char('前缀')
postfix = fields.Char('后缀')
diameter = fields.Float('直径(mm)')
@@ -326,6 +327,8 @@ class ToolInventory(models.Model):
cutter_number = fields.Char('刀号')
blade_number = fields.Integer('刃数(个)')
extension = fields.Float('伸出长度(mm)')
work_material = fields.Selection([('钢', '钢'), ('铝', '铝')], string='加工材料')
life_span = fields.Float('寿命(h)')
tool_groups_id = fields.Many2one('sf.tool.groups', string='刀具组')

15
sf_base/views/tool_views.xml
View File

@@ -556,20 +556,23 @@
<field name="arch" type="xml">
<tree string="功能刀具清单" create="1" edit="1" delete="0" editable="bottom">
<field name="name"/>
<field name="type"/>
<field name="functional_cutting_tool_model_id"/>
<field name="tool_groups_id"/>
<field name="prefix"/>
<field name="postfix"/>
<field name="work_material"/>
<field name="life_span"/>
<field name="prefix" optional="hide"/>
<field name="postfix" optional="hide"/>
<field name="diameter"/>
<field name="angle"/>
<field name="tool_length"/>
<field name="blade_length"/>
<field name="knife_head_name"/>
<field name="knife_head_name" optional="hide"/>
<field name="cutter_number"/>
<field name="blade_number"/>
<field name="extension"/>
<field name="create_uid" string="创建人" optional="hide"/>
<field name="create_date" string="创建时间" optional="hide"/>
<field name="type" invisible="1"/>
</tree>
</field>
</record>
@@ -580,8 +583,10 @@
<field name="arch" type="xml">
<search string="功能刀具清单">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="type"/>
<field name="functional_cutting_tool_model_id"/>
<field name="tool_groups_id"/>
<field name="work_material"/>
<field name="life_span"/>
<field name="prefix"/>
<field name="postfix"/>
<field name="diameter"/>