Merge branch 'develop' into feature/sf看板样式统一

2023-09-22 17:34:57 +08:00
parent d8363f2637 f42383fd10
commit 1acfefa555
8 changed files with 1 additions and 202 deletions
--- a/sf_maintenance/models/sf_maintenance.py
+++ b/sf_maintenance/models/sf_maintenance.py
@@ -14,7 +14,7 @@ class SfMaintenanceEquipmentCategory(models.Model):
    _inherit = 'maintenance.equipment.category'
    _description = '设备类别'

-    equipment_type = fields.Selection([('机床', '机床')], string='类型', default='机床')
+    equipment_type = fields.Selection([('机床', '机床'), ('机械臂', '机械臂'), ('AGV小车', 'AGV小车'), ('检测设备', '检测设备')], string='类型', default='机床')


 class SfMaintenanceEquipment(models.Model):