From 657d1bb798e6b2c2e99b933fcf5b849c91413df8 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: Wed, 15 Oct 2025 19:28:50 +0800
Subject: [PATCH] =?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 | 11 ++++-------
 yuthon_property/models/property_meter_water.py    | 15 ++++++---------
 .../views/property_meter_archives_views.xml       |  2 +-
 .../views/property_meter_water_views.xml          |  4 ++--
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/yuthon_property/models/property_meter_archives.py b/yuthon_property/models/property_meter_archives.py
index 118bd8937..404b320ef 100644
--- a/yuthon_property/models/property_meter_archives.py
+++ b/yuthon_property/models/property_meter_archives.py
@@ -68,22 +68,19 @@ class PropertyMeterArchives(models.Model):
         return record
 
     def update_epitope_values(self):
-        meter_ids = self.env["property.meter.archives"].browse(
-            self._context.get("active_ids", self._context.get("active_id"))
-        )
-        for meter in meter_ids:
-            for property in meter.yuthon_property_ids:
+        for record in self:
+            for property in record.yuthon_property_ids:
                 existing_energy = self.env["yuthon.property.energy"].search(
                     [
                         ("yuthon_property_id", "=", property.id),
-                        ("property_meter_archives_id", "=", meter.id),
+                        ("property_meter_archives_id", "=", record.id),
                     ],
                     limit=1,
                 )
                 if not existing_energy:
                     self.env["yuthon.property.energy"].create(
                         {
-                            "property_meter_archives_id": meter.id,
+                            "property_meter_archives_id": record.id,
                             "yuthon_property_id": property.id,
                         }
                     )
diff --git a/yuthon_property/models/property_meter_water.py b/yuthon_property/models/property_meter_water.py
index 85019dadf..edaa17239 100644
--- a/yuthon_property/models/property_meter_water.py
+++ b/yuthon_property/models/property_meter_water.py
@@ -69,22 +69,19 @@ class PropertyMeterWater(models.Model):
         return record
 
     def update_epitope_values(self):
-        meter_ids = self.env["property.meter.water"].browse(
-            self._context.get("active_ids", self._context.get("active_id"))
-        )
-        for meter in meter_ids:
-            for property in meter.yuthon_property_ids:
-                existing_energy = self.env["yuthon.property.water"].search(
+        for record in self:
+            for property in record.yuthon_property_ids:
+                existing_energy = self.env["yuthon.property.energy"].search(
                     [
                         ("yuthon_property_id", "=", property.id),
-                        ("property_meter_water_id", "=", meter.id),
+                        ("property_meter_archives_id", "=", record.id),
                     ],
                     limit=1,
                 )
                 if not existing_energy:
-                    self.env["yuthon.property.water"].create(
+                    self.env["yuthon.property.energy"].create(
                         {
-                            "property_meter_water_id": meter.id,
+                            "property_meter_archives_id": record.id,
                             "yuthon_property_id": property.id,
                         }
                     )
diff --git a/yuthon_property/views/property_meter_archives_views.xml b/yuthon_property/views/property_meter_archives_views.xml
index 70eaac21c..f35b85d32 100644
--- a/yuthon_property/views/property_meter_archives_views.xml
+++ b/yuthon_property/views/property_meter_archives_views.xml
@@ -8,7 +8,7 @@
                 <header>
                     <button class="oe_highlight" name="batch_reading_push" string="任务生成" type="object"/>
                     <button class="oe_highlight" name="button_archives_state" string="停用" type="object"/>
-                    <button class="oe_highlight" name="update_epitope_values" string="更新" type="object"/>
+<!--                    <button class="oe_highlight" name="update_epitope_values" string="更新" type="object"/>-->
                 </header>
                 <field name="sequence1"/>
                 <field name="number" column_invisible="1"/>
diff --git a/yuthon_property/views/property_meter_water_views.xml b/yuthon_property/views/property_meter_water_views.xml
index b52c39e79..2ab02a642 100644
--- a/yuthon_property/views/property_meter_water_views.xml
+++ b/yuthon_property/views/property_meter_water_views.xml
@@ -9,8 +9,8 @@
                     <button class="oe_highlight" name="batch_reading_water_push" string="任务生成"
                         type="object" />
                     <button class="oe_highlight" name="button_water_state" string="停用" type="object" />
-                    <button class="oe_highlight" name="update_epitope_values" string="更新"
-                        type="object" />
+<!--                    <button class="oe_highlight" name="update_epitope_values" string="更新"-->
+<!--                        type="object" />-->
                 </header>
                 <field name="sequence1" />
                 <field name="number" column_invisible="1" />