!5273 !5272 添加功能

Merge pull request !5273 from 李鹏宇/dev
2025-09-20 12:00:44 +00:00
parent 5c22626cae 8705619845
commit 335fb5d683
2 changed files with 3 additions and 0 deletions
@@ -226,8 +226,10 @@ class MeterArchivesLine(models.Model):
                idx = lines.ids.index(line.id)
                if idx > 0:
                    prev_line = lines[idx - 1]
+                    line.last_read = prev_line.current_read
                    line.last_dosage = (prev_line.current_read or 0) - (prev_line.last_read or 0)
                else:
+                    line.last_read = 0.0
                    line.last_dosage = 0.0
            else:
                # 当前记录没有抄表日期，无法计算上次用量
@@ -204,6 +204,7 @@ class MeterWaterLine(models.Model):
                idx = lines.ids.index(line.id)
                if idx > 0:
                    prev_line = lines[idx - 1]
+                    line.last_read = prev_line.current_read
                    line.last_dosage = (prev_line.current_read or 0) - (prev_line.last_read or 0)
                else:
                    line.last_dosage = 0.0