From e011e4cfd60be272f7f753d70644be4543a61f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= Date: Thu, 5 Dec 2024 09:31:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=A1=A8=E9=9D=A2=E5=B7=A5?= =?UTF-8?q?=E8=89=BA=E5=B7=A5=E5=8D=95=E5=AE=8C=E6=88=90=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93=E5=8D=95=E6=9C=AA=E5=B0=B1?= =?UTF-8?q?=E7=BB=AA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_workorder.py | 14 +++++++------- sf_sale/models/sale_order.py | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 4967b32d..24bad9e7 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -1433,13 +1433,13 @@ 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 ['表面工艺']: - raw_move = self.env['stock.move'].sudo().search( - [('origin', '=', record.production_id.name), - ('procure_method', 'in', ['make_to_order', 'make_to_stock']), - ('state', '!=', 'done')]) - if raw_move: - raw_move.write({'state': 'done'}) + # if record.routing_type in ['表面工艺']: + # raw_move = self.env['stock.move'].sudo().search( + # [('origin', '=', record.production_id.name), + # ('procure_method', 'in', ['make_to_order', 'make_to_stock']), + # ('state', '!=', 'done')]) + # if raw_move: + # raw_move.write({'state': 'done'}) record.production_id.button_mark_done1() # record.production_id.state = 'done' diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index 3879860e..6a1d3023 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -279,14 +279,14 @@ class RePurchaseOrder(models.Model): 'product_uom': server_template.uom_id.id })) - if server_product_process: - purchase_order = self.env['purchase.order'].sudo().create({ - 'partner_id': server_template.seller_ids[0].partner_id.id, - 'origin': production.name, - 'state': 'draft', - 'purchase_type': 'consignment', - 'order_line': server_product_process}) - consecutive_process_parameters.purchase_id = [(6, 0, [purchase_order.id])] + if server_product_process: + purchase_order = self.env['purchase.order'].sudo().create({ + 'partner_id': server_template.seller_ids[0].partner_id.id, + 'origin': production.name, + 'state': 'draft', + 'purchase_type': 'consignment', + 'order_line': server_product_process}) + pp.purchase_id = [(6, 0, [purchase_order.id])] # self.env.cr.commit() @api.onchange('order_line')