From 6ce354b48400aa2d703de2bb0aa57ab9298e9e3f 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: Sun, 12 Oct 2025 22:13:21 +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 --- .../models/property_meter_water.py | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/yuthon_property/models/property_meter_water.py b/yuthon_property/models/property_meter_water.py index dfb79c23f..f48adc6b0 100644 --- a/yuthon_property/models/property_meter_water.py +++ b/yuthon_property/models/property_meter_water.py @@ -140,9 +140,9 @@ class MeterWaterLine(models.Model): epitope_values_id = fields.Many2one('yuthon.epitope.values', string='表位置') lessee_id = fields.Many2one('property.tenant.information', string='承租方') yuthon_property_ids = fields.Many2many('yuthon.property', string='物业信息') - last_meter = fields.Date(string='上次抄表日期', compute="_compute_last") - last_dosage = fields.Float(string='上次用量', store=True, group_operator=None, compute="_compute_last") - last_read = fields.Float(string='上次读数', store=True, group_operator=None, compute="_compute_last") + last_meter = fields.Date(string='上次抄表日期') + last_dosage = fields.Float(string='上次用量', store=True, group_operator=None) + last_read = fields.Float(string='上次读数', store=True, group_operator=None) meter_date = fields.Date(string='任务日期') current_meter = fields.Float(string='本次用量', store=True, compute="compute_meter_values", group_operator=None) @@ -206,36 +206,36 @@ class MeterWaterLine(models.Model): 'state': 'reading' }) - @api.depends('water_id', 'last_dosage', 'last_read', 'last_meter', 'current_meter', 'current_read', - 'maximum_count') - def _compute_last(self): - """ - 上次用量，读数，超标日期 - :return: - """ - for i in self: - last_id = self.env['meter.water.line'].search( - [('meter_date', '<', i.meter_date), ('water_id', '=', i.water_id.id)]).sorted('meter_date') - if last_id: - i.last_dosage = last_id[-1].current_meter - i.last_read = last_id[-1].current_read - i.last_meter = last_id[-1].meter_date - if i.current_read >= i.last_read: - i.current_meter = i.current_read - i.last_read - else: - if i.current_read != 0: - if i.maximum_count > 0: - max_value = 10 ** i.maximum_count - 1 - i.current_meter = max_value - i.last_read + i.current_read - else: - i.current_meter = 0 - else: - i.current_meter = 0 - else: - i.last_dosage = 0 - i.last_read = 0 - i.last_meter = i.meter_date - i.current_meter = 0 + # @api.depends('water_id', 'last_dosage', 'last_read', 'last_meter', 'current_meter', 'current_read', + # 'maximum_count') + # def _compute_last(self): + # """ + # 上次用量，读数，超标日期 + # :return: + # """ + # for i in self: + # last_id = self.env['meter.water.line'].search( + # [('meter_date', '<', i.meter_date), ('water_id', '=', i.water_id.id)]).sorted('meter_date') + # if last_id: + # i.last_dosage = last_id[-1].current_meter + # i.last_read = last_id[-1].current_read + # i.last_meter = last_id[-1].meter_date + # if i.current_read >= i.last_read: + # i.current_meter = i.current_read - i.last_read + # else: + # if i.current_read != 0: + # if i.maximum_count > 0: + # max_value = 10 ** i.maximum_count - 1 + # i.current_meter = max_value - i.last_read + i.current_read + # else: + # i.current_meter = 0 + # else: + # i.current_meter = 0 + # else: + # i.last_dosage = 0 + # i.last_read = 0 + # i.last_meter = i.meter_date + # i.current_meter = 0 @api.onchange('yuthon_property_ids') def onchange_lessee_id(self): From d873eb4e01c9660ac13360f84ea79644b5610e0d 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: Sun, 12 Oct 2025 22:15:12 +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_water.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yuthon_property/models/property_meter_water.py b/yuthon_property/models/property_meter_water.py index bc6058a3c..9b3ab4257 100644 --- a/yuthon_property/models/property_meter_water.py +++ b/yuthon_property/models/property_meter_water.py @@ -167,12 +167,12 @@ class MeterWaterLine(models.Model): epitope_values_id = fields.Many2one("yuthon.epitope.values", string="表位置") lessee_id = fields.Many2one("property.tenant.information", string="承租方") yuthon_property_ids = fields.Many2many("yuthon.property", string="物业信息") - last_meter = fields.Date(string="上次抄表日期", compute="_compute_last") + last_meter = fields.Date(string="上次抄表日期") last_dosage = fields.Float( - string="上次用量", store=True, group_operator=None, compute="_compute_last" + string="上次用量", store=True, group_operator=None ) last_read = fields.Float( - string="上次读数", store=True, group_operator=None, compute="_compute_last" + string="上次读数", store=True, group_operator=None ) meter_date = fields.Date(string="任务日期")