1、功能刀具组装tree、form视图布局调整；2、部分字段内容进行调整；3、功能刀具组装单编码自动生成方法添加新逻辑；
This commit is contained in:
yuxianghui
@@ -446,19 +446,19 @@
|
||||
<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"/>
|
||||
|
||||
<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,14 +467,12 @@
|
||||
<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')]}"
|
||||
class="btn-primary"/>
|
||||
<field name="assemble_status" widget="statusbar" statusbar_visible="0,1"/>
|
||||
<field name="assemble_status" widget="statusbar" statusbar_visible="0,1,2"/>
|
||||
</header>
|
||||
<sheet>
|
||||
<div class="oe_button_box" name="button_box">
|
||||
@@ -488,6 +486,9 @@
|
||||
</div>
|
||||
</button>
|
||||
</div>
|
||||
<div class="o_employee_avatar">
|
||||
<field name="image" widget="image" class="oe_avatar m-0"/>
|
||||
</div>
|
||||
<div class="oe_title">
|
||||
<h1>
|
||||
<field name="assembly_order_code"/>
|
||||
@@ -496,20 +497,19 @@
|
||||
<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')]}">
|
||||
<page string="组装信息">
|
||||
<group col="1">
|
||||
<group col="1">
|
||||
<group>
|
||||
@@ -650,28 +650,6 @@
|
||||
</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>
|
||||
<group>
|
||||
@@ -685,9 +663,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 +701,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="yes_assemble_status" string="已组装" domain="[('assemble_status', '=', '1')]"/>
|
||||
<filter name="yes_assemble_status" string="已组装" domain="[('assemble_status', '=', '2')]"/>
|
||||
<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 +738,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':2}</field>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user