diff --git a/quality_control/wizard/quality_check_wizard.py b/quality_control/wizard/quality_check_wizard.py index 1317236d..3c67eb87 100644 --- a/quality_control/wizard/quality_check_wizard.py +++ b/quality_control/wizard/quality_check_wizard.py @@ -62,7 +62,8 @@ class QualityCheckWizard(models.TransientModel): def do_pass(self): if self.test_type == 'picture' and not self.picture: - raise UserError('You must provide a picture before validating') + raise UserError('请先上传照片') + # raise UserError('You must provide a picture before validating') self.current_check_id.do_pass() return self.action_generate_next_window() diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py index 30485988..02018a11 100644 --- a/sf_manufacturing/models/stock.py +++ b/sf_manufacturing/models/stock.py @@ -1032,6 +1032,8 @@ class ReStockMove(models.Model): productions = self.env['mrp.production'].search( [('origin', '=', production.origin), ('product_id', '=', production.product_id.id)]) res['origin'] = ','.join(productions.mapped('name')) + if self.picking_type_id.name == '客供料入库': + self.picking_id.sudo().write({'origin': res['origin'] if res.get('origin') else self[0].picking_id.origin}) return res def _get_new_picking_values(self): diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py index 11827819..6061dda8 100644 --- a/sf_manufacturing/wizard/rework_wizard.py +++ b/sf_manufacturing/wizard/rework_wizard.py @@ -140,7 +140,7 @@ class ReworkWizard(models.TransientModel): and item.process_parameters_id == work.surface_technics_parameters_id) or (item.route_id.name == work.name and item.panel and item.panel == work.processing_panel) or - (item.route_id == work.routing_workcenter_id + (item.route_id == work.routing_work_center_id and not work.processing_panel and not work.surface_technics_parameters_id)) if route: