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()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ maintenance.equipment.tree.inherit
+ maintenance.equipment
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+ 1
+
+
+
+
+
+
+ 1
+
+
+ 购入日期
+
+
+ 资产编号
+
+
+
maintain.equipment.kanban.inherit.hr
maintenance.equipment