diff --git a/yuthon_property/models/property_meter_archives.py b/yuthon_property/models/property_meter_archives.py index 05933639d..9a0030a81 100644 --- a/yuthon_property/models/property_meter_archives.py +++ b/yuthon_property/models/property_meter_archives.py @@ -212,15 +212,15 @@ class MeterArchivesLine(models.Model): else: record.lessee_id = False - @api.depends('current_read', 'last_read') + @api.depends('current_read', 'meter_date') def _compute_last_dosage(self): """上次用量 = 上个月的本次读数 - 上个月的上次读数""" for line in self: # 获取同仪表的所有明细行并按抄表日期排序 lines = self.search([ ('archives_id', '=', line.archives_id.id), - ('last_meter', '!=', False) - ], order='last_meter asc') + ('meter_date', '!=', False) + ], order='meter_date asc') if line in lines: idx = lines.ids.index(line.id) diff --git a/yuthon_property/models/property_meter_water.py b/yuthon_property/models/property_meter_water.py index 7aadacd38..18546e1bc 100644 --- a/yuthon_property/models/property_meter_water.py +++ b/yuthon_property/models/property_meter_water.py @@ -190,15 +190,15 @@ class MeterWaterLine(models.Model): else: record.lessee_id = False - @api.depends('current_read', 'last_read') + @api.depends('current_read', 'meter_date') def _compute_last_dosage(self): """上次用量 = 上个月的本次读数 - 上个月的上次读数""" for line in self: # 获取同仪表的所有明细行并按抄表日期排序 lines = self.search([ ('water_id', '=', line.water_id.id), - ('last_meter', '!=', False) - ], order='last_meter asc') + ('meter_date', '!=', False) + ], order='meter_date asc') if line in lines: idx = lines.ids.index(line.id)