diff --git a/sf_base/security/group_security.xml b/sf_base/security/group_security.xml index 770fe378..60daf15e 100644 --- a/sf_base/security/group_security.xml +++ b/sf_base/security/group_security.xml @@ -4,12 +4,16 @@ 制造普通用户 - - 制造管理用户 - - - - + + + + + + + + + + 机床操作岗 @@ -28,7 +32,7 @@ 生产总监 - + diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py index 2e546366..a46f7f69 100644 --- a/sf_maintenance/models/sf_maintenance.py +++ b/sf_maintenance/models/sf_maintenance.py @@ -63,7 +63,7 @@ class SfMaintenanceEquipment(models.Model): else: record.equipment_maintenance_standards_ids = False - MTcode = fields.Char("编码", default=get_no) + MTcode = fields.Char("机台编码", default=get_no) created_user = fields.Many2one('res.users', string='创建人', default=lambda self: self.env.user) equipment_type = fields.Selection([('机床', '机床'), ('机器人', '机器人'), ('AGV小车', 'AGV小车'), ('检测设备', '检测设备')] , compute='_compute_category_id') @@ -74,8 +74,8 @@ class SfMaintenanceEquipment(models.Model): if record: record.equipment_type = record.category_id.equipment_type - code = fields.Char('机台号') - name = fields.Char('名称') + code = fields.Char('行业编码') + name = fields.Char('机台号') knife_type = fields.Selection( [("BT40", "BT40"), ("BT30", "BT30"), ("BT50", "BT50")], default="", string="刀把类型") @@ -154,6 +154,20 @@ class SfMaintenanceEquipment(models.Model): result.append((parameter.id, name)) return result + @api.model + def create(self, vals): + # 在创建设备之前执行一些自定义逻辑 + + vals.name = vals.MTcode + '#' + vals.type_id.name + + + equipment = super(SfMaintenanceEquipment, self).create(vals) + + # 在创建设备之后执行一些自定义逻辑 + # ... + + return equipment + # @api.constrains('rotate_speed') # def _check_rotate_speed(self): # if self.rotate_speed <= 0: diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml index 435e291c..ff0b6e73 100644 --- a/sf_maintenance/views/maintenance_views.xml +++ b/sf_maintenance/views/maintenance_views.xml @@ -52,11 +52,13 @@