Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版报废

# Conflicts:
#	sf_manufacturing/security/ir.model.access.csv

sf_manufacturing/wizard/rework_wizard.py

@@ -81,10 +81,14 @@ class ReworkWizard(models.TransientModel):
             if production_id:
                 if self.env.user.has_group('sf_base.group_sf_order_user'):
                     panel_ids = []
+                    panel_arr = production_id.product_id.model_processing_panel
                     for p in production_id.detection_result_ids.filtered(
                             lambda ap1: ap1.handle_result == '待处理'):
+                        if p.processing_panel not in panel_arr:
+                            panel_arr += ','.join(p.processing_panel)
+                    for item in panel_arr.split(','):
                         panel = self.env['sf.processing.panel'].search(
-                            [('name', 'ilike', p.processing_panel)])
+                            [('name', 'ilike', item)])
                         if panel:
                             panel_ids.append(panel.id)
                     domain = {'processing_panel_id': [('id', 'in', panel_ids)]}