合并企业版模块

sf_manufacturing/models/mrp_production.py

@@ -135,9 +135,9 @@ class MrpProduction(models.Model):
                 for route in embryo_routing_workcenter:
                     workorders_values.append(
                         self.env['mrp.workorder'].json_workorder_str('', production, route))
-            # production.workorder_ids = workorders_values
-            # for workorder in production.workorder_ids:
-            #     workorder.duration_expected = workorder._get_duration_expected()
+            production.workorder_ids= workorders_values
+            for workorder in production.workorder_ids:
+                workorder.duration_expected = workorder._get_duration_expected()
 
 
     #在之前的销售单上重新生成制造订单

sf_manufacturing/models/mrp_workorder.py

@@ -145,6 +145,7 @@ class ResMrpWorkOrder(models.Model):
             'operation_id': False,
             'name': route.route_workcenter_id.name,
             'processing_panel': k,
+            'quality_point_ids':route.route_workcenter_id.quality_point_ids,
             'routing_type': route.routing_type,
             'work_state': '' if not route.routing_type == '获取CNC加工程序' else '待发起',
             'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,