From 78a456849c85cf5d56eab97d0afb7fb1aca34ea8 Mon Sep 17 00:00:00 2001 From: guanhuan Date: Tue, 31 Dec 2024 09:55:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=88=90=E5=93=81=E8=B0=83?= =?UTF-8?q?=E6=8B=A8=E5=87=BA=E5=BA=93=E8=AE=A2=E5=8D=95=E7=9A=84=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=B2=A1=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/stock.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py index 1d880d66..2dcab4be 100644 --- a/sf_manufacturing/models/stock.py +++ b/sf_manufacturing/models/stock.py @@ -654,11 +654,8 @@ class StockPicking(models.Model): if self.location_id.name == '成品存货区' and self.location_dest_id.name == '客户': sale_id = self.env['sale.order'].sudo().search( [('name', '=', self.origin)]) - check_backorder = self._pre_action_done_hook() - if check_backorder is not True: - return res - if sale_id: - sale_id.write({'state':'delivered'}) + if sale_id and res: + sale_id.write({'state': 'delivered'}) return res # 创建 外协出库入单 @@ -674,12 +671,14 @@ class StockPicking(models.Model): }) move_dest_id = False # 如果当前工单是是制造订单的最后一个工艺外协工单 - if workorder == next((workorder for workorder in reversed(sorted_workorders) if workorder.is_subcontract), None): + if workorder == next((workorder for workorder in reversed(sorted_workorders) if workorder.is_subcontract), + None): move_dest_id = item.move_raw_ids[0].id else: # 从sorted_workorders中找到上一工单的move if len(sorted_workorders) > 1: - move_dest_id = sorted_workorders[sorted_workorders.index(workorder)+1].move_subcontract_workorder_ids[1].id + move_dest_id = \ + sorted_workorders[sorted_workorders.index(workorder) + 1].move_subcontract_workorder_ids[1].id new_picking = True outcontract_picking_type_in = self.env.ref( 'sf_manufacturing.outcontract_picking_in').id, @@ -705,9 +704,6 @@ class StockPicking(models.Model): {'picking_id': picking_out.id, 'state': 'waiting'}) moves_out._assign_picking_post_process(new=new_picking) - - - @api.depends('move_type', 'immediate_transfer', 'move_ids.state', 'move_ids.picking_id') def _compute_state(self): super(StockPicking, self)._compute_state()