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

1、功能刀具列表模型新增大量字段，新增计算库存数量方法，新增查看当前功能刀具的预警记录按键；2、重构功能刀具预警模型（已完成）；3、功能刀具组装模型name字段展示内容改为功能刀具名称；

Browse Source
This commit is contained in:
yuxianghui
2023-11-22 17:19:25 +08:00
parent 8a1dfe14e6
commit 83da8f58e2
6 changed files with 270 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sf_tool_management/views/menu_view.xml
View File

@@ -13,7 +13,7 @@
name="功能刀具列表"
sequence="4"
action="sf_function_tool_entry_list_view_act"
/>
/>
<menuitem
@@ -22,7 +22,7 @@
name="功能刀具预警"
sequence="5"
action="action_sf_functional_tool_warning"
/>
/>
<menuitem
sequence="6"
@@ -30,22 +30,22 @@
id="menu_sf_functional_tool_real_time_distribution"
action="sf_real_time_distribution_of_functional_tools_view_act"
parent="menu_sf_tool_manage"
/>
/>
<!-- <menuitem-->
<!-- sequence="10"-->
<!-- name="功能刀具出入库记录"-->
<!-- id="menu_sf_function_tool_entry_exit_records"-->
<!-- action="sf_inbound_and_outbound_records_of_functional_tools_view_act"-->
<!-- parent="menu_sf_tool_manage"-->
<!-- />-->
<menuitem
sequence="10"
name="功能刀具出入库记录"
id="menu_sf_function_tool_entry_exit_records"
action="sf_inbound_and_outbound_records_of_functional_tools_view_act"
parent="menu_sf_tool_manage"
/>
<menuitem
sequence="0"
name="功能刀具计划"
id="menu_sf_function_tool_plan"
parent="menu_sf_tool_manage"
/>
/>
<menuitem
sequence="10"
@@ -53,7 +53,7 @@
id="menu_sf_cam_work_order_program_knife_plan"
action="sf_cam_work_order_program_knife_plan_view_act"
parent="menu_sf_function_tool_plan"
/>
/>
<menuitem
sequence="0"
@@ -61,7 +61,7 @@
id="menu_sf_machine_table_tool_changing_apply"
action="sf_machine_table_tool_changing_apply_view_act"
parent="menu_sf_function_tool_plan"
/>
/>
<menuitem
sequence="2"
@@ -69,8 +69,7 @@
id="menu_sf_functional_tool_assembly"
action="sf_functional_tool_assembly_view_act"
parent="menu_sf_tool_manage"
/>
/>
</data>
</odoo>
</odoo>

283
sf_tool_management/views/tool_base_views.xml
View File

@@ -9,14 +9,24 @@
<tree string="功能刀具列表" create="0" edit="0" delete="0">
<field name="barcode_id"/>
<field name="functional_tool_name_id"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id" optional="hide"/>
<field name="cutting_tool_blade_model_id" optional="hide"/>
<field name="cutting_tool_cutterbar_model_id" optional="hide"/>
<field name="cutting_tool_cutterpad_model_id" optional="hide"/>
<field name="cutting_tool_cutterhandle_model_id" optional="hide"/>
<field name="cutting_tool_cutterhead_model_id" optional="hide"/>
<field name="image" widget='image'/>
<field name="functional_tool_diameter"/>
<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="tool_room_num"/>
<field name="line_edge_knife_library_num"/>
<field name="machine_knife_library_num"/>
<field name="max_lifetime_value"/>
<field name="alarm_value"/>
<field name="used_value"/>
<field name="functional_tool_status"/>
<field name="current_location_id" invisible="True"/>
<field name="sf_cutting_tool_type_id" invisible="True"/>
</tree>
</field>
</record>
@@ -26,6 +36,9 @@
<field name="model">sf.functional.cutting.tool.entity</field>
<field name="arch" type="xml">
<form create="0" edit="0" delete="0">
<header>
<field name="functional_tool_status" widget="statusbar" statusbar_visible="正常,报警,已拆除"/>
</header>
<sheet>
<div class="oe_button_box" name="button_box">
<button class="oe_stat_button"
@@ -34,7 +47,7 @@
type="object">
<div class="o_field_widget o_stat_info">
<span>
预警
预警记录
</span>
</div>
</button>
@@ -50,7 +63,7 @@
<group>
<field name="functional_tool_name_id" invisible="False"
placeholder="请输入20字以内的名称"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="sf_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id"
options="{'no_create': True, 'no_quick_create': True}"
attrs="{'invisible': [('cutting_tool_blade_model_id', '!=', False)]}"
@@ -71,42 +84,11 @@
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="cutting_tool_cutterhead_model_id"
options="{'no_create': True, 'no_quick_create': True}"/>
<!-- <field name="functional_cutting_tool_id"/>-->
<!-- <field name="cutting_tool_material" required="1" widget="radio"-->
<!-- options="{'horizontal': true}"/>-->
<!-- <field name="mrs_cutting_tool_integral_model_ids"-->
<!-- options="{'no_create': True, 'no_quick_create': True}"-->
<!-- widget="many2many_tags"-->
<!-- attrs="{'invisible': [('cutting_tool_material', '!=', '0')]}"-->
<!-- />-->
<!-- <field name="mrs_cutting_tool_blade_model_ids"-->
<!-- options="{'no_create': True, 'no_quick_create': True}"-->
<!-- widget="many2many_tags"-->
<!-- attrs="{'invisible': [('cutting_tool_material', '!=', '1')]}"-->
<!-- />-->
<!-- <field name="mrs_cutting_tool_cutterbar_model_ids"-->
<!-- options="{'no_create': True, 'no_quick_create': True}"-->
<!-- widget="many2many_tags"-->
<!-- attrs="{'invisible': ['|',('mrs_cutting_tool_cutterpad_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"-->
<!-- />-->
<!-- <field name="mrs_cutting_tool_cutterpad_model_ids"-->
<!-- options="{'no_create': True, 'no_quick_create': True}"-->
<!-- widget="many2many_tags"-->
<!-- attrs="{'invisible': ['|',('mrs_cutting_tool_cutterbar_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"-->
<!-- />-->
<!-- <field name="mrs_cutting_tool_cutterhandle_model_ids"-->
<!-- options="{'no_create': True, 'no_quick_create': True}"-->
<!-- widget="many2many_tags"/>-->
<!-- <field name="mrs_cutting_tool_cutterhead_model_ids"-->
<!-- options="{'no_create': True, 'no_quick_create': True}"-->
<!-- widget="many2many_tags"/>-->
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
</group>
</group>
<!-- attrs="{'invisible': [('cutting_tool_blade_model_id', '!=', False)]}"-->
<group col="1">
<group string="适合加工方式">
<field name="suitable_machining_method_ids" string=""
@@ -139,18 +121,24 @@
<page string='参数'>
<group>
<group>
<field name="diameter"/>
<field name="tool_grade"/>
<field name="machining_accuracy"/>
<field name="tool_length"/>
<field name="blade_number"/>
<field name="functional_tool_diameter"/>
<field name="knife_tip_r_angle"/>
<field name="whether_standard_knife"/>
<field name="coarse_middle_thin"/>
<field name="max_lifetime_value"/>
<field name="alarm_value"/>
<field name="used_value"/>
<field name="current_location_id"/>
</group>
<group>
<field name="integral_blade_length"/>
<field name="effective_blade_length"/>
<field name="max_life"/>
<field name="is_standard" default="false"/>
<field name="applicable_range"/>
<field name="tool_loading_length"/>
<field name="functional_tool_length"/>
<field name="effective_length"/>
<field name="L_D_number"/>
<field name="hiding_length"/>
<field name="cut_time"/>
<field name="cut_length"/>
<field name="cut_number"/>
</group>
</group>
</page>
@@ -167,15 +155,28 @@
<search>
<field name="barcode_id"/>
<field name="functional_tool_name_id"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id" optional="hide"/>
<field name="cutting_tool_blade_model_id" optional="hide"/>
<field name="cutting_tool_cutterbar_model_id" optional="hide"/>
<field name="cutting_tool_cutterpad_model_id" optional="hide"/>
<field name="cutting_tool_cutterhandle_model_id" optional="hide"/>
<field name="cutting_tool_cutterhead_model_id" optional="hide"/>
<field name="image" widget='image'/>
<field name="functional_tool_diameter"/>
<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="tool_room_num"/>
<field name="line_edge_knife_library_num"/>
<field name="machine_knife_library_num"/>
<field name="max_lifetime_value"/>
<field name="alarm_value"/>
<field name="used_value"/>
<field name="functional_tool_status" optional="hide"/>
<field name="current_location_id" invisible="True"/>
<field name="sf_cutting_tool_type_id" invisible="True"/>
<searchpanel>
<field name="mrs_cutting_tool_type_id" icon="fa-building" enable_counters="1"/>
<field name="sf_cutting_tool_type_id" icon="fa-building" enable_counters="1"/>
<field name="current_location_id" icon="fa-building" enable_counters="1"/>
<field name="functional_tool_status" icon="fa-building" enable_counters="1"/>
</searchpanel>
</search>
</field>
@@ -194,148 +195,54 @@
<field name="name">sf.functional.tool.warning.tree</field>
<field name="model">sf.functional.tool.warning</field>
<field name="arch" type="xml">
<tree string="功能刀具预警" create="0" edit="0" delete="0">
<tree string="功能刀具预警" create="1" edit="1" delete="1" editable="bottom">
<field name="production_line_id" optional="hide"/>
<field name="maintenance_equipment_id" optional="hide"/>
<field name="machine_tool_code"/>
<field name="cutter_spacing_code_id"/>
<field name="barcode_id"/>
<field name="functional_tool_name_id"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id" optional="hide"/>
<field name="cutting_tool_blade_model_id" optional="hide"/>
<field name="cutting_tool_cutterbar_model_id" optional="hide"/>
<field name="cutting_tool_cutterpad_model_id" optional="hide"/>
<field name="cutting_tool_cutterhandle_model_id" optional="hide"/>
<field name="cutting_tool_cutterhead_model_id" optional="hide"/>
<field name="machine_tool_code" optional="show"/>
<field name="cutting_tool_code" optional="show"/>
<field name="alarm_value" optional="hide"/>
<field name="alarm_type" optional="show"/>
<field name="alarm_time" optional="show"/>
<field name="dispose_user" optional="show"/>
<field name="dispose_time" optional="show"/>
<field name="dispose_func" optional="hide"/>
<field name="remark" optional="show"/>
<field name="diameter"/>
<field name="knife_tip_r_angle"/>
<field name="install_tool_time" optional="hide"/>
<field name="on_board_time" optional="hide"/>
<field name="max_lifetime_value"/>
<field name="alarm_value"/>
<field name="used_value"/>
<field name="functional_tool_status"/>
<field name="alarm_time"/>
<field name="dispose_user"/>
<field name="dispose_time"/>
<field name="dispose_func"/>
</tree>
</field>
</record>
<record id="view_sf_functional_tool_warning_form" model="ir.ui.view">
<field name="name">sf.functional.tool.warning.form</field>
<field name="model">sf.functional.tool.warning</field>
<field name="arch" type="xml">
<form string="功能刀具预警" create="0" edit="0" delete="0">
<sheet>
<div class="oe_title">
<h1>
<field name="barcode_id" readonly="1"/>
</h1>
</div>
<group>
<group>
<field name="functional_tool_name_id" invisible="False"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id"
options="{'no_create': True, 'no_quick_create': True}"
attrs="{'invisible': [('cutting_tool_blade_model_id', '!=', False)]}"
/>
<field name="cutting_tool_blade_model_id"
options="{'no_create': True, 'no_quick_create': True}"
attrs="{'invisible': [('cutting_tool_integral_model_id', '!=', False)]}"
/>
<field name="cutting_tool_cutterbar_model_id"
options="{'no_create': True, 'no_quick_create': True}"
attrs="{'invisible': ['|',('cutting_tool_cutterpad_model_id','!=',False),('cutting_tool_blade_model_id', '=', False)]}"
/>
<field name="cutting_tool_cutterpad_model_id"
options="{'no_create': True, 'no_quick_create': True}"
attrs="{'invisible': ['|',('cutting_tool_cutterbar_model_id','!=',False),('cutting_tool_blade_model_id', '=', False)]}"
/>
<field name="cutting_tool_cutterhandle_model_id"
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="cutting_tool_cutterhead_model_id"
options="{'no_create': True, 'no_quick_create': True}"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
</group>
</group>
<notebook>
<page string="预警信息">
<group>
<group>
<field name="machine_tool_code"/>
<field name="install_tool_time"/>
<field name="outbound_time"/>
<field name="used_value"/>
<field name="alarm_type"/>
<field name="alarm_time"/>
<field name="alarm_value"/>
</group>
<group>
<field name="cutting_tool_code"/>
<field name="on_board_time"/>
<field name="idle_time"/>
<field name="dispose_user"/>
<field name="dispose_time"/>
<field name="dispose_func"/>
</group>
</group>
</page>
<page string="参数信息">
<group>
<group>
<field name="diameter"/>
<field name="tool_grade"/>
<field name="machining_accuracy"/>
<field name="tool_length"/>
<field name="blade_number"/>
</group>
<group>
<field name="integral_blade_length"/>
<field name="effective_blade_length"/>
<field name="max_life"/>
<field name="is_standard" default="false"/>
<field name="applicable_range"/>
</group>
</group>
</page>
<page string="其他信息">
<group>
<field name="remark"/>
</group>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
<record id="view_sf_functional_tool_warning_search" model="ir.ui.view">
<field name="name">sf.functional.tool.warning.search</field>
<field name="model">sf.functional.tool.warning</field>
<field name="arch" type="xml">
<search string="功能刀具预警">
<field name="machine_tool_code"/>
<field name="cutter_spacing_code_id"/>
<field name="barcode_id"/>
<field name="functional_tool_name_id"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id" optional="hide"/>
<field name="cutting_tool_blade_model_id" optional="hide"/>
<field name="cutting_tool_cutterbar_model_id" optional="hide"/>
<field name="cutting_tool_cutterpad_model_id" optional="hide"/>
<field name="cutting_tool_cutterhandle_model_id" optional="hide"/>
<field name="cutting_tool_cutterhead_model_id" optional="hide"/>
<field name="machine_tool_code" optional="show"/>
<field name="cutting_tool_code" optional="show"/>
<field name="alarm_value" optional="show"/>
<field name="alarm_type" optional="show"/>
<field name="alarm_time" optional="show"/>
<field name="dispose_user" optional="show"/>
<field name="dispose_time" optional="show"/>
<field name="dispose_func" optional="show"/>
<field name="remark" optional="show"/>
<field name="diameter"/>
<field name="knife_tip_r_angle"/>
<field name="install_tool_time" optional="hide"/>
<field name="on_board_time" optional="hide"/>
<field name="max_lifetime_value"/>
<field name="alarm_value"/>
<field name="used_value"/>
<field name="functional_tool_status"/>
<field name="alarm_time"/>
<field name="dispose_user"/>
<field name="dispose_time"/>
<field name="dispose_func"/>
<field name="production_line_id" invisible="True"/>
<searchpanel>
<field name="machine_table_name_id" string="CNC机床列表" icon="fa-building"
enable_counters="1"/>
<field name="production_line_id" icon="fa-building" enable_counters="1"/>
<field name="functional_tool_status" icon="fa-building" enable_counters="1"/>
</searchpanel>
</search>
</field>
@@ -345,7 +252,7 @@
<field name="name">功能刀具预警</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.functional.tool.warning</field>
<field name="view_mode">tree,form,search</field>
<field name="view_mode">tree,search</field>
</record>
@@ -1114,6 +1021,7 @@
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
type="action"
context="{'default_name':name,
'default_assembly_order_code':assembly_order_code,
'default_production_line_name_id':production_line_name_id,
'default_machine_tool_name_id':machine_tool_name_id,
'default_cutter_spacing_code_id':cutter_spacing_code_id,
@@ -1150,6 +1058,7 @@
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
type="action"
context="{'default_name':name,
'default_assembly_order_code':assembly_order_code,
'default_production_line_name_id':production_line_name_id,
'default_machine_tool_name_id':machine_tool_name_id,
'default_cutter_spacing_code_id':cutter_spacing_code_id,