diff --git a/sf_dlm/wizard/__init__.py b/sf_dlm/wizard/__init__.py deleted file mode 100644 index 2e93b759..00000000 --- a/sf_dlm/wizard/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# -*- coding: utf-8 -*- - -from . import cutting_tool_specification_wizard diff --git a/sf_dlm/wizard/cutting_tool_specification_wizard.py b/sf_dlm/wizard/cutting_tool_specification_wizard.py deleted file mode 100644 index 0f861bc6..00000000 --- a/sf_dlm/wizard/cutting_tool_specification_wizard.py +++ /dev/null @@ -1,47 +0,0 @@ -# -*- coding: utf-8 -*- - -from odoo import models, fields, api, _ -from odoo.exceptions import ValidationError -import logging - -_logger = logging.getLogger(__name__) - - -class Cutting_toolSpecificationWizard(models.TransientModel): - _name = "sf.cutting_tool.specification.wizard" - _description = u'刀具规格' - - product_id = fields.Many2one('product.template', string='产品') - cutting_tool_library_id = fields.Many2one('sf.cutting_tool.standard.library', '刀具标准库',related='product_id.cutting_tool_library_id') - - # cutting_tool_library_id = fields.Many2one('sf.cutting_tool.standard.library', '刀具标准库') - cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料') - cutting_tool_type = fields.Char(related=cutting_tool_material_id.name) - cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', '刀具类型') - brand_id = fields.Many2one('sf.machine.brand', '品牌',related=cutting_tool_library_id.brand_id) - integral_tool_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters', - 'specification_id', string='整体式刀具基本参数') - blade_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters', - 'specification_id', string='刀片基本参数') - cutter_bar_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters', - 'specification_id', string='刀杆基本参数') - cutter_head_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters', - 'specification_id', string='刀盘基本参数') - knife_handle_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters', - 'specification_id', string='刀柄基本参数') - chuck_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters', - 'specification_id', string='夹头基本参数') - cutting_speed_ids = fields.One2many('sf.cutting.speed', 'specification_id', string='切削速度Vc') - feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz', - domain=[('cutting_speed', '!=', False)]) - feed_per_tooth_ids_2 = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz', - domain=[('machining_method', '!=', False)]) - feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz', - domain=[('cutting_speed', '!=', False)]) - feed_per_tooth_ids_4 = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz', - domain=[('machining_method', '!=', False)]) - - @api.depends('cutting_tool_library_id') - def set_specification(self): - for vals in self.cutting_tool_library_id.integral_tool_basic_parameters_ids: - vals.write({'specification_id': self.id}) diff --git a/sf_dlm/wizard/cutting_tool_specification_wizard.xml b/sf_dlm/wizard/cutting_tool_specification_wizard.xml deleted file mode 100644 index fee87e2d..00000000 --- a/sf_dlm/wizard/cutting_tool_specification_wizard.xml +++ /dev/null @@ -1,266 +0,0 @@ - - - - sf.cutting_tool.specification.wizard.form.view - sf.cutting_tool.specification.wizard - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
-
-
-
- - - 刀具规格 - sf.cutting_tool.specification.wizard - form - - new - - - - -
-
\ No newline at end of file diff --git a/sf_manufacturing/wizard/cutting_tool_specification_wizard.py b/sf_manufacturing/wizard/cutting_tool_specification_wizard.py index 31a43533..c962e2f0 100644 --- a/sf_manufacturing/wizard/cutting_tool_specification_wizard.py +++ b/sf_manufacturing/wizard/cutting_tool_specification_wizard.py @@ -51,6 +51,8 @@ class Cutting_toolSpecificationWizard(models.TransientModel): self.cutter_head_basic_parameters_ids = False self.knife_handle_basic_parameters_ids = False self.chuck_basic_parameters_ids = False + self.cutting_tool_type_id = False + self.brand_id = False if self.cutting_tool_library_id: for item in self: item.cutting_tool_type_id = self.cutting_tool_library_id.cutting_tool_type_id.id diff --git a/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml b/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml index fee87e2d..03ecf43b 100644 --- a/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml +++ b/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml @@ -245,8 +245,8 @@