1、设备机床的刀位对象新增name字段，并自动添加值；2、根据需求重构了机床换刀申请模型，重构机床换刀弹窗对象；
This commit is contained in:
yuxianghui
@@ -707,43 +707,58 @@
|
||||
<field name="model">sf.machine.table.tool.changing.apply</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree>
|
||||
<field name="name"/>
|
||||
<field name="machine_tool_code" invisible="1"/>
|
||||
<field name="name" invisible="1"/>
|
||||
<field name="maintenance_equipment_id"/>
|
||||
<field name="machine_tool_code"/>
|
||||
<field name="machine_table_type_id"/>
|
||||
<field name="cutter_spacing_code"/>
|
||||
<field name="barcode_id"/>
|
||||
<field name="functional_tool_name_id"/>
|
||||
<!-- <field name="replacement_tool_code"/>-->
|
||||
<field name="replacement_tool_name_id"/>
|
||||
<field name="applicant"/>
|
||||
<field name="cutter_spacing_code_id" optional="hide"/>
|
||||
<field name="barcode_id" invisible="1"/>
|
||||
<field name="functional_tool_name"/>
|
||||
<field name="diameter"/>
|
||||
<field name="knife_tip_r_angle"/>
|
||||
<field name="max_lifetime_value"/>
|
||||
<field name="alarm_value"/>
|
||||
<field name="used_value"/>
|
||||
<field name="functional_tool_status" string="状态"/>
|
||||
<field name="applicant" optional="hide"/>
|
||||
|
||||
<field name="functional_tool_type_id" invisible="True"/>
|
||||
<field name="coarse_middle_thin" invisible="True"/>
|
||||
<field name="status" invisible="True"/>
|
||||
<field name="functional_tool_type_id" invisible="1"/>
|
||||
<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="status" invisible="1"/>
|
||||
<button string="换刀申请"
|
||||
name="%(sf_tool_management.sf_tool_change_requirement_information_act)d"
|
||||
type="action"
|
||||
context="{ 'default_name':name,
|
||||
'default_maintenance_equipment_id': maintenance_equipment_id,
|
||||
'default_machine_table_type_id': machine_table_type_id,
|
||||
'default_machine_tool_code': machine_tool_code,
|
||||
'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_cutter_spacing_code': cutter_spacing_code,
|
||||
'default_replacement_tool_name_id': functional_tool_name_id,
|
||||
'default_replacement_tool_type_id': functional_tool_type_id,
|
||||
'default_replacement_tool_coarse_middle_thin': coarse_middle_thin}"
|
||||
'default_tool_position_interface_type': tool_position_interface_type,
|
||||
'default_diameter': diameter,
|
||||
'default_knife_tip_r_angle': knife_tip_r_angle,
|
||||
'default_max_lifetime_value': max_lifetime_value,
|
||||
'default_alarm_value': alarm_value,
|
||||
'default_used_value': used_value,
|
||||
'default_whether_standard_knife': whether_standard_knife,
|
||||
'default_extension__length': extension__length,
|
||||
'default_effective_length': effective_length,
|
||||
}"
|
||||
attrs="{'invisible': [('status', '!=', '0')]}"
|
||||
class="btn-primary"
|
||||
/>
|
||||
<button string="转移"
|
||||
name="%(sf_tool_management.sf_tool_transfer_request_information_act)d"
|
||||
type="action"
|
||||
context="{ 'default_CNC_machine_table_id':name,
|
||||
'default_machine_tool_code': machine_tool_code,
|
||||
'default_cutter_spacing_code': cutter_spacing_code,
|
||||
'default_barcode_id': barcode_id,
|
||||
'default_functional_tool_name_id': functional_tool_name_id,
|
||||
'default_functional_tool_type_id': functional_tool_type_id}"
|
||||
context="{}"
|
||||
class="btn-primary"
|
||||
attrs="{'invisible': [('status', '!=', '0')]}"
|
||||
/>
|
||||
@@ -763,26 +778,31 @@
|
||||
name="%(sf_tool_management.sf_tool_change_requirement_information_act)d"
|
||||
type="action"
|
||||
context="{ 'default_name':name,
|
||||
'default_maintenance_equipment_id': maintenance_equipment_id,
|
||||
'default_machine_table_type_id': machine_table_type_id,
|
||||
'default_machine_tool_code': machine_tool_code,
|
||||
'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_cutter_spacing_code': cutter_spacing_code,
|
||||
'default_replacement_tool_name_id': functional_tool_name_id,
|
||||
'default_replacement_tool_type_id': functional_tool_type_id,
|
||||
'default_replacement_tool_coarse_middle_thin': coarse_middle_thin}"
|
||||
'default_tool_position_interface_type': tool_position_interface_type,
|
||||
'default_diameter': diameter,
|
||||
'default_knife_tip_r_angle': knife_tip_r_angle,
|
||||
'default_max_lifetime_value': max_lifetime_value,
|
||||
'default_alarm_value': alarm_value,
|
||||
'default_used_value': used_value,
|
||||
'default_whether_standard_knife': whether_standard_knife,
|
||||
'default_extension__length': extension__length,
|
||||
'default_effective_length': effective_length,
|
||||
}"
|
||||
attrs="{'invisible': [('status', '!=', '0')]}"
|
||||
class="btn-primary"
|
||||
/>
|
||||
<button string="转移"
|
||||
name="%(sf_tool_management.sf_tool_transfer_request_information_act)d"
|
||||
type="action"
|
||||
context="{ 'default_CNC_machine_table_id':name,
|
||||
'default_machine_tool_code': machine_tool_code,
|
||||
'default_cutter_spacing_code': cutter_spacing_code,
|
||||
'default_barcode_id': barcode_id,
|
||||
'default_functional_tool_name_id': functional_tool_name_id,
|
||||
'default_functional_tool_type_id': functional_tool_type_id}"
|
||||
context="{}"
|
||||
class="btn-primary"
|
||||
attrs="{'invisible': [('status', '!=', '0')]}"/>
|
||||
<button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '1')]}" confirm="是否确认撤回换刀申请"/>
|
||||
@@ -791,60 +811,39 @@
|
||||
<sheet>
|
||||
<div class="oe_title">
|
||||
<h1>
|
||||
<field name="name" readonly="0" placeholder="请选择"/>
|
||||
<field name="maintenance_equipment_id" readonly="0" placeholder="请选择"/>
|
||||
</h1>
|
||||
</div>
|
||||
<group>
|
||||
<group>
|
||||
<field name="machine_tool_code" invisible="True"/>
|
||||
<field name="machine_table_type_id"/>
|
||||
<field name="cutter_spacing_code"/>
|
||||
<field name="cutter_spacing_code_id"/>
|
||||
<field name="tool_position_interface_type"/>
|
||||
<field name="sf_functional_tool_assembly_id" string="组装单"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="barcode_id"/>
|
||||
<field name="functional_tool_name_id" placeholder="请选择"/>
|
||||
<field name="functional_tool_type_id"/>
|
||||
</group>
|
||||
</group>
|
||||
<field name="name" invisible="True"/>
|
||||
<field name="machine_tool_code" invisible="True"/>
|
||||
<field name="functional_tool_name_id" invisible="True"/>
|
||||
<field name="whether_standard_knife" invisible="True"/>
|
||||
<field name="status" invisible="True"/>
|
||||
<notebook>
|
||||
<page string="待换功能刀具信息">
|
||||
<group attrs="{'invisible': [('sf_functional_tool_assembly_id', '=', False)]}">
|
||||
<group>
|
||||
<field name="replacement_tool_name_id"/>
|
||||
<field name="replacement_tool_type_id"/>
|
||||
<field name="replacement_tool_coarse_middle_thin"/>
|
||||
<field name="applicant"/>
|
||||
<field name="status" invisible="True"/>
|
||||
</group>
|
||||
<group>
|
||||
<!-- <field name="replacement_tool_code"/>-->
|
||||
<field name="used_tool_time"/>
|
||||
<field name="new_former"/>
|
||||
<field name="reason_for_applying" />
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<page string="数据信息">
|
||||
<page string="功能刀具信息">
|
||||
<group>
|
||||
<group>
|
||||
<field name="hilt_name"/>
|
||||
<field name="barcode_id"/>
|
||||
<field name="functional_tool_name"/>
|
||||
<field name="functional_tool_type_id"/>
|
||||
<field name="diameter"/>
|
||||
<field name="coarse_middle_thin"/>
|
||||
<field name="functional_tool_status"/>
|
||||
<field name="knife_tip_r_angle"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="hilt_code"/>
|
||||
<field name="max_lifetime_value"/>
|
||||
<field name="alarm_value"/>
|
||||
<field name="used_value"/>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<page string="其他">
|
||||
<group>
|
||||
<group>
|
||||
<field name="remark"/>
|
||||
<field name="extension__length"/>
|
||||
<field name="effective_length"/>
|
||||
<field name="whether_standard_knife"/>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
@@ -858,17 +857,22 @@
|
||||
<field name="model">sf.machine.table.tool.changing.apply</field>
|
||||
<field name="arch" type="xml">
|
||||
<search>
|
||||
<field name="name"/>
|
||||
<field name="machine_tool_code" invisible="1"/>
|
||||
<field name="name" invisible="1"/>
|
||||
<field name="maintenance_equipment_id"/>
|
||||
<field name="machine_tool_code"/>
|
||||
<field name="machine_table_type_id"/>
|
||||
<field name="cutter_spacing_code"/>
|
||||
<field name="barcode_id"/>
|
||||
<field name="functional_tool_name_id"/>
|
||||
<!-- <field name="replacement_tool_code"/>-->
|
||||
<field name="replacement_tool_name_id"/>
|
||||
<field name="applicant"/>
|
||||
<field name="cutter_spacing_code_id" optional="hide"/>
|
||||
<field name="barcode_id" invisible="1"/>
|
||||
<field name="functional_tool_name"/>
|
||||
<field name="diameter"/>
|
||||
<field name="knife_tip_r_angle"/>
|
||||
<field name="max_lifetime_value"/>
|
||||
<field name="alarm_value"/>
|
||||
<field name="used_value"/>
|
||||
<field name="functional_tool_status"/>
|
||||
<field name="applicant" optional="hide"/>
|
||||
<searchpanel>
|
||||
<field name="name" enable_counters="1" icon="fa-building"/>
|
||||
<field name="maintenance_equipment_id" enable_counters="1" icon="fa-building"/>
|
||||
</searchpanel>
|
||||
</search>
|
||||
</field>
|
||||
@@ -1017,7 +1021,7 @@
|
||||
|
||||
<field name="machine_tool_name_id" invisible="True"/>
|
||||
<field name="machine_tool_code" invisible="True"/>
|
||||
<field name="cutter_spacing_code" invisible="True"/>
|
||||
<field name="cutter_spacing_code_id" invisible="True"/>
|
||||
<field name="functional_tool_length" invisible="True"/>
|
||||
<field name="functional_tool_diameter" invisible="True"/>
|
||||
<field name="functional_tool_cutting_type" invisible="True"/>
|
||||
@@ -1029,7 +1033,7 @@
|
||||
'default_machine_tool_name_id': machine_tool_name_id,
|
||||
'default_machine_tool_code': machine_tool_code,
|
||||
'default_barcode_id': barcode_id,
|
||||
'default_cutter_spacing_code': cutter_spacing_code,
|
||||
'default_cutter_spacing_code_id': cutter_spacing_code_id,
|
||||
'default_functional_tool_name_id': functional_tool_name_id,
|
||||
'default_functional_tool_type_id': functional_tool_type_id,
|
||||
'default_functional_tool_length': functional_tool_length,
|
||||
@@ -1060,7 +1064,7 @@
|
||||
'default_machine_tool_name_id': machine_tool_name_id,
|
||||
'default_machine_tool_code': machine_tool_code,
|
||||
'default_barcode_id': barcode_id,
|
||||
'default_cutter_spacing_code': cutter_spacing_code,
|
||||
'default_cutter_spacing_code_id': cutter_spacing_code_id,
|
||||
'default_functional_tool_name_id': functional_tool_name_id,
|
||||
'default_functional_tool_type_id': functional_tool_type_id,
|
||||
'default_functional_tool_length': functional_tool_length,
|
||||
@@ -1212,7 +1216,7 @@
|
||||
<field name="production_line_name_id"/>
|
||||
<field name="machine_tool_name_id"/>
|
||||
<field name="machine_tool_code"/>
|
||||
<field name="cutter_spacing_code"/>
|
||||
<field name="cutter_spacing_code_id"/>
|
||||
<field name="applicant"/>
|
||||
</group>
|
||||
<group>
|
||||
|
||||
Reference in New Issue
Block a user