diff --git a/sf_base/__manifest__.py b/sf_base/__manifest__.py
index d6f8a88a..7e53ef7b 100644
--- a/sf_base/__manifest__.py
+++ b/sf_base/__manifest__.py
@@ -10,7 +10,7 @@
""",
'category': 'sf',
'website': 'https://www.sf.jikimo.com',
- 'depends': ['account', 'base', 'mrp'],
+ 'depends': ['account', 'base', 'mrp_workorder'],
'data': [
'security/group_security.xml',
'security/ir.model.access.csv',
diff --git a/sf_maintenance/models/sf_equipment_maintenance_standards.py b/sf_maintenance/models/sf_equipment_maintenance_standards.py
index ebf42b37..804a80e1 100644
--- a/sf_maintenance/models/sf_equipment_maintenance_standards.py
+++ b/sf_maintenance/models/sf_equipment_maintenance_standards.py
@@ -53,15 +53,11 @@ class SfEquipmentSaintenanceStandards(models.Model):
class SfSaintenanceStandards(models.Model):
_name = 'maintenance.standards'
_description = '维保项目'
- _order = 'sequence, id'
name = fields.Char('维保项目')
maintenance_standards = fields.Char('维保标准')
equipment_maintenance_standards_id = fields.Many2one('equipment.maintenance.standards', string='设备维保标准')
maintenance_request_id = fields.Many2one('maintenance.request', string='设备维保计划')
- cycle = fields.Integer('频次/周期')
- device_unit = fields.Char('设备单元')
- sequence = fields.Integer('序列号')
diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py
index 7ed4bbfc..a541185a 100644
--- a/sf_maintenance/models/sf_maintenance.py
+++ b/sf_maintenance/models/sf_maintenance.py
@@ -47,11 +47,6 @@ class SfMaintenanceEquipment(models.Model):
overhaul_id = fields.Many2one('equipment.maintenance.standards', string='设备检修标准',
domain="[('maintenance_type','=','检修')]")
- eq_maintenance_maintenance_standards_ids = fields.One2many('maintenance.standards', 'maintenance_request_id', string='保养标准项目',
- related='eq_maintenance_id.maintenance_standards_ids')
-
- overhaul_maintenance_standards_ids = fields.One2many('maintenance.standards', 'maintenance_request_id', string='检修标准项目',
- related='overhaul_id.maintenance_standards_ids')
@api.onchange('eq_maintenance_id', 'overhaul_id')
def _compute_equipment_maintenance_standards_ids(self):
diff --git a/sf_maintenance/models/sf_maintenance_requests.py b/sf_maintenance/models/sf_maintenance_requests.py
index 1de354fe..b7c001eb 100644
--- a/sf_maintenance/models/sf_maintenance_requests.py
+++ b/sf_maintenance/models/sf_maintenance_requests.py
@@ -25,9 +25,7 @@ class SfMaintenanceEquipmentCategory(models.Model):
if not record.equipment_maintenance_id:
record.equipment_maintenance_id = False
-
-
- maintenance_standards = fields.One2many('maintenance.standards','maintenance_request_id', string='维保标准', related='equipment_maintenance_id.maintenance_standards_ids')
+ maintenance_standards = fields.One2many('maintenance.standards','maintenance_request_id', string='维保标准')
@api.constrains('equipment_maintenance_id')
def _check_equipment_maintenance_id(self):
diff --git a/sf_maintenance/views/equipment_maintenance_standards_views.xml b/sf_maintenance/views/equipment_maintenance_standards_views.xml
index c55ce6be..82fbf15b 100644
--- a/sf_maintenance/views/equipment_maintenance_standards_views.xml
+++ b/sf_maintenance/views/equipment_maintenance_standards_views.xml
@@ -29,20 +29,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml
index 489bc5b7..3738896c 100644
--- a/sf_maintenance/views/maintenance_views.xml
+++ b/sf_maintenance/views/maintenance_views.xml
@@ -160,8 +160,6 @@
-
-