diff --git a/sf_base/models/base.py b/sf_base/models/base.py index f62c2929..0a1face8 100644 --- a/sf_base/models/base.py +++ b/sf_base/models/base.py @@ -34,6 +34,7 @@ class MachineBrand(models.Model): name = fields.Char('名称') tag_ids = fields.Many2many('sf.machine.brand.tags', 'rel_machine_brand_tags', string='类别') image_brand = fields.Image("品牌图片") + manufacturer_model_number = fields.Char('厂家型号', size=10) active = fields.Boolean('有效', default=True) code = fields.Char('编码') diff --git a/sf_base/models/fixture.py b/sf_base/models/fixture.py index fa0972bf..06418847 100644 --- a/sf_base/models/fixture.py +++ b/sf_base/models/fixture.py @@ -7,7 +7,9 @@ class FixtureMaterial(models.Model): code = fields.Char(string='编码') name = fields.Char(string="名称", size=15) + category = fields.Selection([('零点夹具', '零点夹具')], string="类别") remark = fields.Char(string="备注") + active = fields.Boolean(string="有效", default=True) class Multi_MountingType(models.Model): @@ -17,6 +19,7 @@ class Multi_MountingType(models.Model): code = fields.Char(string='编码') name = fields.Char(string="名称", size=15) remark = fields.Char(string="备注") + active = fields.Boolean(string="有效", default=True) class FixtureModel(models.Model): @@ -29,6 +32,7 @@ class FixtureModel(models.Model): fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name') multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型") brand_id = fields.Many2one('sf.machine.brand', string="品牌") + manufacturer_model_number = fields.Char(string="厂家型号") clamping_way = fields.Char(string="装夹方式") port_type = fields.Char(string="接口类型") model_file = fields.Binary(string="3D模型图") diff --git a/sf_base/models/functional_fixture.py b/sf_base/models/functional_fixture.py index cce1d9e3..4ef466f7 100644 --- a/sf_base/models/functional_fixture.py +++ b/sf_base/models/functional_fixture.py @@ -8,6 +8,7 @@ class FunctionalFixtureType(models.Model): code = fields.Char(string='编码', readonly=True) name = fields.Char(string="名称", size=15) remark = fields.Char(string="备注") + active = fields.Boolean(string="有效", default=True) class FunctionalFixture(models.Model): @@ -17,6 +18,7 @@ class FunctionalFixture(models.Model): code = fields.Char(string='编码', readonly=True) name = fields.Char(string="名称", size=15, required=True) type_id = fields.Many2one('sf.functional.fixture.type', string="功能夹具类型", required=True) + type = fields.Char(related='type_id.name', string="功能夹具类别", store=True) zero_chuck_model_ids = fields.Many2many('sf.fixture.model', 'rel_fixture_model_zero_chuck', string="零点卡盘型号", required=True, domain=[('fixture_material_type', '=', '零点卡盘')]) @@ -36,7 +38,6 @@ class FunctionalFixture(models.Model): fixture_model_ids = [] for item in fixture_model_code: fixture_model = self.env['sf.fixture.model'].search([('code', '=', item)]) - fixture_model_ids.append(fixture_model.id) + if fixture_model: + fixture_model_ids.append(fixture_model.id) return [(6, 0, fixture_model_ids)] - - diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml index 2ddc055e..274d9d64 100644 --- a/sf_base/views/base_view.xml +++ b/sf_base/views/base_view.xml @@ -21,52 +21,47 @@ tree.sf.machine.brand sf.machine.brand - + - + + + - - form.sf.machine.brand - sf.machine.brand - -
- - -
-
- - - - - - - -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + 品牌 ir.actions.act_window sf.machine.brand - tree,form - -

- [品牌] 还没有哦!点左上角的[创建]按钮,沙发归你了! -

-

-

-
+ tree
#------------------机床型号------------------ @@ -86,7 +81,7 @@ tree.sf.machine_tool.type sf.machine_tool.type - + @@ -96,20 +91,19 @@ - + form.sf.machine_tool.type sf.machine_tool.type -
- + - + + options="{'no_create': True}"/> @@ -118,10 +112,10 @@ - + - + @@ -138,28 +132,30 @@
- + @@ -194,7 +190,7 @@ - #------------------机床类型------------------ + #------------------机床类型------------------ search.sf.machine_tool.category @@ -226,21 +222,20 @@ - - - - - - - - + + + + + + + + -
@@ -297,7 +292,8 @@
-
@@ -329,11 +325,14 @@