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

1、基于原生的移动历史重构功能刀具出入库记录模型；2、功能刀具列表模型新增查询当前功能刀具出入库记录按钮；3、删除旧的功能刀具出入库记录模型和出入库记录人模型；4、机台换刀申请模型的功能刀具名称字段改为绑定功能刀具组装单；5、优化功能刀具组装单确认组装功能的创建移动历史记录功能。

Browse Source
This commit is contained in:
yuxianghui
2023-11-23 17:15:34 +08:00
parent ca61537e21
commit 97d760cd56
10 changed files with 110 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_tool_management/views/menu_view.xml
View File

@@ -25,15 +25,15 @@
/>
<menuitem
sequence="6"
name="功能刀具实时分布"
sequence="10"
name="功能刀具安全库存"
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"
sequence="6"
name="功能刀具出入库记录"
id="menu_sf_function_tool_entry_exit_records"
action="sf_inbound_and_outbound_records_of_functional_tools_view_act"

231
sf_tool_management/views/tool_base_views.xml
View File

@@ -51,8 +51,16 @@
</span>
</div>
</button>
<button name="%(stock.action_stock_report)d" icon="fa-arrow-up" class="oe_stat_button"
string="Traceability" type="action"/>
<button class="oe_stat_button"
name="open_stock_move_line"
icon="fa-list-ul"
type="object">
<div class="o_field_widget o_stat_info">
<span>
出库入库记录
</span>
</div>
</button>
</div>
<div class="oe_title">
<h1>
@@ -416,136 +424,43 @@
<record id="sf_inbound_and_outbound_records_of_functional_tools_view_tree" model="ir.ui.view">
<field name="name">功能刀具出入库记录</field>
<field name="model">sf.inbound.and.outbound.records.of.functional.tools</field>
<field name="model">stock.move.line</field>
<field name="arch" type="xml">
<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="current_state"/>
<field name="current_store_area"/>
<field name="current_store_place"/>
<!-- <field name="applicant"/>-->
<field name="reference" string="单据号"/>
<field name="lot_id" string="功能刀具序列号"/>
<field name="functional_tool_name_id" string="功能刀具名称"/>
<field name="diameter"/>
<field name="knife_tip_r_angle"/>
<field name="install_tool_time"/>
<field name="location_id"/>
<field name="location_dest_id"/>
<field name="date"/>
<field name="qty_done" string="数量"/>
<field name="functional_tool_type_id" invisible="True"/>
</tree>
</field>
</record>
<record id="sf_inbound_and_outbound_records_of_functional_tools_view_form" model="ir.ui.view">
<field name="name">功能刀具出入库记录</field>
<field name="model">sf.inbound.and.outbound.records.of.functional.tools</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="出入库信息">
<field name="inbound_and_outbound_records_ids"/>
</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>
<group>
<field name="current_store_area"/>
<field name="current_store_place"/>
<field name="alarm_value"/>
<field name="tool_install_staff"/>
<field name="applicant"/>
<field name="remark"/>
</group>
<group>
<field name="current_state"/>
<field name="thickness"/>
<!-- <field name="max_life_span"/>-->
<field name="used_value"/>
<field name="tool_install_time"/>
<field name="reason_application"/>
</group>
</group>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
<record id="sf_inbound_and_outbound_records_of_functional_tools_view_search" model="ir.ui.view">
<field name="name">功能刀具出入库记录</field>
<field name="model">sf.inbound.and.outbound.records.of.functional.tools</field>
<field name="model">stock.move.line</field>
<field name="arch" type="xml">
<search>
<field name="barcode_id"/>
<field name="reference"/>
<field name="lot_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="current_state"/>
<field name="current_store_area"/>
<field name="current_store_place"/>
<!-- <field name="applicant"/>-->
<field name="diameter"/>
<field name="knife_tip_r_angle"/>
<field name="install_tool_time"/>
<field name="location_id"/>
<field name="location_dest_id"/>
<field name="date"/>
<field name="qty_done"/>
<field name="functional_tool_type_id" invisible="True"/>
<searchpanel>
<field name="mrs_cutting_tool_type_id" enable_counters="1" icon="fa-building"/>
<field name="functional_tool_type_id" enable_counters="1" icon="fa-building"/>
</searchpanel>
</search>
</field>
@@ -554,62 +469,13 @@
<record id="sf_inbound_and_outbound_records_of_functional_tools_view_act" model="ir.actions.act_window">
<field name="name">功能刀具出入库记录</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.inbound.and.outbound.records.of.functional.tools</field>
<field name="view_mode">tree,form,search</field>
</record>
<!--================================================出入库记录================================================-->
<record id="sf_inbound_and_outbound_records_view_tree" model="ir.ui.view">
<field name="name">出入库记录</field>
<field name="model">sf.inbound.and.outbound.records</field>
<field name="arch" type="xml">
<tree>
<field name="tool_state"/>
<field name="receive_equipment"/>
<field name="receive_staff"/>
<field name="receive_time"/>
<field name="return_staff"/>
<field name="return_time"/>
<field name="current_store_area"/>
<field name="current_store_place"/>
<field name="number"/>
</tree>
</field>
</record>
<record id="sf_inbound_and_outbound_records_view_form" model="ir.ui.view">
<field name="name">出入库记录</field>
<field name="model">sf.inbound.and.outbound.records</field>
<field name="arch" type="xml">
<form>
<sheet>
<group>
<group>
<field name="tool_state"/>
<field name="receive_equipment"/>
<field name="receive_staff"/>
<field name="receive_time"/>
<field name="current_store_area"/>
</group>
<group>
<field name="number"/>
<field name="return_staff"/>
<field name="return_time"/>
<field name="inbound_and_outbound_tools_id" readonly="True"/>
<field name="current_store_place"/>
</group>
</group>
</sheet>
</form>
</field>
</record>
<record id="sf_inbound_and_outbound_records_view_act" model="ir.actions.act_window">
<field name="name">出入库记录</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.inbound.and.outbound.records</field>
<field name="view_mode">tree,form</field>
<field name="res_model">stock.move.line</field>
<field name="view_mode">tree,search</field>
<field name="view_id"
ref="sf_tool_management.sf_inbound_and_outbound_records_of_functional_tools_view_tree"/>
<field name="search_view_id"
ref="sf_tool_management.sf_inbound_and_outbound_records_of_functional_tools_view_search"/>
<field name="domain">[('functional_tool_name_id', '!=', False)]</field>
</record>
@@ -624,7 +490,7 @@
<field name="maintenance_equipment_id"/>
<field name="machine_tool_code"/>
<field name="cutter_spacing_code_id"/>
<field name="functional_tool_name"/>
<field name="functional_tool_name_id"/>
<field name="diameter"/>
<field name="knife_tip_r_angle"/>
<field name="max_lifetime_value"/>
@@ -639,9 +505,8 @@
<field name="tool_position_interface_type" invisible="1"/>
<field name="extension_length" invisible="1"/>
<field name="effective_length" invisible="1"/>
<field name="functional_tool_name_id" invisible="1"/>
<field name="whether_standard_knife" invisible="1"/>
<field name="functional_tool_name" invisible="1"/>
<field name="whether_standard_knife" invisible="1"/>
<field name="status" invisible="1"/>
<button string="换刀申请"
name="%(sf_tool_management.sf_tool_change_requirement_information_act)d"
@@ -654,7 +519,6 @@
'default_cutter_spacing_code_id': cutter_spacing_code_id,
'default_barcode_id': barcode_id,
'default_functional_tool_name': functional_tool_name,
'default_functional_tool_name_id': functional_tool_name_id,
'default_functional_tool_type_id': functional_tool_type_id,
'default_tool_position_interface_type': tool_position_interface_type,
'default_diameter': diameter,
@@ -690,7 +554,6 @@
'default_cutter_spacing_code_id': cutter_spacing_code_id,
'default_barcode_id': barcode_id,
'default_functional_tool_name': functional_tool_name,
'default_functional_tool_name_id': functional_tool_name_id,
'default_functional_tool_type_id': functional_tool_type_id,
'default_tool_position_interface_type': tool_position_interface_type,
'default_diameter': diameter,
@@ -730,7 +593,6 @@
'default_cutter_spacing_code_id': cutter_spacing_code_id,
'default_barcode_id': barcode_id,
'default_functional_tool_name': functional_tool_name,
'default_functional_tool_name_id': functional_tool_name_id,
'default_functional_tool_type_id': functional_tool_type_id,
'default_tool_position_interface_type': tool_position_interface_type,
'default_diameter': diameter,
@@ -766,7 +628,6 @@
'default_cutter_spacing_code_id': cutter_spacing_code_id,
'default_barcode_id': barcode_id,
'default_functional_tool_name': functional_tool_name,
'default_functional_tool_name_id': functional_tool_name_id,
'default_functional_tool_type_id': functional_tool_type_id,
'default_tool_position_interface_type': tool_position_interface_type,
'default_diameter': diameter,
@@ -803,7 +664,7 @@
</group>
<field name="name" invisible="True"/>
<field name="machine_tool_code" invisible="True"/>
<field name="functional_tool_name_id" invisible="True"/>
<field name="functional_tool_name" invisible="True"/>
<field name="whether_standard_knife" invisible="True"/>
<field name="status" invisible="True"/>
<notebook>
@@ -811,7 +672,7 @@
<group>
<group>
<field name="barcode_id"/>
<field name="functional_tool_name"/>
<field name="functional_tool_name_id"/>
<field name="functional_tool_type_id"/>
<field name="diameter"/>
<field name="knife_tip_r_angle"/>
@@ -843,7 +704,7 @@
<field name="machine_table_type_id"/>
<field name="cutter_spacing_code_id" optional="hide"/>
<field name="barcode_id" invisible="1"/>
<field name="functional_tool_name"/>
<field name="functional_tool_name_id"/>
<field name="diameter"/>
<field name="knife_tip_r_angle"/>
<field name="max_lifetime_value"/>