!5655 !5654 添加功能

Merge pull request !5655 from 李鹏宇/dev

yuthon_property/models/property_meter_archives.py

@@ -57,7 +57,10 @@ class PropertyMeterArchives(models.Model):
     def create(self, vals):
         record = super().create(vals)
         if "name" in vals and vals["name"]:
-            existing_records = self.search([("name", "=", vals["name"])])
+            existing_records = self.search([
+                ("name", "=", vals["name"]),
+                ("id", "!=", record.id)
+            ])
             if existing_records:
                 raise ValidationError(
                     f"仪表编号 '{vals['name']}' 已存在，请使用其他编号！"

yuthon_property/models/property_meter_water.py

@@ -58,7 +58,10 @@ class PropertyMeterWater(models.Model):
     def create(self, vals):
         record = super().create(vals)
         if "name" in vals and vals["name"]:
-            existing_records = self.search([("name", "=", vals["name"])])
+            existing_records = self.search([
+                ("name", "=", vals["name"]),
+                ("id", "!=", record.id)
+            ])
             if existing_records:
                 raise ValidationError(
                     f"仪表编号 '{vals['name']}' 已存在，请使用其他编号！"