diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index 4026c061..0e388d20 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -136,6 +136,7 @@ class MrpProduction(models.Model): for workorder in production.workorder_ids: workorder.duration_expected = workorder._get_duration_expected() + #在之前的销售单上重新生成制造订单 def create_production1_values(self, production): production_values_str = {'origin': production.origin, @@ -232,6 +233,9 @@ class MrpProduction(models.Model): for work in rec.workorder_ids: work.sequence = current_sequence current_sequence += 1 + if work.name == '获取CNC加工程序': + work.button_start() + work.fetchCNC() #创建工单并进行排序 def _create_workorder(self): diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml index 85ed09f0..2a847788 100644 --- a/sf_manufacturing/views/mrp_workorder_view.xml +++ b/sf_manufacturing/views/mrp_workorder_view.xml @@ -22,13 +22,13 @@ - {'invisible': ['|', '|', '|','|', ('production_state','in', ('draft', 'done', + {'invisible': ['|', '|', '|','|','|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), - ('is_user_working', '!=', False),("user_permissions","=",False)]} + ('is_user_working', '!=', False),("user_permissions","=",False),("name","=","获取CNC加工程序")]} - {'invisible': [("user_permissions","=",False)]} + {'invisible': ['|',("user_permissions","=",False),("name","=","获取CNC加工程序")]} 停工 @@ -103,20 +103,21 @@ +