From 4e81243adc038f5f76528356fa61788237cadfe6 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Tue, 16 May 2023 17:32:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E5=8D=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_workorder.py | 11 ++++++----- sf_manufacturing/models/stock.py | 5 ++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 097187ff..3e7edd2d 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -434,6 +434,12 @@ class ResMrpWorkOrder(models.Model): def button_start(self): if self.routing_type == '装夹': self.pro_code = self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name + # 外协出库单，从“正在等待”变为“就绪”状态 + if self.is_subcontract is True: + picking_out = self.env['stock.picking'].search([('id', '=', self.picking_out_id.id)]) + if picking_out: + if picking_out.state == 'confirmed': + picking_out.write({'state': 'assigned'}) 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() @@ -479,11 +485,6 @@ class ResMrpWorkOrder(models.Model): if self.date_planned_finished and self.date_planned_finished < start_date: vals['date_planned_finished'] = start_date return self.write(vals) - # 外协出库单，从“正在等待”变为“就绪”状态 - if self.is_subcontract is True: - picking_out = self.env['stock.picking'].search([('id', '=', self.picking_out_id.id)]) - if picking_out: - picking_out.write({'state': 'assigned'}) else: raise UserError(_('请先完成上一步工单')) diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py index 3a79e6f3..e4da2a35 100644 --- a/sf_manufacturing/models/stock.py +++ b/sf_manufacturing/models/stock.py @@ -290,8 +290,8 @@ class StockPicking(models.Model): moves_in._get_new_picking_values_Res(item, sorted_workorders, 'WH/OCIN/')) picking_out = self.env['stock.picking'].create( moves_out._get_new_picking_values_Res(item, sorted_workorders, 'WH/OCOUT/')) - moves_in.write({'picking_id': picking_in.id}) - moves_out.write({'picking_id': picking_out.id}) + moves_in.write({'picking_id': picking_in.id, 'state': 'confirmed'}) + moves_out.write({'picking_id': picking_out.id, 'state': 'confirmed'}) moves_in._assign_picking_post_process(new=new_picking) moves_out._assign_picking_post_process(new=new_picking) m += 1 @@ -315,4 +315,3 @@ class ReStockMove(models.Model): 'location_dest_id': self.mapped('location_dest_id').id, 'state': 'confirmed', } -