From 7ec6be4681078a61474a422729c5c36b2719a884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Sat, 20 Sep 2025 19:50:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_property/models/property_meter_archives.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yuthon_property/models/property_meter_archives.py b/yuthon_property/models/property_meter_archives.py index 05933639d..4ebffe9a4 100644 --- a/yuthon_property/models/property_meter_archives.py +++ b/yuthon_property/models/property_meter_archives.py @@ -219,8 +219,8 @@ class MeterArchivesLine(models.Model): # 获取同仪表的所有明细行并按抄表日期排序 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) From d25a11a36f38c15b9283768aada5beada3c72478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Sat, 20 Sep 2025 19:50:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_property/models/property_meter_archives.py | 2 +- yuthon_property/models/property_meter_water.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yuthon_property/models/property_meter_archives.py b/yuthon_property/models/property_meter_archives.py index 4ebffe9a4..9a0030a81 100644 --- a/yuthon_property/models/property_meter_archives.py +++ b/yuthon_property/models/property_meter_archives.py @@ -212,7 +212,7 @@ 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: 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)