From cb366e44aa5250bdebd7c08432a46a73de5be848 Mon Sep 17 00:00:00 2001
From: sunjie <sunjie20081001@126.com>
Date: Fri, 8 Aug 2025 01:01:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=9B=B4=E6=96=B0=E6=B0=B4=E8=A1=A8,?=
 =?UTF-8?q?=E7=94=B5=E8=A1=A8=E6=95=B0=E6=8D=AE=202.=20=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=8A=84=E8=A1=A8=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/applet_attendance.py          |  8 +--
 .../views/maintenance_equipment_views.xml     | 68 +++++++++----------
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py
index 1772bd59e..215d40db2 100644
--- a/yuthon_hr_attendance/controllers/applet_attendance.py
+++ b/yuthon_hr_attendance/controllers/applet_attendance.py
@@ -699,10 +699,10 @@ class AppletAttendance(Controller):
         dosage = kw.get('dosage')  # 用量
         meter_type = kw.get('meter_type')
         if meter_type == 'electric':
-            model_name = 'property.electric.reading'
+            model_name = 'property.meter.archives'
             meter_type_name = '电表'
         elif meter_type == 'water':
-            model_name = 'property.water.reading'
+            model_name = 'property.meter.water'
             meter_type_name = '水表'
         else:
             return json.dumps({
@@ -710,9 +710,9 @@ class AppletAttendance(Controller):
                 'code': '400',
                 'message': f"不支持的仪表类型: {meter_type}"
             })
-        record = request.env(user=SUPERUSER_ID)[model_name].search([('code', '=', code)], limit=1)
+        record = request.env(user=SUPERUSER_ID)[model_name].search([('name', '=', code)], limit=1)
         if record:
-            record.write({'dosage': dosage})
+            record.write({'current_meter': dosage})
             message = f"成功更新{meter_type_name}用量: {code}"
         else:
             message = f"未找到{meter_type_name}记录: {code}"
diff --git a/yuthon_maintain/views/maintenance_equipment_views.xml b/yuthon_maintain/views/maintenance_equipment_views.xml
index 7d05e9c51..bd2c45d25 100644
--- a/yuthon_maintain/views/maintenance_equipment_views.xml
+++ b/yuthon_maintain/views/maintenance_equipment_views.xml
@@ -78,40 +78,40 @@
             action = records.action_generate_equipment_labels()
         </field>
     </record>
-<!--    <record id="view_maintenance_equipment_inherit_tree" model="ir.ui.view">-->
-<!--            <field name="name">maintenance.equipment.tree.inherit</field>-->
-<!--            <field name="model">maintenance.equipment</field>-->
-<!--            <field name="inherit_id" ref="maintenance.hr_equipment_view_tree"/>-->
-<!--            <field name="arch" type="xml">-->
-<!--                    <xpath expr="//tree/field[@name='name']" position="after">-->
-<!--                        <field name="mainten_state"/>-->
-<!--                        <field name="model" sting="型号"/>-->
-<!--                        <field name="equipment_number"/>-->
-<!--                        <field name="equipment_unit"/>-->
-<!--                        <field name="cost" string="原值"/>-->
-<!--                        <field name="warranty_date" string="寿命"/>-->
-<!--                    </xpath>-->
-<!--                    <xpath expr="//tree/field[@name='employee_id']" position="attributes">-->
-<!--                        <attribute name="column_invisible">1</attribute>-->
-<!--                    </xpath>-->
-<!--                    <xpath expr="//tree/field[@name='technician_user_id']" position="attributes">-->
-<!--                        <attribute name="column_invisible">1</attribute>-->
-<!--                    </xpath>-->
-<!--                    <xpath expr="//tree/field[@name='technician_user_id']" position="after">-->
-<!--                        <field name="employee_id" string="员工"/>-->
-<!--                        <field name="department_id1"/>-->
-<!--                    </xpath>-->
-<!--                    <xpath expr="//tree/field[@name='department_id']" position="attributes">-->
-<!--                        <attribute name="column_invisible">1</attribute>-->
-<!--                    </xpath>-->
-<!--                    <xpath expr="//tree/field[@name='assign_date']" position="attributes">-->
-<!--                            <attribute name="string">购入日期</attribute>-->
-<!--                    </xpath>-->
-<!--                    <xpath expr="//tree/field[@name='serial_no']" position="attributes">-->
-<!--                            <attribute name="string">资产编号</attribute>-->
-<!--                    </xpath>-->
-<!--            </field>-->
-<!--    </record>-->
+    <record id="view_maintenance_equipment_inherit_tree" model="ir.ui.view">
+            <field name="name">maintenance.equipment.tree.inherit</field>
+            <field name="model">maintenance.equipment</field>
+            <field name="inherit_id" ref="maintenance.hr_equipment_view_tree"/>
+            <field name="arch" type="xml">
+                    <xpath expr="//tree/field[@name='name']" position="after">
+                        <field name="mainten_state"/>
+                        <field name="model" sting="型号"/>
+                        <field name="equipment_number"/>
+                        <field name="equipment_unit"/>
+                        <field name="cost" string="原值"/>
+                        <field name="warranty_date" string="寿命"/>
+                    </xpath>
+                    <xpath expr="//tree/field[@name='employee_id']" position="attributes">
+                        <attribute name="column_invisible">1</attribute>
+                    </xpath>
+                    <xpath expr="//tree/field[@name='technician_user_id']" position="attributes">
+                        <attribute name="column_invisible">1</attribute>
+                    </xpath>
+                    <xpath expr="//tree/field[@name='technician_user_id']" position="after">
+                        <field name="employee_id" string="员工"/>
+                        <field name="department_id1"/>
+                    </xpath>
+                    <xpath expr="//tree/field[@name='department_id']" position="attributes">
+                        <attribute name="column_invisible">1</attribute>
+                    </xpath>
+                    <xpath expr="//tree/field[@name='assign_date']" position="attributes">
+                            <attribute name="string">购入日期</attribute>
+                    </xpath>
+                    <xpath expr="//tree/field[@name='serial_no']" position="attributes">
+                            <attribute name="string">资产编号</attribute>
+                    </xpath>
+            </field>
+    </record>
     <record id="maintain_equipment_kanban_inherit_hr" model="ir.ui.view">
         <field name="name">maintain.equipment.kanban.inherit.hr</field>
         <field name="model">maintenance.equipment</field>