From 70bc2ed7180e41b9734cd7bf7d46288aa49ba684 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Sat, 18 May 2024 10:21:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E9=9D=A2=E5=B7=A5?= =?UTF-8?q?=E8=89=BA=E5=A4=96=E5=8D=8F=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_workorder.py | 1 + sf_manufacturing/models/stock.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 364207d5..02b64bc6 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -911,6 +911,7 @@ class ResMrpWorkOrder(models.Model): }) tem_date_planned_finished = record.date_planned_finished super().button_finish() + # 表面工艺工单完成不走该修改 if record.routing_type != '表面工艺': record.write({ 'date_planned_finished': tem_date_planned_finished # 保持原值 diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py index 39c0f4bf..f6198f02 100644 --- a/sf_manufacturing/models/stock.py +++ b/sf_manufacturing/models/stock.py @@ -552,8 +552,8 @@ class StockPicking(models.Model): [('workorder_id', '=', sorted_workorders.id), ('production_id', '=', item.id)]) if not outcontract_stock_move: new_picking = True - location_id = self.env.ref( - 'sf_manufacturing.stock_location_locations_virtual_outcontract').id, + location_id = self.env['stock.location'].search( + [('barcode', 'ilike', 'VL-SPOC')]).id, location_dest_id = self.env['stock.location'].search( [('barcode', 'ilike', 'WH-PREPRODUCTION')]).id, outcontract_picking_type_in = self.env.ref(