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(