diff --git a/sf_maintenance/models/sf_equipment_maintenance_standards.py b/sf_maintenance/models/sf_equipment_maintenance_standards.py
index 5bdc7956..47e7ddaf 100644
--- a/sf_maintenance/models/sf_equipment_maintenance_standards.py
+++ b/sf_maintenance/models/sf_equipment_maintenance_standards.py
@@ -19,6 +19,7 @@ class SfEquipmentSaintenanceStandards(models.Model):
num = "%04d" % m
return num
code = fields.Char(string='编码', default=get_no)
+ remark = fields.Char('备注')
maintenance_type = fields.Selection([('保养', '保养'), ("检修", "检修")], string='类型', default='保养')
name = fields.Char(string='名称')
created_user_id = fields.Many2one('res.users', string='创建人', default=lambda self: self.env.user)
@@ -26,7 +27,7 @@ class SfEquipmentSaintenanceStandards(models.Model):
maintenance_equipment_ids = fields.Many2many(
'maintenance.equipment',
'sf_maintenance_equipment_ids',
- string='设备',
+ string='适用设备',
domain="[('category_id', '=', maintenance_equipment_category_id)]"
)
@@ -42,23 +43,29 @@ class SfEquipmentSaintenanceStandards(models.Model):
if record.maintenance_type == '检修':
record.write({'overhaul_ids': [(6, 0, record.maintenance_equipment_ids.ids)]})
- @api.onchange("maintenance_standards_ids")
- def _reset_work_order_sequence(self):
- for rec in self:
- current_sequence = 1
- for work in rec.maintenance_standards_ids:
- work.sequence = current_sequence
- current_sequence += 1
+ # @api.onchange("maintenance_standards_ids")
+ # def _reset_work_order_sequence(self):
+ # for rec in self:
+ # current_sequence = 1
+ # for work in rec.maintenance_standards_ids:
+ # work.sequence = current_sequence
+ # current_sequence += 1
class SfSaintenanceStandards(models.Model):
_name = 'maintenance.standards'
_description = '维保项目'
+ _order = 'sequence'
+ sequence = fields.Integer('序号')
name = fields.Char('维保项目')
maintenance_standards = fields.Char('维保标准')
+ fault_type = fields.Selection(
+ [('电气类', '电气类'), ('机械类', '机械类'), ('程序类', '程序类'), ('系统类', '系统类')], string='类别')
equipment_maintenance_standards_id = fields.Many2one('equipment.maintenance.standards', string='设备维保标准')
maintenance_request_id = fields.Many2one('maintenance.request', string='设备维保计划')
images = fields.One2many('maintenance.standard.image', 'standard_id', string='反馈图片')
+ Period = fields.Integer('周期/频次(天)')
+ remark = fields.Char('备注说明')
class MaintenanceStandardImage(models.Model):
diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py
index 98a508eb..ef7ffc4c 100644
--- a/sf_maintenance/models/sf_maintenance.py
+++ b/sf_maintenance/models/sf_maintenance.py
@@ -44,6 +44,7 @@ class SfMaintenanceEquipment(models.Model):
overhaul_period = fields.Integer(string='预防检修频次')
overhaul_duration = fields.Float(string='检修时长')
+
overhaul_id = fields.Many2one('equipment.maintenance.standards', string='设备检修标准',
domain="[('maintenance_type','=','检修')]")
@@ -142,7 +143,7 @@ class SfMaintenanceEquipment(models.Model):
active = fields.Boolean('有效', default=True)
# 多个型号对应一个机床
machine_tool_id = fields.Many2one('sf.machine_tool', '机床')
- sf_maintenance_logs_ids = fields.One2many('sf.maintenance.logs','maintenance_equipment_id', '设备故障日志')
+ sf_maintenance_logs_ids = fields.One2many('sf.maintenance.logs', 'maintenance_equipment_id', '设备故障日志')
def name_get(self):
@@ -474,3 +475,15 @@ class SfMaintenanceEquipment(models.Model):
('sf_maintenance_type', '=', '检修')])
if not next_requests:
equipment._create_new_request1(equipment.overhaul_date)
+
+ image_id = fields.Many2many('maintenance.equipment.image', 'equipment_id', string='设备图文')
+
+class MaintenanceStandardImage(models.Model):
+ _name = 'maintenance.equipment.image'
+ _description = '设备图文展示'
+
+
+ active = fields.Boolean('有效', default=True)
+ name = fields.Char('加工能力')
+ image = fields.Binary(string='设备图文')
+ equipment_id = fields.Many2many('maintenance.equipment', 'image_id', string='设备')
\ No newline at end of file
diff --git a/sf_maintenance/models/sf_maintenance_logs.py b/sf_maintenance/models/sf_maintenance_logs.py
index 0204e676..9adf5be7 100644
--- a/sf_maintenance/models/sf_maintenance_logs.py
+++ b/sf_maintenance/models/sf_maintenance_logs.py
@@ -22,3 +22,5 @@ class SfMaintenanceLogs(models.Model):
recovery_time = fields.Datetime(string='复原时间')
fault_duration = fields.Float(string='故障时长')
note = fields.Text(string='备注')
+
+
diff --git a/sf_maintenance/security/ir.model.access.csv b/sf_maintenance/security/ir.model.access.csv
index 039583ce..f5517576 100644
--- a/sf_maintenance/security/ir.model.access.csv
+++ b/sf_maintenance/security/ir.model.access.csv
@@ -4,6 +4,7 @@ access_sf_maintenance_logs,sf_maintenance_logs,model_sf_maintenance_logs,base.gr
access_maintenance_equipment,maintenance_equipment,model_maintenance_equipment,base.group_user,1,1,1,1
access_maintenance_standards,maintenance_standards,model_maintenance_standards,base.group_user,1,1,1,1
access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,base.group_user,1,1,1,1
+access_maintenance_equipment_image,maintenance_equipment_image,model_maintenance_equipment_image,base.group_user,1,1,1,1
diff --git a/sf_maintenance/views/equipment_maintenance_standards_views.xml b/sf_maintenance/views/equipment_maintenance_standards_views.xml
index 82fbf15b..1b30b68f 100644
--- a/sf_maintenance/views/equipment_maintenance_standards_views.xml
+++ b/sf_maintenance/views/equipment_maintenance_standards_views.xml
@@ -21,14 +21,26 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -46,6 +58,7 @@
+
diff --git a/sf_maintenance/views/maintenance_logs_views.xml b/sf_maintenance/views/maintenance_logs_views.xml
index 33e22bf2..f226349f 100644
--- a/sf_maintenance/views/maintenance_logs_views.xml
+++ b/sf_maintenance/views/maintenance_logs_views.xml
@@ -34,25 +34,39 @@
sf.maintenance.logs
@@ -64,8 +78,8 @@
-
-
+
+
@@ -90,28 +104,28 @@
-
- 设备故障日志
- ir.actions.act_window
- sf.maintenance.logs
- tree,form
-
-
-
- 设备故障日志
-
-
-
+
+ 设备故障日志
+ ir.actions.act_window
+ sf.maintenance.logs
+ tree,form
+
+
+
+ 设备故障日志
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
diff --git a/sf_maintenance/views/maintenance_request_views.xml b/sf_maintenance/views/maintenance_request_views.xml
index 9c5ae694..83bd6e44 100644
--- a/sf_maintenance/views/maintenance_request_views.xml
+++ b/sf_maintenance/views/maintenance_request_views.xml
@@ -24,9 +24,11 @@
+
+
@@ -78,8 +80,16 @@