diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py index 048c94d3..7431d9c0 100644 --- a/sf_base/models/tool_base_new.py +++ b/sf_base/models/tool_base_new.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- from odoo import fields, models, api + + # from datetime import datetime # from odoo.exceptions import ValidationError @@ -26,32 +28,33 @@ class FunctionalCuttingTool(models.Model): # 整体式刀具型号 mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'rel_integral_model_functional_sf', - string='整体式刀具型号', domain= - [('mrs_cutting_tool_material_name', '=', '整体式刀具')]) + string='整体式刀具型号', domain= + [('mrs_cutting_tool_material_name', '=', '整体式刀具')]) # 刀片型号 mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'rel_blade_model_functional_sf', - string='刀片型号', domain= - [('mrs_cutting_tool_material_name', '=', '刀片')]) + string='刀片型号', domain= + [('mrs_cutting_tool_material_name', '=', '刀片')]) # 刀杆型号 mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model', - 'rel_cutterbar_model_functional_sf', - string='刀杆型号', domain= - [('mrs_cutting_tool_material_name', '=', '刀杆')]) + 'rel_cutterbar_model_functional_sf', + string='刀杆型号', domain= + [('mrs_cutting_tool_material_name', '=', '刀杆')]) # 刀盘型号 mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model', - 'rel_cutterpad_model_functional_sf', - string='刀盘型号', domain= - [('mrs_cutting_tool_material_name', '=', '刀盘')]) + 'rel_cutterpad_model_functional_sf', + string='刀盘型号', domain= + [('mrs_cutting_tool_material_name', '=', '刀盘')]) # 刀柄型号 mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model', - 'rel_cutterhandle_model_functional_sf', string='刀柄型号', - domain= - [('mrs_cutting_tool_material_name', '=', '刀柄')]) + 'rel_cutterhandle_model_functional_sf', + string='刀柄型号', + domain= + [('mrs_cutting_tool_material_name', '=', '刀柄')]) # 夹头型号 mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model', - 'rel_cutterhead_model_functional_sf', - string='夹头型号', domain= - [('mrs_cutting_tool_material_name', '=', '夹头')]) + 'rel_cutterhead_model_functional_sf', + string='夹头型号', domain= + [('mrs_cutting_tool_material_name', '=', '夹头')]) diameter = fields.Float('直径(mm)') tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')], @@ -95,6 +98,8 @@ class CuttingToolModel(models.Model): mrs_materials_model_id = fields.Many2one('sf.materials.model', '材料型号') # 关联刀具物料 mrs_cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料', required=True) + cutting_tool_material_type = fields.Char(related='mrs_cutting_tool_material_id.name', string='刀具物料类型', + store=True) # 关联刀具物料名称 mrs_cutting_tool_material_name = fields.Char(related='mrs_cutting_tool_material_id.name', string='刀具物料名称', store=True) diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml index ccb98a7d..4e226eb7 100644 --- a/sf_base/views/tool_views.xml +++ b/sf_base/views/tool_views.xml @@ -211,213 +211,221 @@
- - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +