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

Merge branch 'feature/刀具接口调整' into feature/模型优化

Browse Source
This commit is contained in:
yuxianghui
2024-06-17 09:43:00 +08:00
parent 4894576d25 2cc91eea75
commit e1f4e1e701
4 changed files with 57 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sf_tool_management/views/tool_base_views.xml
View File

@@ -434,17 +434,17 @@
<field name="code" optional="hide"/>
<field name="functional_tool_name"/>
<field name="tool_groups_id"/>
<field name="functional_tool_diameter" string="刀具直径"/>
<field name="functional_tool_diameter" string="刀具直径(mm)"/>
<field name="knife_tip_r_angle"/>
<field name="coarse_middle_thin" optional="hide"/>
<field name="new_former" optional="hide"/>
<field name="tool_loading_length" optional="hide"/>
<field name="functional_tool_length" optional="hide"/>
<field name="effective_length" optional="hide"/>
<field name="effective_length" invisible="1"/>
<field name="loading_task_source" string="任务来源"/>
<field name="use_tool_time"/>
<field name="production_line_name_id"/>
<field name="machine_tool_name_id"/>
<field name="production_line_name_id" optional="hide"/>
<field name="machine_tool_name_id" optional="hide"/>
<field name="applicant"/>
<field name="apply_time"/>
<field name="assemble_status" optional="hide"/>
@@ -693,30 +693,29 @@
<field name="arch" type="xml">
<search>
<field name="assembly_order_code"/>
<field name="barcode_id" optional="hide"/>
<field name="code" string="功能刀具编码"/>
<field name="barcode_id"/>
<field name="functional_tool_name"/>
<field name="functional_tool_diameter"/>
<field name="knife_tip_r_angle"/>
<field name="coarse_middle_thin"/>
<field name="new_former"/>
<field name="tool_loading_length"/>
<field name="functional_tool_length"/>
<field name="effective_length"/>
<field name="functional_tool_type_id"/>
<field name="tool_groups_id"/>
<field name="loading_task_source" string="任务来源"/>
<field name="use_tool_time"/>
<field name="production_line_name_id"/>
<field name="machine_tool_name_id"/>
<field name="applicant"/>
<field name="apply_time"/>
<field name="functional_tool_type_id"/>
<filter name="no_assemble_status" string="未组装" domain="[('assemble_status', '=', '0')]"/>
<filter name="yes_assemble_status" string="已组装" domain="[('assemble_status', '=', '1')]"/>
<separator/>
<filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
<searchpanel>
<field name="functional_tool_type_id" enable_counters="1" icon="fa-filter"/>
<!-- <field name="assemble_status" enable_counters="1" icon="fa-filter"/>-->
</searchpanel>
<group expand="0" string="Group By...">
<filter string="功能刀具名称" name="name" domain="[]" context="{'group_by': 'functional_tool_name'}"/>
<filter string="刀具组" name="tool_groups" domain="[]" context="{'group_by': 'tool_groups_id'}"/>
<filter string="任务来源" name="loading_task_source" domain="[]" context="{'group_by': 'loading_task_source'}"/>
<filter string="用刀时间" name="use_tool_time" domain="[]" context="{'group_by': 'use_tool_time'}"/>
</group>
</search>
</field>
</record>