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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/odoo16翻译研究

Browse Source
This commit is contained in:
mgw
2023-08-02 18:03:41 +08:00
parent 3c934e3a4b 5c2a9f62dc
commit 3f3a72a905
6 changed files with 588 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

232
sf_tool_management/views/tool_base_views.xml
View File

@@ -9,14 +9,13 @@
<tree string="功能刀具列表">
<field name="code" />
<field name="name" />
<field name="mrs_cutting_tool_type_id"/>
<field name="mrs_cutting_tool_type_id" />
<field name="mrs_cutting_tool_integral_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_blade_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_cutterpad_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_cutterhandle_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_cutterhead_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_type_id" />
<field name="image" widget='image'/>
</tree>
</field>
@@ -536,16 +535,44 @@
<tree>
<field name="name"/>
<field name="machine_tool_code" invisible="1"/>
<field name="machine_table_type"/>
<field name="machine_table_type_id"/>
<field name="cutter_spacing_code"/>
<field name="functional_tool_name"/>
<field name="functional_tool_type"/>
<field name="functional_tool_code"/>
<field name="functional_tool_name_id"/>
<field name="replacement_tool_code"/>
<field name="replacement_tool_name"/>
<field name="replacement_tool_type"/>
<field name="replacement_tool_name_id"/>
<field name="applicant"/>
<field name="used_tool_time"/>
<field name="remark"/>
<field name="functional_tool_type_id" invisible="True"/>
<field name="coarse_middle_thin" invisible="True"/>
<field name="status" invisible="True"/>
<button string="换刀申请"
name="%(sf_tool_management.sf_tool_change_requirement_information_act)d"
type="action"
context="{ 'default_name':name,
'default_machine_tool_code': machine_tool_code,
'default_cutter_spacing_code': cutter_spacing_code,
'default_replacement_tool_code': functional_tool_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}"
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_functional_tool_code': functional_tool_code,
'default_functional_tool_name_id': functional_tool_name_id,
'default_functional_tool_type_id': functional_tool_type_id}"
class="btn-primary"
attrs="{'invisible': [('status', '!=', '0')]}"
/>
<button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '1')]}"/>
<button string="撤回转移" name="revocation_2" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '2')]}"/>
</tree>
</field>
</record>
@@ -563,8 +590,8 @@
'default_machine_tool_code': machine_tool_code,
'default_cutter_spacing_code': cutter_spacing_code,
'default_replacement_tool_code': functional_tool_code,
'default_replacement_tool_name': functional_tool_name,
'default_replacement_tool_type': functional_tool_type,
'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}"
attrs="{'invisible': [('status', '!=', '0')]}"
class="btn-primary"
@@ -572,12 +599,12 @@
<button string="转移"
name="%(sf_tool_management.sf_tool_transfer_request_information_act)d"
type="action"
context="{ 'default_CNC_machine_table':name,
context="{ 'default_CNC_machine_table_id':name,
'default_machine_tool_code': machine_tool_code,
'default_cutter_spacing_code': cutter_spacing_code,
'default_functional_tool_code': functional_tool_code,
'default_functional_tool_name': functional_tool_name,
'default_functional_tool_type': functional_tool_type}"
'default_functional_tool_name_id': functional_tool_name_id,
'default_functional_tool_type_id': functional_tool_type_id}"
class="btn-primary"
attrs="{'invisible': [('status', '!=', '0')]}"
/>
@@ -588,14 +615,14 @@
<group string="基础信息">
<group>
<field name="name"/>
<field name="machine_table_type"/>
<field name="machine_table_type_id"/>
<field name="machine_tool_code" invisible="True"/>
<field name="cutter_spacing_code"/>
</group>
<group>
<field name="functional_tool_name"/>
<field name="functional_tool_type"/>
<field name="functional_tool_code"/>
<field name="functional_tool_name_id"/>
<field name="functional_tool_type_id"/>
</group>
</group>
<group string="数据信息">
@@ -614,8 +641,8 @@
</group>
<group string="待换刀具信息">
<group>
<field name="replacement_tool_name"/>
<field name="replacement_tool_type"/>
<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"/>
@@ -643,18 +670,16 @@
<search>
<field name="name"/>
<field name="machine_tool_code" invisible="1"/>
<field name="machine_table_type"/>
<field name="machine_table_type_id"/>
<field name="cutter_spacing_code"/>
<field name="functional_tool_name"/>
<field name="functional_tool_type"/>
<field name="functional_tool_code"/>
<field name="functional_tool_name_id"/>
<field name="replacement_tool_code"/>
<field name="replacement_tool_name"/>
<field name="replacement_tool_type"/>
<field name="replacement_tool_name_id"/>
<field name="applicant"/>
<field name="used_tool_time"/>
<!-- <searchpanel>-->
<!-- <field name="machine_table_type" string="机床类型" enable_counters="1"/>-->
<!-- </searchpanel>-->
<searchpanel>
<field name="name" string="CNC机床" enable_counters="1" icon="fa-filter"/>
</searchpanel>
</search>
</field>
</record>
@@ -677,12 +702,15 @@
<field name="name"/>
<field name="cam_procedure_code"/>
<field name="cam_cutter_spacing_code"/>
<field name="functional_tool_name"/>
<field name="functional_tool_type"/>
<field name="machine_table_name"/>
<field name="machine_table_name_id"/>
<field name="functional_tool_name_id"/>
<field name="functional_tool_type_id"/>
<field name="machine_tool_cutter_spacing_code"/>
<field name="applicant"/>
<field name="remark"/>
<field name="remark" optional="hide"/>
<field name="plan_execute_status" invisible="True"/>
<button string="申请装刀" name="apply_for_tooling" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '0')]}" confirm="是否确认申请装刀"/>
<button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}"/>
</tree>
</field>
</record>
@@ -693,30 +721,7 @@
<field name="arch" type="xml">
<form>
<header>
<button string="申请装刀"
name="%(sf_tool_management.sf_apply_for_tooling_act)d"
type="action"
context="{ 'default_name':name,
'default_cam_procedure_code': cam_procedure_code,
'default_machine_table_name': machine_table_name,
'default_cam_cutter_spacing_code': cam_cutter_spacing_code,
'default_functional_tool_code': functional_tool_code,
'default_functional_tool_name': functional_tool_name,
'default_functional_tool_type': functional_tool_type,
'default_diameter': diameter,
'default_tool_loading_length': tool_loading_length,
'default_clearance_length': clearance_length,
'default_tool_included_angle': tool_included_angle,
'default_L_D': L_D,
'default_coarse_middle_thin': coarse_middle_thin,
'default_whether_standard_tool': whether_standard_tool,
'default_need_knife_time': need_knife_time,
'default_applicant': applicant,
'default_required_cutting_time': required_cutting_time,
'default_reason_for_applying': reason_for_applying}"
class="btn-primary"
attrs="{'invisible': [('plan_execute_status', '!=', '0')]}"
/>
<button string="申请装刀" name="apply_for_tooling" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '0')]}" confirm="是否确认申请装刀"/>
<button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}"/>
</header>
@@ -726,12 +731,12 @@
<field name="name"/>
<field name="cam_procedure_code"/>
<field name="cam_cutter_spacing_code"/>
<field name="machine_table_name"/>
<field name="machine_table_name_id"/>
</group>
<group>
<field name="functional_tool_code"/>
<field name="functional_tool_name"/>
<field name="functional_tool_type"/>
<field name="functional_tool_name_id"/>
<field name="functional_tool_type_id"/>
<field name="machine_tool_cutter_spacing_code"/>
</group>
</group>
@@ -770,11 +775,14 @@
<field name="name"/>
<field name="cam_procedure_code"/>
<field name="cam_cutter_spacing_code"/>
<field name="functional_tool_name"/>
<field name="functional_tool_type"/>
<field name="machine_table_name"/>
<field name="machine_table_name_id"/>
<field name="functional_tool_name_id"/>
<field name="functional_tool_type_id"/>
<field name="machine_tool_cutter_spacing_code"/>
<field name="applicant"/>
<searchpanel>
<field name="machine_table_name_id" string="CNC机床" enable_counters="1" icon="fa-filter"/>
</searchpanel>
</search>
</field>
</record>
@@ -795,14 +803,41 @@
<tree>
<field name="functional_tool_code"/>
<field name="name"/>
<field name="functional_tool_type"/>
<field name="loading_task_source"/>
<field name="functional_tool_type_id"/>
<field name="loading_task_source" optional="hide"/>
<field name="applicant"/>
<field name="assemble_status"/>
<field name="assemble_status" optional="hide"/>
<field name="use_tool_time" />
<field name="receive_person"/>
<field name="receive_time"/>
<field name="remark"/>
<field name="remark" optional="hide"/>
<field name="machine_tool_name_id" invisible="True"/>
<field name="cutter_spacing_code" 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="{
'default_machine_tool_name_id': machine_tool_name_id,
'default_code': functional_tool_code,
'default_cutter_spacing_code': cutter_spacing_code,
'default_functional_tool_name_id': name,
'default_functional_tool_type_id': functional_tool_type_id,
'default_functional_tool_length': functional_tool_length,
'default_effective_length': None,
'default_functional_tool_diameter': functional_tool_diameter,
'default_tool_included_angle': None,
'default_functional_tool_cutting_type': functional_tool_cutting_type,
'default_required_cutting_time': None,
'default_whether_standard_tool': None}"
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
<button string="取消组装" name="cancel_functional_tool_assembly" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
<button string="出库" name="show_popup" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
</tree>
</field>
</record>
@@ -817,10 +852,11 @@
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
type="action"
context="{
'default_machine_tool_name': machine_tool_name,
'default_machine_tool_name_id': machine_tool_name_id,
'default_code': functional_tool_code,
'default_cutter_spacing_code': cutter_spacing_code,
'default_functional_tool_name': name,
'default_functional_tool_type': functional_tool_type,
'default_functional_tool_name_id': name,
'default_functional_tool_type_id': functional_tool_type_id,
'default_functional_tool_length': functional_tool_length,
'default_effective_length': None,
'default_functional_tool_diameter': functional_tool_diameter,
@@ -844,7 +880,7 @@
<group>
<field name="functional_tool_code"/>
<field name="name"/>
<field name="functional_tool_type"/>
<field name="functional_tool_type_id"/>
</group>
<group>
<field name="functional_tool_diameter"/>
@@ -852,29 +888,53 @@
<field name="functional_tool_cutting_type"/>
</group>
</group>
<group string="组装信息">
<group string="组装物料信息">
<group>
<field name="tool_name"/>
<field name="tool_brand" string="刀具品牌"/>
<field name="tool_type" string="刀具型号"/>
<field name="coarse_middle_thin"/>
<field name="integral_code"/>
<field name="mrs_cutting_tool_integral_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="blade_code"/>
<field name="mrs_cutting_tool_blade_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="bar_code"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="pad_code"/>
<field name="mrs_cutting_tool_cutterpad_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="handle_code"/>
<field name="mrs_cutting_tool_cutterhandle_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="chuck_code"/>
<field name="mrs_cutting_tool_cutterhead_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
</group>
<group>
<field name="integral_name"/>
<field name="sf_tool_brand_id_1"/>
<field name="blade_name"/>
<field name="sf_tool_brand_id_2"/>
<field name="bar_name"/>
<field name="sf_tool_brand_id_3"/>
<field name="pad_name"/>
<field name="sf_tool_brand_id_4"/>
<field name="handle_name"/>
<field name="sf_tool_brand_id_5"/>
<field name="chuck_name"/>
<field name="sf_tool_brand_id_6"/>
</group>
</group>
<group string="组装参数信息">
<group>
<field name="coarse_middle_thin"/>
<field name="new_former"/>
<field name="tool_loading_length"/>
<field name="reference_length"/>
</group>
<group>
<field name="knife_handle_name"/>
<field name="knife_handle_brand" string="刀柄品牌"/>
<field name="knife_handle_type" string="刀柄型号"/>
<field name="cut_time"/>
<field name="cut_length"/>
<field name="cut_number"/>
</group>
</group>
</group>
<group string="申请信息">
<group>
<field name="production_line_name"/>
<field name="machine_tool_name"/>
<field name="production_line_name_id"/>
<field name="machine_tool_name_id"/>
<field name="machine_tool_code"/>
<field name="cutter_spacing_code"/>
<field name="applicant"/>
@@ -914,14 +974,17 @@
<search>
<field name="functional_tool_code"/>
<field name="name"/>
<field name="functional_tool_type"/>
<field name="functional_tool_type_id"/>
<field name="loading_task_source"/>
<field name="applicant"/>
<field name="assemble_status"/>
<field name="use_tool_time" />
<field name="use_tool_time"/>
<field name="receive_person"/>
<field name="receive_time"/>
<field name="remark"/>
<searchpanel>
<field name="functional_tool_type_id" enable_counters="1" icon="fa-filter"/>
</searchpanel>
</search>
</field>
</record>
@@ -932,8 +995,5 @@
<field name="res_model">sf.functional.tool.assembly</field>
<field name="view_mode">tree,form,search</field>
</record>
</data>
</odoo>