1、功能刀具列表模型新增部分字段；2、机台换刀申请新增根据报警值和有效值计算当前状态，重构根据状态自动换刀申请的功能，重构撤销换刀申请功能；3、功能刀具组装单模型新增大量字段，优化tree视图和form视图的布局；4、组装单弹窗模型新增大量字段，优化确认组装按键功能，
This commit is contained in:
yuxianghui
@@ -765,7 +765,6 @@
|
||||
'default_replacement_knife_tip_r_angle': knife_tip_r_angle,
|
||||
'default_replacement_max_lifetime_value': max_lifetime_value,
|
||||
'default_replacement_alarm_value': alarm_value,
|
||||
'default_replacement_used_value': used_value,
|
||||
'default_replacement_whether_standard_knife': whether_standard_knife,
|
||||
'default_replacement_extension_length': extension_length,
|
||||
'default_replacement_effective_length': effective_length,
|
||||
@@ -842,7 +841,6 @@
|
||||
'default_replacement_knife_tip_r_angle': knife_tip_r_angle,
|
||||
'default_replacement_max_lifetime_value': max_lifetime_value,
|
||||
'default_replacement_alarm_value': alarm_value,
|
||||
'default_replacement_used_value': used_value,
|
||||
'default_replacement_whether_standard_knife': whether_standard_knife,
|
||||
'default_replacement_extension_length': extension_length,
|
||||
'default_replacement_effective_length': effective_length,
|
||||
@@ -880,6 +878,7 @@
|
||||
<button string="撤回转移" name="revocation_2" type="object" class="btn-primary"
|
||||
attrs="{'invisible': [('status', '!=', '2')]}" confirm="是否确认撤回转移"/>
|
||||
</header>
|
||||
<field name="functional_tool_status" string="状态" invisible="True"/>
|
||||
<sheet>
|
||||
<div class="oe_title">
|
||||
<h1>
|
||||
@@ -962,7 +961,7 @@
|
||||
</record>
|
||||
|
||||
|
||||
<!--================================================CAM工单程序用刀计划================================================-->
|
||||
<!--===============================================CAM工单程序用刀计划=========================================-->
|
||||
<record id="sf_CAM_work_order_program_knife_plan_tree" model="ir.ui.view">
|
||||
<field name="name">CAM工单程序用刀计划</field>
|
||||
<field name="model">sf.cam.work.order.program.knife.plan</field>
|
||||
@@ -1103,27 +1102,35 @@
|
||||
<field name="apply_time"/>
|
||||
<field name="assemble_status" optional="hide"/>
|
||||
|
||||
<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="receive_person" invisible="True"/>
|
||||
<field name="receive_time" invisible="True"/>
|
||||
<field name="remark" invisible="True"/>
|
||||
<field name="functional_tool_name_id" invisible="True"/>
|
||||
<field name="functional_tool_type_id" invisible="True"/>
|
||||
<field name="machine_tool_name_id" invisible="True"/>
|
||||
<field name="machine_tool_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"/>
|
||||
|
||||
<button string="组装"
|
||||
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
|
||||
type="action"
|
||||
context="{}"
|
||||
context="{'default_name':name,
|
||||
'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,
|
||||
'default_functional_tool_name':functional_tool_name,
|
||||
'default_functional_tool_type_id':functional_tool_type_id,
|
||||
'default_functional_tool_diameter':functional_tool_diameter,
|
||||
'default_knife_tip_r_angle':knife_tip_r_angle,
|
||||
'default_tool_loading_length':tool_loading_length,
|
||||
'default_functional_tool_length':functional_tool_length,
|
||||
'default_effective_length':effective_length,
|
||||
'default_whether_standard_knife':whether_standard_knife,
|
||||
'default_coarse_middle_thin':coarse_middle_thin,
|
||||
'default_new_former':new_former,
|
||||
'default_use_tool_time':use_tool_time,
|
||||
'default_reason_for_applying':reason_for_applying,
|
||||
'default_functional_tool_cutting_type':functional_tool_cutting_type,
|
||||
}"
|
||||
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
|
||||
class="btn-primary"/>
|
||||
<button string="组装单打印" name="assemble_single_print" type="object"
|
||||
@@ -1142,7 +1149,24 @@
|
||||
<button string="组装"
|
||||
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
|
||||
type="action"
|
||||
context="{}"
|
||||
context="{'default_name':name,
|
||||
'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,
|
||||
'default_functional_tool_name':functional_tool_name,
|
||||
'default_functional_tool_type_id':functional_tool_type_id,
|
||||
'default_functional_tool_diameter':functional_tool_diameter,
|
||||
'default_knife_tip_r_angle':knife_tip_r_angle,
|
||||
'default_tool_loading_length':tool_loading_length,
|
||||
'default_functional_tool_length':functional_tool_length,
|
||||
'default_effective_length':effective_length,
|
||||
'default_whether_standard_knife':whether_standard_knife,
|
||||
'default_coarse_middle_thin':coarse_middle_thin,
|
||||
'default_new_former':new_former,
|
||||
'default_use_tool_time':use_tool_time,
|
||||
'default_reason_for_applying':reason_for_applying,
|
||||
'default_functional_tool_cutting_type':functional_tool_cutting_type,
|
||||
}"
|
||||
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
|
||||
class="btn-primary"/>
|
||||
|
||||
@@ -1160,6 +1184,7 @@
|
||||
<field name="assembly_order_code"/>
|
||||
</h1>
|
||||
</div>
|
||||
<field name="name" invisible="1"/>
|
||||
<group>
|
||||
<group>
|
||||
<field name="production_line_name_id"/>
|
||||
@@ -1177,16 +1202,34 @@
|
||||
<group col="1">
|
||||
<group>
|
||||
<group>
|
||||
<field name="coarse_middle_thin"/>
|
||||
<field name="new_former"/>
|
||||
<field name="tool_loading_length"/>
|
||||
<field name="reference_length"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="barcode_id"/>
|
||||
<field name="after_assembly_functional_tool_name"
|
||||
string="功能刀具名称"/>
|
||||
<field name="after_assembly_functional_tool_type_id"
|
||||
string="功能刀具类型"/>
|
||||
<field name="after_assembly_functional_tool_diameter"
|
||||
string="刀具直径(mm)"/>
|
||||
<field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"/>
|
||||
<field name="after_assembly_new_former" string="新/旧"/>
|
||||
<field name="cut_time"/>
|
||||
<field name="cut_length"/>
|
||||
<field name="cut_number"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="after_assembly_whether_standard_knife"
|
||||
string="是否标准刀"/>
|
||||
<field name="after_assembly_coarse_middle_thin" string="粗/中/精"/>
|
||||
<field name="after_assembly_max_lifetime_value"
|
||||
string="最大寿命值(min)"/>
|
||||
<field name="after_assembly_alarm_value" string="报警值(min)"/>
|
||||
<field name="after_assembly_used_value" string="已使用值(min)"/>
|
||||
<field name="after_assembly_tool_loading_length" string="装刀长(mm)"/>
|
||||
<field name="after_assembly_functional_tool_length"
|
||||
string="伸出长(mm)"/>
|
||||
<field name="after_assembly_effective_length" string="有效长(mm)"/>
|
||||
<field name="L_D_number"/>
|
||||
<field name="hiding_length"/>
|
||||
</group>
|
||||
</group>
|
||||
</group>
|
||||
</group>
|
||||
@@ -1291,7 +1334,8 @@
|
||||
<field name="coarse_middle_thin"/>
|
||||
<field name="new_former"/>
|
||||
<field name="use_tool_time"/>
|
||||
<field name="reason_for_applying"/>、
|
||||
<field name="reason_for_applying"/>
|
||||
<field name="functional_tool_cutting_type"/>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
@@ -1299,11 +1343,9 @@
|
||||
<group>
|
||||
<group>
|
||||
<field name="tool_loading_person"/>
|
||||
<field name="receive_person"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="tool_loading_time"/>
|
||||
<field name="receive_time"/>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
|
||||
Reference in New Issue
Block a user