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

1、添加刀具预调仪接口；2、刀具组装单添加开始预调字段，优化组装按键；3、优化组装单组装时的必填校验，添加刷新按钮用来获取刀具预调仪的参数信息；

Browse Source
This commit is contained in:
yuxianghui
2024-05-21 21:41:17 +08:00
parent bf1b14290e
commit d22f08d187
5 changed files with 151 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
sf_tool_management/views/tool_base_views.xml
View File

@@ -451,36 +451,9 @@
<field name="whether_standard_knife" invisible="True"/>
<field name="reason_for_applying" invisible="True"/>
<field name="functional_tool_type_id" 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="{'default_name':name,
'default_assembly_order_code':assembly_order_code,
'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_tool_groups_id': tool_groups_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,
}"
attrs="{'invisible': [('assemble_status', '!=', '0')]}" groups="sf_base.group_sf_mrp_user"
class="btn-primary"/>
<!-- <button string="组装单打印" name="assemble_single_print" type="object"-->
<!-- groups="sf_base.group_sf_mrp_user"-->
<!-- attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"-->
<!-- confirm="是否确认打印组装单"/>-->
<button string="组装" name="put_start_preset" type="object"
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
</tree>
</field>
</record>
@@ -491,35 +464,9 @@
<field name="arch" type="xml">
<form create="0" delete="0" edit="0">
<header>
<button string="组装"
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
type="action" groups="sf_base.group_sf_mrp_user"
context="{'default_name':name,
'default_assembly_order_code':assembly_order_code,
'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_tool_groups_id': tool_groups_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,
}"
<button string="组装" name="put_start_preset" type="object"
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
<!-- <button string="组装单打印" name="assemble_single_print" type="object"-->
<!-- groups="sf_base.group_sf_mrp_user"-->
<!-- attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"-->
<!-- confirm="是否确认打印组装单"/>-->
<field name="assemble_status" widget="statusbar" statusbar_visible="0,1"/>
</header>
<sheet>