Merge branch 'feature/功能刀具重构' into feature/功能刀具重构_1

This commit is contained in:
yuxianghui
2024-09-10 08:28:47 +08:00
5 changed files with 1044 additions and 592 deletions

View File

@@ -446,19 +446,23 @@
<field name="use_tool_time"/>
<field name="production_line_name_id" optional="hide"/>
<field name="machine_tool_name_id" optional="hide"/>
<field name="applicant"/>
<field name="applicant" optional="hide"/>
<field name="apply_time"/>
<field name="assemble_status" optional="hide"/>
<field name="assemble_status" widget='badge'
decoration-info="assemble_status == '0'"
decoration-warning="assemble_status == '01'"
decoration-success="assemble_status == '1'"
/>
<field name="name" invisible="True"/>
<field name="machine_tool_code" invisible="True"/>
<field name="cutter_spacing_code_id" invisible="True"/>
<field name="whether_standard_knife" invisible="True"/>
<field name="reason_for_applying" invisible="True"/>
<field name="functional_tool_type_id" invisible="True"/>
<button string="组装" name="put_start_preset" type="object"
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
<!-- <field name="name" invisible="True"/>-->
<!-- <field name="machine_tool_code" invisible="True"/>-->
<!-- <field name="cutter_spacing_code_id" invisible="True"/>-->
<!-- <field name="whether_standard_knife" invisible="True"/>-->
<!-- <field name="reason_for_applying" invisible="True"/>-->
<!-- <field name="functional_tool_type_id" invisible="True"/>-->
<!-- <button string="组装" name="put_start_preset" type="object"-->
<!-- attrs="{'invisible': [('assemble_status', '!=', '0')]}"-->
<!-- class="btn-primary"/>-->
</tree>
</field>
</record>
@@ -467,19 +471,19 @@
<field name="name">功能刀具组装</field>
<field name="model">sf.functional.tool.assembly</field>
<field name="arch" type="xml">
<form create="0" delete="0" edit="0">
<form create="0" delete="0" edit="1">
<header>
<!-- <button string="修改编码" name="put_assembly_order_code" type="object"-->
<!-- class="btn-primary" confirm="是否确认修改编码"/>-->
<button string="组装" name="put_start_preset" type="object"
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
<button string="开始组装" name="start_preset" type="object"
attrs="{'invisible': [('assemble_status', 'not in', ['0'])]}"
class="btn-primary"/>
<field name="assemble_status" widget="statusbar" statusbar_visible="0,1"/>
<button string="确认组装" name="functional_tool_assembly" type="object"
attrs="{'invisible': [('assemble_status', 'not in', ['01'])]}"
class="btn-primary"/>
<field name="assemble_status" widget="statusbar" statusbar_visible="0,01,1"/>
</header>
<sheet>
<div class="oe_button_box" name="button_box">
<button class="oe_stat_button" name="open_tool_stock_picking" icon="fa-truck" type="object"
attrs="{'invisible': [('assemble_status', '!=', '1')]}">
<button class="oe_stat_button" name="open_tool_stock_picking" icon="fa-truck" type="object">
<div name="delivery_count" class="o_field_widget o_readonly_modifier o_field_statinfo">
<span class="o_stat_info o_stat_value">
<field name="picking_num"/>
@@ -488,6 +492,10 @@
</div>
</button>
</div>
<div class="o_employee_avatar">
<field name="image" widget="image" class="oe_avatar m-0"
attrs="{'readonly': [('assemble_status', '!=', '01')]}"/>
</div>
<div class="oe_title">
<h1>
<field name="assembly_order_code"/>
@@ -496,23 +504,140 @@
<field name="name" invisible="1"/>
<group>
<group>
<field name="production_line_name_id"/>
<field name="machine_tool_name_id"/>
<field name="cutter_spacing_code_id"/>
<field name="sf_machine_table_tool_changing_apply_id"
attrs="{'invisible': [('sf_machine_table_tool_changing_apply_id','=',False)]}"/>
<field name="sf_cam_work_order_program_knife_plan_id"
attrs="{'invisible': [('sf_cam_work_order_program_knife_plan_id','=',False)]}"/>
<field name="functional_tool_name"/>
<field name="functional_tool_type_id"/>
<field name="tool_groups_id"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
<field name="functional_tool_diameter" string="刀具直径(mm)"/>
<field name="knife_tip_r_angle"/>
<field name="tool_loading_length" string="总长度(mm)"/>
<field name="functional_tool_length"/>
</group>
</group>
<notebook>
<page string="组装信息" attrs="{'invisible': [('assemble_status', '=', '0')]}">
<group col="1">
<page string="组装信息">
<field name="_barcode_scanned" widget="barcode_handler"/>
<group attrs="{'invisible': [('assemble_status', '=', '0')]}">
<group col="1">
<div>
<separator string="刀柄:" style="font-size: 13px;"/>
</div>
<group>
<field name="handle_code_id" string="序列号" placeholder="请选择"
options="{'no_create': True, 'no_quick_create': True}"
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="handle_freight_rfid" string="Rfid"/>
<field name="handle_product_id" string="名称"/>
<field name="cutting_tool_cutterhandle_model_id" string="型号"/>
<field name="handle_specification_id" string="规格"/>
<field name="sf_tool_brand_id_5" string="品牌"/>
</group>
</group>
<group col="1"
attrs="{'invisible': [('assemble_status', 'not in', ['0','01']),('chuck_product_id', '=', False)]}">
<div>
<separator string="夹头:" style="font-size: 13px;"/>
</div>
<group>
<group>
<field name="chuck_freight_barcode_id" string="货位"
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="chuck_freight_lot_id" string="批次"
attrs="{'invisible': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="chuck_lot_id" string="批次"
attrs="{'invisible': [('assemble_status', 'in', ['0','01'])]}"/>
<field name="chuck_product_id" string="名称"/>
<field name="cutting_tool_cutterhead_model_id" string="型号"/>
<field name="chuck_specification_id" string="规格"/>
<field name="sf_tool_brand_id_6" string="品牌"/>
</group>
</group>
</group>
</group>
<group attrs="{'invisible': [('assemble_status', '=', '0')]}">
<group col="1">
<group col="1"
attrs="{'invisible': [('integral_lot_id', '=', False),'|','|','|', ('blade_lot_id', '!=', False),('bar_lot_id', '!=', False),('pad_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
<div>
<separator string="整体式刀具:" style="font-size: 13px;"/>
</div>
<group>
<field name="integral_freight_barcode_id" string="货位"
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="integral_freight_lot_id" string="批次"
attrs="{'invisible': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="integral_lot_id" string="批次"
attrs="{'invisible': [('assemble_status', 'in', ['0','01'])]}"/>
<field name="integral_product_id" string="名称"/>
<field name="cutting_tool_integral_model_id" string="型号"/>
<field name="integral_specification_id" string="规格"/>
<field name="sf_tool_brand_id_1" string="品牌"/>
</group>
</group>
<group col="1"
attrs="{'invisible': [('blade_lot_id', '=', False),'|', ('integral_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
<div>
<separator string="刀片:" style="font-size: 13px;"/>
</div>
<group>
<field name="blade_freight_barcode_id" string="货位"
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="blade_freight_lot_id" string="批次"
attrs="{'invisible': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="blade_lot_id" string="批次"
attrs="{'invisible': [('assemble_status', 'in', ['0','01'])]}"/>
<field name="blade_product_id" string="名称"/>
<field name="cutting_tool_blade_model_id" string="型号"/>
<field name="blade_specification_id" string="规格"/>
<field name="sf_tool_brand_id_2" string="品牌"/>
</group>
</group>
</group>
<group col="1">
<group col="1"
attrs="{'invisible': [('bar_lot_id', '=', False),'|','|',('integral_lot_id', '!=', False),('pad_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
<div>
<separator string="刀杆:" style="font-size: 13px;"/>
</div>
<group>
<field name="bar_freight_barcode_id" string="货位"
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="bar_freight_lot_id" string="批次"
attrs="{'invisible': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="bar_lot_id" string="批次"
attrs="{'invisible': [('assemble_status', 'in', ['0','01'])]}"/>
<field name="bar_product_id" string="名称"/>
<field name="cutting_tool_cutterbar_model_id" string="型号"/>
<field name="bar_specification_id" string="规格"/>
<field name="sf_tool_brand_id_3" string="品牌"/>
</group>
</group>
<group col="1"
attrs="{'invisible': [('pad_lot_id', '=', False),'|','|',('integral_lot_id', '!=', False),('bar_lot_id', '!=', False),('assemble_status', 'not in', ['0','01'])]}">
<div>
<separator string="刀盘:" style="font-size: 13px;"/>
</div>
<group>
<group>
<field name="pad_freight_barcode_id" string="货位"
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="pad_freight_lot_id" string="批次"
attrs="{'invisible': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="pad_lot_id" string="批次"
attrs="{'invisible': [('assemble_status', 'in', ['0','01'])]}"/>
<field name="pad_product_id" string="名称"/>
<field name="cutting_tool_cutterpad_model_id" string="型号"/>
<field name="pad_specification_id" string="规格"/>
<field name="sf_tool_brand_id_4" string="品牌"/>
</group>
</group>
</group>
</group>
</group>
<group col="1" attrs="{'invisible': [('assemble_status', '=', '0')]}">
<group col="1">
<group string="组装参数信息">
<group>
<field name="barcode_id" invisible="True"/>
<field name="rfid" string="功能刀具rfid"/>
@@ -523,9 +648,11 @@
string="功能刀具类型"/>
<field name="tool_groups_id"/>
<field name="after_assembly_whether_standard_knife"
string="是否标准刀"/>
<field name="after_assembly_coarse_middle_thin" string="粗/中/精"/>
<field name="after_assembly_new_former" string="新/旧"/>
string="是否标准刀" invisible="1"/>
<field name="after_assembly_coarse_middle_thin" string="粗/中/精"
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="after_assembly_new_former" string="新/旧"
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="cut_time"
attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/>
<field name="cut_length"
@@ -534,16 +661,23 @@
attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/>
</group>
<group>
<field name="after_assembly_functional_tool_diameter"
string="刀具直径(mm)"/>
<field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"/>
<field name="after_assembly_tool_loading_length" string="总长度(mm)"/>
<field name="after_assembly_handle_length" string="刀柄长度(mm)"/>
<field name="after_assembly_functional_tool_diameter" readonly="0"
string="刀具直径(mm)"
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="after_assembly_knife_tip_r_angle" readonly="0"
string="刀尖R角(mm)"
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="after_assembly_tool_loading_length" readonly="0"
string="总长度(mm)"
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="after_assembly_handle_length" string="刀柄长度(mm)"
attrs="{'readonly': [('assemble_status', 'in', ['1','2'])]}"/>
<field name="after_assembly_functional_tool_length"
string="伸出长(mm)"/>
<field name="after_assembly_max_lifetime_value"
string="最大寿命值(min)"/>
<field name="after_assembly_alarm_value" string="报警值(min)"/>
<field name="after_assembly_alarm_value" string="报警值(min)"
invisible="1"/>
<field name="after_assembly_used_value" string="已使用值(min)"
invisible="1"/>
<field name="after_assembly_effective_length" string="有效长(mm)"
@@ -554,123 +688,6 @@
</group>
</group>
</group>
<group>
<group col="1" attrs="{'invisible': [('handle_code_id', '=', False)]}">
<div>
<separator string="刀柄:" style="font-size: 13px;"/>
</div>
<group>
<field name="handle_code_id" string="序列号" placeholder="请选择"
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="handle_freight_rfid" string="Rfid"/>
<field name="handle_product_id" string="名称"/>
<field name="cutting_tool_cutterhandle_model_id" string="型号"/>
<field name="handle_specification_id" string="规格"/>
<field name="sf_tool_brand_id_5" string="品牌"/>
</group>
</group>
<group col="1" attrs="{'invisible': [('chuck_freight_barcode_id', '=', False)]}">
<div>
<separator string="夹头:" style="font-size: 13px;"/>
</div>
<group>
<group>
<field name="chuck_freight_barcode_id" string="货位"/>
<field name="chuck_lot_id" string="批次"/>
<field name="chuck_product_id" string="名称"/>
<field name="cutting_tool_cutterhead_model_id" string="型号"/>
<field name="chuck_specification_id" string="规格"/>
<field name="sf_tool_brand_id_6" string="品牌"/>
</group>
</group>
</group>
</group>
<group>
<group col="1">
<group col="1"
attrs="{'invisible': [('integral_freight_barcode_id', '=', False)]}">
<div>
<separator string="整体式刀具:" style="font-size: 13px;"/>
</div>
<group>
<field name="integral_freight_barcode_id" string="货位"/>
<field name="integral_lot_id" string="批次"/>
<field name="integral_product_id" string="名称"/>
<field name="cutting_tool_integral_model_id" string="型号"/>
<field name="integral_specification_id" string="规格"/>
<field name="sf_tool_brand_id_1" string="品牌"/>
</group>
</group>
<group col="1"
attrs="{'invisible': [('blade_freight_barcode_id', '=', False)]}">
<div>
<separator string="刀片:" style="font-size: 13px;"/>
</div>
<group>
<field name="blade_freight_barcode_id" string="货位"/>
<field name="blade_lot_id" string="批次"/>
<field name="blade_product_id" string="名称"/>
<field name="cutting_tool_blade_model_id" string="型号"/>
<field name="blade_specification_id" string="规格"/>
<field name="sf_tool_brand_id_2" string="品牌"/>
</group>
</group>
</group>
<group col="1">
<group col="1" attrs="{'invisible': [('bar_freight_barcode_id', '=', False)]}">
<div>
<separator string="刀杆:" style="font-size: 13px;"/>
</div>
<group>
<group>
<field name="bar_freight_barcode_id" string="货位"/>
<field name="bar_lot_id" string="批次"/>
<field name="bar_product_id" string="名称"/>
<field name="cutting_tool_cutterbar_model_id" string="型号"/>
<field name="bar_specification_id" string="规格"/>
<field name="sf_tool_brand_id_3" string="品牌"/>
</group>
</group>
</group>
<group col="1" attrs="{'invisible': [('pad_freight_barcode_id', '=', False)]}">
<div>
<separator string="刀盘:" style="font-size: 13px;"/>
</div>
<group>
<group>
<field name="pad_freight_barcode_id" string="货位"/>
<field name="pad_lot_id" string="批次"/>
<field name="pad_product_id" string="名称"/>
<field name="cutting_tool_cutterpad_model_id" string="型号"/>
<field name="pad_specification_id" string="规格"/>
<field name="sf_tool_brand_id_4" string="品牌"/>
</group>
</group>
</group>
</group>
</group>
</page>
<page string="申请信息">
<group>
<group>
<field name="functional_tool_name"/>
<field name="functional_tool_type_id"/>
<field name="tool_groups_id"/>
<field name="functional_tool_diameter" string="刀具直径(mm)"/>
<field name="knife_tip_r_angle"/>
<field name="tool_loading_length" string="总长度(mm)"/>
<field name="functional_tool_length"/>
<field name="effective_length"/>
</group>
<group>
<field name="whether_standard_knife"/>
<field name="coarse_middle_thin"/>
<field name="new_former"/>
<field name="use_tool_time"/>
<field name="reason_for_applying"/>
<!-- <field name="functional_tool_cutting_type"/>-->
</group>
</group>
</page>
<page string="装刀信息">
<group>
@@ -685,9 +702,27 @@
<page string="其他">
<group>
<group>
<field name="production_line_name_id"
attrs="{'invisible': [('production_line_name_id','=',False)]}"/>
<field name="machine_tool_name_id"
attrs="{'invisible': [('machine_tool_name_id','=',False)]}"/>
<field name="cutter_spacing_code_id"
attrs="{'invisible': [('cutter_spacing_code_id','=',False)]}"/>
<field name="use_tool_time"/>
<field name="reason_for_applying"/>
<field name="sf_machine_table_tool_changing_apply_id"
attrs="{'invisible': [('sf_machine_table_tool_changing_apply_id','=',False)]}"/>
<field name="sf_cam_work_order_program_knife_plan_id"
attrs="{'invisible': [('sf_cam_work_order_program_knife_plan_id','=',False)]}"/>
<field name="check_box_1" invisible="True"/>
<field name="remark"/>
</group>
<group>
<field name="effective_length"/>
<field name="whether_standard_knife"/>
<field name="coarse_middle_thin" invisible="1"/>
<field name="new_former" invisible="1"/>
</group>
</group>
</page>
</notebook>
@@ -705,20 +740,19 @@
<field name="arch" type="xml">
<search>
<field name="functional_tool_name"/>
<field name="tool_groups_id"/>
<field name="functional_tool_diameter"/>
<field name="knife_tip_r_angle"/>
<field name="assembly_order_code"/>
<field name="code" string="功能刀具编码"/>
<field name="barcode_id"/>
<field name="functional_tool_type_id"/>
<field name="tool_groups_id"/>
<field name="loading_task_source" string="任务来源"/>
<field name="production_line_name_id"/>
<field name="machine_tool_name_id"/>
<field name="applicant"/>
<filter name="no_assemble_status" string="未组装" domain="[('assemble_status', '=', '0')]"/>
<filter name="no_assemble_status" string="未组装" domain="[('assemble_status', 'in', ['0','01'])]"/>
<filter name="yes_assemble_status" string="已组装" domain="[('assemble_status', '=', '1')]"/>
<separator/>
<filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
<searchpanel>
<field name="assemble_status" enable_counters="1" icon="fa-filter"/>
<field name="functional_tool_type_id" enable_counters="1" icon="fa-filter"/>
</searchpanel>
@@ -743,7 +777,7 @@
<field name="view_mode">tree,form,search</field>
<!-- <field name="view_id" ref="sf_functional_tool_assembly_tree"/>-->
<field name="search_view_id" ref="sf_functional_tool_assembly_search"/>
<field name="context">{'search_default_no_assemble_status':1}</field>
<field name="context">{'search_default_no_assemble_status':[1,01]}</field>
</record>