Merge branch 'feature/修复工单cnc校验bug_1' into feature/修复工单cnc校验bug_2

sf_manufacturing/models/mrp_workorder.py

@@ -777,6 +777,8 @@ class ResMrpWorkOrder(models.Model):
                                 if workorder.production_id.is_rework is True:
                                     if re_work or cnc_workorder:
                                         workorder.state = 'waiting'
+                            if workorder.production_id.tool_state in ['1', '2'] and workorder.state != 'pending':
+                                workorder.state = 'waiting'
 
                     elif workorder.routing_type == 'CNC加工' and workorder.state not in ['done', 'rework', 'cancel']:
                         pre_workorder = self.env['mrp.workorder'].search(