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

工单菜单优化

Browse Source
This commit is contained in:
jinling.yang
2023-07-10 17:33:17 +08:00
parent 94856b0c55
commit 7743c9658c
4 changed files with 63 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mrp_workorder/views/mrp_workorder_views.xml
View File

@@ -160,10 +160,7 @@ if env.user.has_group('mrp.group_mrp_workorder_dependencies'):
<!-- <field name="name">Work Orders</field>--> <!-- <field name="name">Work Orders</field>-->
<!-- <field name="type">ir.actions.act_window</field>--> <!-- <field name="type">ir.actions.act_window</field>-->
<!-- <field name="res_model">mrp.workorder</field>--> <!-- <field name="res_model">mrp.workorder</field>-->
<!-- <field name="view_mode">kanban,tree,form</field>-->
<!-- <field name="view_ids" eval="[(5, 0, 0),-->
<!-- (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')}),-->
<!-- (0, 0, {'view_mode': 'tree', 'view_id': ref('mrp.mrp_production_workorder_tree_editable_view')}) ]"/>-->
<!-- <field name="target">fullscreen</field>--> <!-- <field name="target">fullscreen</field>-->
<!-- <field name="domain">[('state', 'not in', ['done', 'cancel'])]</field>--> <!-- <field name="domain">[('state', 'not in', ['done', 'cancel'])]</field>-->
<!-- <field name="context">{'search_default_workcenter_id': active_id}</field>--> <!-- <field name="context">{'search_default_workcenter_id': active_id}</field>-->

3
sf_maintenance/__manifest__.py
View File

@@ -12,12 +12,11 @@
'data': [ 'data': [
'security/group_security.xml', 'security/group_security.xml',
'security/ir.model.access.csv', 'security/ir.model.access.csv',
'views/production_line_base.py', 'views/production_line_view.xml',
'views/maintenance_views.xml', 'views/maintenance_views.xml',
'views/maintenance_logs_views.xml', 'views/maintenance_logs_views.xml',
'views/equipment_maintenance_standards_views.xml', 'views/equipment_maintenance_standards_views.xml',
'views/maintenance_request_views.xml', 'views/maintenance_request_views.xml',
'views/production_line_view.xml',
], ],
'installable': True, 'installable': True,
'application': False, 'application': False,

12
sf_manufacturing/models/mrp_workorder.py
View File

@@ -524,6 +524,18 @@ class ResMrpWorkOrder(models.Model):
}) })
super().button_finish() super().button_finish()
def action_view_schedule_tree(self):
# 执行打开树视图的操作(已排程的工单)
return {
'name': 'Schedule Work Order Tree',
'type': 'ir.actions.act_window',
'res_model': 'mrp.workorder',
'target': 'current',
'view_mode': 'tree',
'views': [[self.env.ref('mrp.mrp_production_workorder_tree_editable_view').id], 'tree'],
'domain': [('schedule_state', '=', '已排')],
}
class CNCprocessing(models.Model): class CNCprocessing(models.Model):
_name = 'sf.cnc.processing' _name = 'sf.cnc.processing'

69
sf_manufacturing/views/mrp_workorder_view.xml
View File

@@ -11,7 +11,6 @@
<field name="name" decoration-success="is_subcontract" decoration-bf="is_subcontract"/> <field name="name" decoration-success="is_subcontract" decoration-bf="is_subcontract"/>
</field> </field>
<field name="name" position="before"> <field name="name" position="before">
<field name="schedule_state"/>
<field name="sequence"/> <field name="sequence"/>
<field name='user_permissions' invisible="1"/> <field name='user_permissions' invisible="1"/>
</field> </field>
@@ -96,26 +95,26 @@
</field> </field>
</record> </record>
<record model="ir.actions.act_window" id="mrp_workorder_action_scheduled"> <!-- <record model="ir.actions.act_window" id="mrp_workorder_action_scheduled">-->
<field name="name">工单</field> <!-- <field name="name">工单</field>-->
<field name="type">ir.actions.act_window</field> <!-- <field name="type">ir.actions.act_window</field>-->
<field name="res_model">mrp.workorder</field> <!-- <field name="res_model">mrp.workorder</field>-->
<field name="view_mode">tree,kanban,form</field> <!-- <field name="view_mode">tree,kanban,form</field>-->
<field name="view_id" ref="view_mrp_production_workorder_tree_editable_inherit_sf"/> <!-- <field name="view_id" ref="view_mrp_production_workorder_tree_editable_inherit_sf"/>-->
<!-- <field name="view_ids" eval="[(5, 0, 0),--> <!-- &lt;!&ndash; <field name="view_ids" eval="[(5, 0, 0),&ndash;&gt;-->
<!-- (0, 0, {'view_mode': 'tree', 'view_id': ref('mrp.mrp_production_workorder_tree_view')}),--> <!-- &lt;!&ndash; (0, 0, {'view_mode': 'tree', 'view_id': ref('mrp.mrp_production_workorder_tree_view')}),&ndash;&gt;-->
<!-- (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')}) ]"/>--> <!-- &lt;!&ndash; (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')}) ]"/>&ndash;&gt;-->
<!-- <field name="target">fullscreen</field>--> <!-- &lt;!&ndash; <field name="target">fullscreen</field>&ndash;&gt;-->
<!-- <field name="search_view_id" ref="mrp.view_mrp_production_workorder_form_view_filter"/>--> <!-- &lt;!&ndash; <field name="search_view_id" ref="mrp.view_mrp_production_workorder_form_view_filter"/>&ndash;&gt;-->
<!-- <field name="domain">[('state', '!=', 'cancel'),('schedule_state', '=', '已排')]</field>--> <!-- &lt;!&ndash; <field name="domain">[('state', '!=', 'cancel'),('schedule_state', '=', '已排')]</field>&ndash;&gt;-->
<!-- <field name="context">{'search_default_workcenter_id': active_id}</field>--> <!-- &lt;!&ndash; <field name="context">{'search_default_workcenter_id': active_id}</field>&ndash;&gt;-->
<field name="help" type="html"> <!-- <field name="help" type="html">-->
<p class="o_view_nocontent_workorder"> <!-- <p class="o_view_nocontent_workorder">-->
没有已排程的工单！ <!-- 没有已排程的工单！-->
</p> <!-- </p>-->
</field> <!-- </field>-->
</record> <!-- </record>-->
<!-- <record model="ir.ui.view" id="view_mrp_production_workorder_form_inherit_sf">--> <!-- <record model="ir.ui.view" id="view_mrp_production_workorder_form_inherit_sf">-->
@@ -440,5 +439,35 @@
</xpath> </xpath>
</field> </field>
</record> </record>
<record id="mrp_workorder_action_schedule" model="ir.actions.act_window">
<field name="name">工单</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.workorder</field>
<field name="view_mode">tree,kanban,form</field>
<field name="view_id" eval="mrp.mrp_production_workorder_tree_editable_view"/>
<field name="search_view_id" ref="mrp.view_mrp_production_work_order_search"/>
<field name="domain">[('schedule_state', '=', '已排')]</field>
</record>
<menuitem id="menu_mrp_workorder_schedule_todo"
name="工单1"
action="mrp_workorder_action_schedule"
parent="mrp.menu_mrp_manufacturing"
sequence="15"/>
<!-- <record id="action_schedule_workorder_tree" model="ir.actions.server">-->
<!-- <field name="name">View Schedule Work Order Tree</field>-->
<!-- <field name="model_id" ref="model_mrp_workorder"/>-->
<!-- <field name="state">code</field>-->
<!-- <field name="code">model.action_view_schedule_tree()</field>-->
<!-- </record>-->
<!-- <record id="menu_schedule_workorder_tree" model="ir.ui.menu">-->
<!-- <field name="name">schedule Work Order Tree</field>-->
<!-- <field name="action" ref="action_schedule_workorder_tree"/>-->
<!-- <field name="sequence" eval="16"/>-->
<!-- </record>-->
</odoo> </odoo>