diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py index 3b2a8682..dd97531f 100644 --- a/sf_manufacturing/controllers/controllers.py +++ b/sf_manufacturing/controllers/controllers.py @@ -225,14 +225,14 @@ class Manufacturing_Connect(http.Controller): # workorder.sudo().production_id.process_state = '待解除装夹' # 根据工单的实际结束时间修改排程单的结束时间、状态,同时修改销售订单的状态 - if workorder.date_finished: - request.env['sf.production.plan'].sudo().search([('production_id', '=', production_id)]).write( - {'actual_end_time': workorder.date_finished, - 'state': 'finished'}) - production_obj = request.env['mrp.production'].sudo().search([('name', '=', production_id)]) - if production_obj: - production_obj.sudo().work_order_state = '已完成' - production_obj.write({'state': 'completed'}) + # if workorder.date_finished: + # request.env['sf.production.plan'].sudo().search([('production_id', '=', production_id)]).write( + # {'actual_end_time': workorder.date_finished, + # 'state': 'finished'}) + # production_obj = request.env['mrp.production'].sudo().search([('name', '=', production_id)]) + # if production_obj: + # production_obj.sudo().work_order_state = '已完成' + # production_obj.write({'state': 'done'}) # request.env['sale.order'].sudo().search( # [('name', '=', production_obj.origin)]).write({'schedule_status': 'to deliver'}) diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index a11404bf..0375b48e 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -1015,7 +1015,7 @@ class ResMrpWorkOrder(models.Model): move_raw_id.quantity_done = move_raw_id.product_uom_qty record.process_state = '已完工' record.production_id.process_state = '已完工' - if record.routing_type in ['表面工艺']: + if record.routing_type in ['解除装夹', '表面工艺']: raw_move = self.env['stock.move'].sudo().search( [('origin', '=', record.production_id.name), ('procure_method', '=', 'make_to_order'), ('state', '!=', 'done')])