diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index 0f428d43..32124b28 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -178,7 +178,7 @@ class MrpProduction(models.Model): raise UserError("更新程单失败,请联系管理员") # cnc程序获取 - def fetchCNC(self, production_names, scrap_production): + def fetchCNC(self, production_names): cnc = self.env['mrp.production'].search([('id', '=', self.id)]) quick_order = self.env['quick.easy.order'].search( [('name', '=', cnc.product_id.default_code.rsplit('-', 1)[0])]) @@ -194,8 +194,7 @@ class MrpProduction(models.Model): 'production_no': production_names, 'machine_tool_code': '', 'product_name': cnc.product_id.name, - 'remanufacture_type': '' if not scrap_production else scrap_production.workorder_ids.filtered( - lambda b: b.routing_type == "CNC加工").test_results, + 'remanufacture_type': '', 'model_code': cnc.product_id.model_code, 'material_code': self.env['sf.production.materials'].search( [('id', '=', cnc.product_id.materials_id.id)]).materials_no, @@ -337,8 +336,7 @@ class MrpProduction(models.Model): [('product_id.id', '=', production.product_id.id), ('origin', '=', production.origin)], limit=1, order='id asc') if not production_programming.programming_no: - production.fetchCNC(', '.join(product_id_to_production_names[production.product_id.id]), - scrap_production) + production.fetchCNC(', '.join(product_id_to_production_names[production.product_id.id])) else: production.write({'programming_no': production_programming.programming_no, 'programming_state': '编程中'}) diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index 0753d556..cea53c64 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -636,7 +636,7 @@ class ResProductMo(models.Model): 'model_remark': item['remark'], 'default_code': '%s-%s' % (order_number, i), 'manual_quotation': item['manual_quotation'] or False, - 'part_number': item['part_number'] or '', + 'part_number': item.get('part_number') or '', 'active': True, } copy_product_id.sudo().write(vals)