diff --git a/mrp_workorder/views/mrp_workorder_views.xml b/mrp_workorder/views/mrp_workorder_views.xml index efabc78b..61491d4c 100644 --- a/mrp_workorder/views/mrp_workorder_views.xml +++ b/mrp_workorder/views/mrp_workorder_views.xml @@ -160,10 +160,7 @@ if env.user.has_group('mrp.group_mrp_workorder_dependencies'): - - - - + diff --git a/sf_maintenance/__manifest__.py b/sf_maintenance/__manifest__.py index cc2a1d46..17b1e541 100644 --- a/sf_maintenance/__manifest__.py +++ b/sf_maintenance/__manifest__.py @@ -12,12 +12,11 @@ 'data': [ 'security/group_security.xml', 'security/ir.model.access.csv', - 'views/production_line_base.py', + 'views/production_line_view.xml', 'views/maintenance_views.xml', 'views/maintenance_logs_views.xml', 'views/equipment_maintenance_standards_views.xml', 'views/maintenance_request_views.xml', - 'views/production_line_view.xml', ], 'installable': True, 'application': False, diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 2c38616e..3b1ecdb1 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -524,6 +524,18 @@ class ResMrpWorkOrder(models.Model): }) 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): _name = 'sf.cnc.processing' diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml index e024b46c..db5f2ed4 100644 --- a/sf_manufacturing/views/mrp_workorder_view.xml +++ b/sf_manufacturing/views/mrp_workorder_view.xml @@ -11,7 +11,6 @@ - @@ -96,26 +95,26 @@ - - 工单 - ir.actions.act_window - mrp.workorder - tree,kanban,form - + + + + + + - - - - - - - - -

- 没有已排程的工单! -

-
-
+ + + + + + + + + + + + + @@ -440,5 +439,35 @@
+ + + + 工单 + ir.actions.act_window + mrp.workorder + tree,kanban,form + + + [('schedule_state', '=', '已排')] + + + + + + + + + + + + + + + +