diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml index 1862e33c..f335c1b5 100644 --- a/sf_dlm_management/views/product_template_management_view.xml +++ b/sf_dlm_management/views/product_template_management_view.xml @@ -15,6 +15,7 @@ + - + - + diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index 571971bc..c1936e6d 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -148,6 +148,8 @@ class MrpProduction(models.Model): quality_standard = fields.Binary('质检标准', related='product_id.quality_standard', readonly=True) + part_name = fields.Char(string='零件名称', related='product_id.part_name', readonly=True) + @api.depends('product_id.manual_quotation') def _compute_manual_quotation(self): for item in self: diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 37d42b42..3125cb4b 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -228,6 +228,7 @@ class ResMrpWorkOrder(models.Model): part_number = fields.Char(related='production_id.part_number', string='零件图号') machining_drawings = fields.Binary('2D加工图纸', related='production_id.part_drawing', readonly=True) quality_standard = fields.Binary('质检标准', related='production_id.quality_standard', readonly=True) + part_name = fields.Char(related='production_id.part_name', string='零件名称') # 工序状态 process_state = fields.Selection([ diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index 71aa05f8..a96de2fc 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -777,6 +777,7 @@ class ResProductMo(models.Model): part_number = fields.Char(string='零件图号', readonly=True) machining_drawings = fields.Binary('2D加工图纸', readonly=True) quality_standard = fields.Binary('质检标准', readonly=True) + part_name = fields.Char(string='零件名称', readonly=True) @api.constrains('tool_length') def _check_tool_length_size(self): @@ -884,6 +885,7 @@ class ResProductMo(models.Model): 'machining_drawings': '' if not item['machining_drawings'] else base64.b64decode( item['machining_drawings']), 'quality_standard': '' if not item['quality_standard'] else base64.b64decode(item['quality_standard']), + 'part_name': item['part_name'], } tax_id = self.env['account.tax'].sudo().search( [('type_tax_use', '=', 'sale'), ('amount', '=', item.get('tax')), ('price_include', '=', 'True')]) diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml index 4c06c544..a271b622 100644 --- a/sf_manufacturing/views/mrp_production_addional_change.xml +++ b/sf_manufacturing/views/mrp_production_addional_change.xml @@ -97,6 +97,7 @@ + diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml index bb06fa04..7aa669bf 100644 --- a/sf_manufacturing/views/mrp_workorder_view.xml +++ b/sf_manufacturing/views/mrp_workorder_view.xml @@ -281,6 +281,7 @@ diff --git a/sf_quality/models/quality_cnc_test.py b/sf_quality/models/quality_cnc_test.py index d0301a7f..6f9d1c61 100644 --- a/sf_quality/models/quality_cnc_test.py +++ b/sf_quality/models/quality_cnc_test.py @@ -33,6 +33,7 @@ class SfQualityCncTest(models.Model): machining_drawings = fields.Binary('2D加工图纸', related='workorder_id.machining_drawings', readonly=True) quality_standard = fields.Binary('质检标准', related='workorder_id.quality_standard', readonly=True) + part_name = fields.Char(related='workorder_id.part_name', string='零件名称') def submit_pass(self): if self.test_results in ['返工', '报废']: diff --git a/sf_quality/views/quality_cnc_test_view.xml b/sf_quality/views/quality_cnc_test_view.xml index 2cfc8cda..31c21ed3 100644 --- a/sf_quality/views/quality_cnc_test_view.xml +++ b/sf_quality/views/quality_cnc_test_view.xml @@ -89,6 +89,7 @@ + diff --git a/sf_sale/models/quick_easy_order_old.py b/sf_sale/models/quick_easy_order_old.py index e974c5d4..863dc96a 100644 --- a/sf_sale/models/quick_easy_order_old.py +++ b/sf_sale/models/quick_easy_order_old.py @@ -228,6 +228,7 @@ class QuickEasyOrder(models.Model): 'quality_standard_mimetype': '', 'machining_drawings': item.machining_drawings, 'quality_standard': '', + 'part_name': '', }) # res['bfm_process_order_list'] = json.dumps(res['bfm_process_order_list']) product_id = self.env.ref('sf_dlm.product_template_sf').sudo()