Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/夹具型号和功能夹具反向注册到cloud
This commit is contained in:
jinling.yang
@@ -18,7 +18,7 @@
|
|||||||
<field name="title"/>
|
<field name="title"/>
|
||||||
<field name="product_ids" widget="many2many_tags"/>
|
<field name="product_ids" widget="many2many_tags"/>
|
||||||
<field name="product_category_ids" widget="many2many_tags"/>
|
<field name="product_category_ids" widget="many2many_tags"/>
|
||||||
<field name="picking_type_ids" string="Operations" widget="many2many_tags"/>
|
<field name="picking_type_ids" string="作业类型" widget="many2many_tags"/>
|
||||||
<field name="company_id" groups="base.group_multi_company"/>
|
<field name="company_id" groups="base.group_multi_company"/>
|
||||||
</group>
|
</group>
|
||||||
<group>
|
<group>
|
||||||
@@ -112,7 +112,7 @@
|
|||||||
<field name="title" optional="show"/>
|
<field name="title" optional="show"/>
|
||||||
<field name="product_ids" widget="many2many_tags" optional="show"/>
|
<field name="product_ids" widget="many2many_tags" optional="show"/>
|
||||||
<field name="product_category_ids" widget="many2many_tags" optional="hide"/>
|
<field name="product_category_ids" widget="many2many_tags" optional="hide"/>
|
||||||
<field name="picking_type_ids" widget="many2many_tags" optional="show" string="Operations"/>
|
<field name="picking_type_ids" widget="many2many_tags" optional="show" string="作业类型"/>
|
||||||
<field name="test_type_id" optional="show" string="Type"/>
|
<field name="test_type_id" optional="show" string="Type"/>
|
||||||
<field name="team_id" optional="show"/>
|
<field name="team_id" optional="show"/>
|
||||||
<field name="user_id" optional="hide" widget='many2one_avatar_user'/>
|
<field name="user_id" optional="hide" widget='many2one_avatar_user'/>
|
||||||
|
|||||||
@@ -22,13 +22,13 @@
|
|||||||
sequence="3"
|
sequence="3"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<menuitem
|
<!-- <menuitem -->
|
||||||
id="menu_sf_machine_tool"
|
<!-- id="menu_sf_machine_tool" -->
|
||||||
parent="menu_sf_machine_tool_first"
|
<!-- parent="menu_sf_machine_tool_first" -->
|
||||||
name="机床"
|
<!-- name="机床" -->
|
||||||
sequence="0"
|
<!-- sequence="0" -->
|
||||||
action="action_sf_machine_tool"
|
<!-- action="action_sf_machine_tool" -->
|
||||||
/>
|
<!-- /> -->
|
||||||
|
|
||||||
<menuitem
|
<menuitem
|
||||||
id="menu_sf_machine_tool_category"
|
id="menu_sf_machine_tool_category"
|
||||||
|
|||||||
@@ -244,7 +244,7 @@
|
|||||||
|
|
||||||
<menuitem
|
<menuitem
|
||||||
id="menu_equipment_form1"
|
id="menu_equipment_form1"
|
||||||
name="设备"
|
name="设备清单"
|
||||||
parent="maintenance.menu_m_request"
|
parent="maintenance.menu_m_request"
|
||||||
action="hr_equipment_action1"
|
action="hr_equipment_action1"
|
||||||
groups="maintenance.group_equipment_manager,base.group_user"
|
groups="maintenance.group_equipment_manager,base.group_user"
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
'data/stock_data.xml',
|
'data/stock_data.xml',
|
||||||
'security/group_security.xml',
|
'security/group_security.xml',
|
||||||
'security/ir.model.access.csv',
|
'security/ir.model.access.csv',
|
||||||
|
'views/mrp_production_addional_change.xml',
|
||||||
'report/tray_report.xml',
|
'report/tray_report.xml',
|
||||||
# 'views/mrp_maintenance_views.xml',
|
# 'views/mrp_maintenance_views.xml',
|
||||||
'views/mrp_routing_workcenter_view.xml',
|
'views/mrp_routing_workcenter_view.xml',
|
||||||
|
|||||||
46
sf_manufacturing/views/mrp_production_addional_change.xml
Normal file
46
sf_manufacturing/views/mrp_production_addional_change.xml
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<odoo>
|
||||||
|
<data>
|
||||||
|
<record id="custom_mrp_production_tree_view" model="ir.ui.view">
|
||||||
|
<field name="name">custom.mrp.production.tree</field>
|
||||||
|
<field name="model">mrp.production</field>
|
||||||
|
<field name="inherit_id" ref="mrp.mrp_production_tree_view"/>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<xpath expr="//field[@name='product_id']" position="replace"/>
|
||||||
|
<xpath expr="//field[@name='product_qty']" position="replace"/>
|
||||||
|
<xpath expr="//field[@name='product_uom_id']" position="replace"/>
|
||||||
|
<xpath expr="//field[@name='reservation_state']" position="replace"/>
|
||||||
|
<xpath expr="//field[@name='date_deadline']" position="replace"/>
|
||||||
|
<xpath expr="//field[@name='name']" position="after">
|
||||||
|
<field name="product_id" readonly="1" optional="show"/>
|
||||||
|
</xpath>
|
||||||
|
<xpath expr="//field[@name='product_id']" position="after">
|
||||||
|
<field name="product_qty" sum="Total Qty" string="数量" readonly="1" optional="show"/>
|
||||||
|
</xpath>
|
||||||
|
<xpath expr="//field[@name='product_qty']" position="after">
|
||||||
|
<field name="product_uom_id" string="计量单位" options="{'no_open':True,'no_create':True}" groups="uom.group_uom" optional="show"/>
|
||||||
|
</xpath>
|
||||||
|
<xpath expr="//field[@name='date_planned_start']" position="after">
|
||||||
|
<field name="date_deadline" widget="remaining_days" attrs="{'invisible': [('state', 'in', ['done', 'cancel'])]}" optional="show"/>
|
||||||
|
</xpath>
|
||||||
|
<xpath expr="//field[@name='production_real_duration']" position="after">
|
||||||
|
<field name="reservation_state" optional="hide" decoration-danger="reservation_state == 'confirmed'" decoration-success="reservation_state == 'assigned'"/>
|
||||||
|
</xpath>
|
||||||
|
<xpath expr="//field[@name='activity_ids']" position="replace">
|
||||||
|
<field name="activity_ids" string="下一个活动" widget="list_activity" optional="hide"/>
|
||||||
|
</xpath>
|
||||||
|
<xpath expr="//field[@name='origin']" position="replace">
|
||||||
|
<field name="origin" optional="hide"/>
|
||||||
|
</xpath>
|
||||||
|
<xpath expr="//field[@name='components_availability']" position="replace">
|
||||||
|
<field name="components_availability" options='{"lazy": true}'
|
||||||
|
attrs="{'invisible': [('state', 'not in', ['confirmed', 'progress'])]}"
|
||||||
|
optional="hide"
|
||||||
|
decoration-success="reservation_state == 'assigned' or components_availability_state == 'available'"
|
||||||
|
decoration-warning="reservation_state != 'assigned' and components_availability_state in ('expected', 'available')"
|
||||||
|
decoration-danger="reservation_state != 'assigned' and components_availability_state == 'late'"/>
|
||||||
|
</xpath>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
</data>
|
||||||
|
</odoo>
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -4,6 +4,10 @@
|
|||||||
<record id="mrp.menu_mrp_manufacturing" model="ir.ui.menu">
|
<record id="mrp.menu_mrp_manufacturing" model="ir.ui.menu">
|
||||||
<field name="name">Operations1</field>
|
<field name="name">Operations1</field>
|
||||||
</record>
|
</record>
|
||||||
|
<record id="mrp.menu_mrp_routing_action" model="ir.ui.menu">
|
||||||
|
<field name="name">Process</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
|
||||||
<record id="mrp_workorder.mrp_workorder_menu_planning" model="ir.ui.menu">
|
<record id="mrp_workorder.mrp_workorder_menu_planning" model="ir.ui.menu">
|
||||||
<field name="name">工单计划</field>
|
<field name="name">工单计划</field>
|
||||||
|
|||||||
@@ -14,6 +14,9 @@ class SfToolMaterialSearch(models.Model):
|
|||||||
mrs_cutting_tool_type_id = fields.Many2one(
|
mrs_cutting_tool_type_id = fields.Many2one(
|
||||||
'sf.cutting.tool.type', '刀具类型',
|
'sf.cutting.tool.type', '刀具类型',
|
||||||
domain="[('mrs_cutting_tool_material_id.name', '=', mrs_cutting_tool_material_name)]")
|
domain="[('mrs_cutting_tool_material_id.name', '=', mrs_cutting_tool_material_name)]")
|
||||||
|
# 关联刀具物料名称
|
||||||
|
mrs_cutting_tool_material_name = fields.Char(related='mrs_cutting_tool_material_id.name', string='刀具物料名称',
|
||||||
|
store=True)
|
||||||
mrs_machine_brand_id = fields.Many2one('sf.machine.brand', '品牌')
|
mrs_machine_brand_id = fields.Many2one('sf.machine.brand', '品牌')
|
||||||
# 关联刀具型号
|
# 关联刀具型号
|
||||||
# mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', '刀具型号')
|
# mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', '刀具型号')
|
||||||
|
|||||||
@@ -104,19 +104,151 @@
|
|||||||
<field name="chuck_feature" optional="hide"/>
|
<field name="chuck_feature" optional="hide"/>
|
||||||
<field name="image" widget="image" optional="hide"/>
|
<field name="image" widget="image" optional="hide"/>
|
||||||
|
|
||||||
<field name="number"/>
|
<field name="number" optional="hide"/>
|
||||||
<field name="mrs_materials_model_id"/>
|
<field name="mrs_materials_model_id" optional="hide"/>
|
||||||
<field name="purchase_date"/>
|
<field name="purchase_date" optional="hide"/>
|
||||||
<field name="purchase_batch"/>
|
<field name="purchase_batch" optional="hide"/>
|
||||||
<field name="supplier"/>
|
<field name="supplier" optional="hide"/>
|
||||||
<field name="warehouse_name"/>
|
<field name="warehouse_name" optional="show"/>
|
||||||
<field name="warehouse_area"/>
|
<field name="warehouse_area" optional="show"/>
|
||||||
<field name="warehouse_location"/>
|
<field name="warehouse_location" optional="show"/>
|
||||||
<field name="three_d_model" widget="many2one"/>
|
<field name="three_d_model" widget="many2one" optional="show"/>
|
||||||
|
|
||||||
</tree>
|
</tree>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
<record id="view_sf_tool_material_search_form" model="ir.ui.view">
|
||||||
|
<field name="name">sf.tool.material.search.form</field>
|
||||||
|
<field name="model">sf.tool.material.search</field>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<form string="刀具物料查询">
|
||||||
|
<sheet>
|
||||||
|
<group string='基本信息'>
|
||||||
|
<group>
|
||||||
|
<field name="mrs_cutting_tool_material_name" invisible="1"/>
|
||||||
|
<field name="sequence"/>
|
||||||
|
<field name="code"/>
|
||||||
|
<field name="name"/>
|
||||||
|
<field name="mrs_cutting_tool_type_id"/>
|
||||||
|
<field name="mrs_machine_brand_id"/>
|
||||||
|
<!-- <field name="mrs_cutting_tool_model_id"/> -->
|
||||||
|
<field name="mrs_materials_model_id"/>
|
||||||
|
<field name="mrs_cutting_tool_material_id"/>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<field name="image" widget="image"/>
|
||||||
|
<field name="three_d_model" widget="many2one"/>
|
||||||
|
</group>
|
||||||
|
</group>
|
||||||
|
<group string='刀具库存信息'>
|
||||||
|
<group>
|
||||||
|
<field name="number"/>
|
||||||
|
<field name="mrs_materials_model_id"/>
|
||||||
|
<field name="purchase_date"/>
|
||||||
|
<field name="purchase_batch"/>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<field name="supplier"/>
|
||||||
|
<field name="warehouse_name"/>
|
||||||
|
<field name="warehouse_area"/>
|
||||||
|
<field name="warehouse_location"/>
|
||||||
|
</group>
|
||||||
|
</group>
|
||||||
|
<group string='刀具信息'>
|
||||||
|
<group>
|
||||||
|
<field name="blade_length"/>
|
||||||
|
<field name="blade_width"/>
|
||||||
|
<field name="blade_height"/>
|
||||||
|
<field name="blade_top_angle"/>
|
||||||
|
<field name="blade_front_angle"/>
|
||||||
|
<field name="blade_rear_angle"/>
|
||||||
|
<field name="blade_main_included_angle"/>
|
||||||
|
<field name="blade_r_angle"/>
|
||||||
|
<field name="blade_hardness"/>
|
||||||
|
<field name="blade_accuracy"/>
|
||||||
|
<field name="blade_coating_material_id"/>
|
||||||
|
<field name="blade_radius"/>
|
||||||
|
<field name="blade_nut"/>
|
||||||
|
<field name="mrs_cutting_tool_model_blade_cutter_pad_ids" widget="many2many_tags"/>
|
||||||
|
<field name="mrs_cutting_tool_model_blade_cutter_bar_ids" widget="many2many_tags"/>
|
||||||
|
|
||||||
|
<field name="integral_total_length"/>
|
||||||
|
<field name="integral_shank_length"/>
|
||||||
|
<field name="integral_blade_length"/>
|
||||||
|
<field name="integral_diameter"/>
|
||||||
|
<field name="integral_blade_number"/>
|
||||||
|
<field name="integral_front_angle"/>
|
||||||
|
<field name="integral_rear_angle"/>
|
||||||
|
<field name="integral_main_included_angle"/>
|
||||||
|
<field name="integral_accuracy"/>
|
||||||
|
<field name="integral_hardness"/>
|
||||||
|
<field name="integral_coating_material"/>
|
||||||
|
<field name="integral_nut"/>
|
||||||
|
<field name="integral_scope"/>
|
||||||
|
|
||||||
|
<field name="bar_c_diameter"/>
|
||||||
|
<field name="bar_total_length"/>
|
||||||
|
<field name="bar_blade_number"/>
|
||||||
|
<field name="bar_d_diameter"/>
|
||||||
|
<field name="mrs_cutting_tool_model_bar_blade_ids" widget="many2many_tags"/>
|
||||||
|
<field name="bar_wrench"/>
|
||||||
|
<field name="bar_screw"/>
|
||||||
|
<field name="bar_radius"/>
|
||||||
|
<field name="bar_accuracy"/>
|
||||||
|
<field name="bar_hardness"/>
|
||||||
|
<field name="bar_scope"/>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<field name="pad_c_diameter"/>
|
||||||
|
<field name="pad_total_length"/>
|
||||||
|
<field name="pad_blade_number"/>
|
||||||
|
<field name="pad_d_diameter"/>
|
||||||
|
<field name="mrs_cutting_tool_model_pad_blade_ids" widget="many2many_tags"/>
|
||||||
|
<field name="pad_wrench"/>
|
||||||
|
<field name="pad_screw"/>
|
||||||
|
<field name="pad_radius"/>
|
||||||
|
<field name="pad_accuracy"/>
|
||||||
|
<field name="pad_hardness"/>
|
||||||
|
<field name="pad_scope"/>
|
||||||
|
|
||||||
|
<field name="handle_length"/>
|
||||||
|
<field name="handle_diameter"/>
|
||||||
|
<field name="handle_flange_length"/>
|
||||||
|
<field name="handle_flange_diameter"/>
|
||||||
|
<field name="handle_clamping_diameter_min"/>
|
||||||
|
<field name="handle_clamping_diameter_max"/>
|
||||||
|
<field name="handle_jump_accuracy"/>
|
||||||
|
<field name="handle_max_speed"/>
|
||||||
|
<field name="handle_weight"/>
|
||||||
|
<field name="handle_body_accuracy"/>
|
||||||
|
<field name="handle_nut"/>
|
||||||
|
<field name="mrs_cutting_tool_model_handle_chuck_model_ids" widget="many2many_tags"/>
|
||||||
|
<field name="handle_clamping_range"/>
|
||||||
|
<field name="handle_detection_accuracy"/>
|
||||||
|
<field name="handle_detection_hardness"/>
|
||||||
|
<field name="handle_standard_speed"/>
|
||||||
|
|
||||||
|
<field name="chuck_accuracy"/>
|
||||||
|
<field name="chuck_clamping_diameter_min"/>
|
||||||
|
<field name="chuck_clamping_diameter_max"/>
|
||||||
|
<field name="chuck_diameter"/>
|
||||||
|
<field name="chuck_inner_diameter"/>
|
||||||
|
<field name="chuck_height"/>
|
||||||
|
<field name="chuck_nut"/>
|
||||||
|
<field name="mrs_cutting_tool_model_chuck_handle_model_ids" widget="many2many_tags"/>
|
||||||
|
<field name="chuck_clamping_range"/>
|
||||||
|
<field name="chuck_feature"/>
|
||||||
|
</group>
|
||||||
|
</group>
|
||||||
|
</sheet>
|
||||||
|
</form>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- 刀具物料搜索 -->
|
<!-- 刀具物料搜索 -->
|
||||||
<record id="search_sf_tool_material_search" model="ir.ui.view">
|
<record id="search_sf_tool_material_search" model="ir.ui.view">
|
||||||
<field name="name">sf.tool.material.search.search</field>
|
<field name="name">sf.tool.material.search.search</field>
|
||||||
|
|||||||
Reference in New Issue
Block a user