pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!5270 添加功能

Browse Source 
Merge pull request !5270 from 李鹏宇/zhou
This commit is contained in:
李鹏宇
2025-09-20 11:50:51 +00:00
committed by Gitee
parent 281ec8f953 d25a11a36f
commit 35a0dce8ba
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property/models/property_meter_archives.py
+3 -3
View File
@@ -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)
yuthon_property/models/property_meter_water.py
+3 -3
View File
@@ -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)