Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协

# Conflicts:
#	sf_dlm/__manifest__.py
#	sf_dlm/models/product_template.py
#	sf_manufacturing/models/mrp_production.py

sf_manufacturing/models/mrp_workorder.py

@@ -155,6 +155,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,
@@ -163,7 +164,8 @@ class ResMrpWorkOrder(models.Model):
             'date_planned_start': False,
             'date_planned_finished': False,
             'duration_expected': 60,
-            'duration': 0
+            'duration': 0,
+
         }]
         return workorders_values_str
 
@@ -423,7 +425,8 @@ class ResMrpWorkOrder(models.Model):
             'date_planned_start': False,
             'date_planned_finished': False,
             'duration_expected': 60,
-            'duration': 0
+            'duration': 0,
+
         }]
         return workorders_values_str
 
@@ -432,6 +435,7 @@ class ResMrpWorkOrder(models.Model):
         if self.routing_type == '装夹':
             self.pro_code = self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name
         if self.state == 'waiting' or self.state == 'ready' or self.state == 'progress':
+            self.move_raw_ids = self.production_id.move_raw_ids
             self.ensure_one()
             if any(not time.date_end for time in self.time_ids.filtered(lambda t: t.user_id.id == self.env.user.id)):
                 return True