From c5078a62ed65fcb4e9deb6ad11045a1a89101257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Fri, 25 Jul 2025 08:35:16 +0800 Subject: [PATCH 1/2] 1 --- attendance_iot/models/attendance_iot_user.py | 30 ++++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/attendance_iot/models/attendance_iot_user.py b/attendance_iot/models/attendance_iot_user.py index e13455a54..a648a308b 100644 --- a/attendance_iot/models/attendance_iot_user.py +++ b/attendance_iot/models/attendance_iot_user.py @@ -19,21 +19,21 @@ class AttendanceIotUser(models.Model): _sql_constraints = [('unique','UNIQUE(attendance_iot_id,employee_id)','一台设备不允许上传相同的员工信息')] - def unlink(self): - if not self._context.get('iot_sync'): - # 下发删除信息 - iot_id = self[0].attendance_iot_id.name - # 如果是主动下发的客户,则使用 employee_id.id 作为用户的编码 - self.env['iot.message'].create([{ - 'name': '删除用户', - 'topic': f'iot/device/{iot_id}', - 'device_sn': iot_id, - 'message_data': json.dumps({ - 'cmd': 'delMultiUser', - 'user_ids': [x.iot_user_id if x.iot_user_id else f'bd{x.employee_id.mobile_phone}' for x in self] - }, ensure_ascii=False) - }]) - return super(AttendanceIotUser, self).unlink() + # def unlink(self): + # if not self._context.get('iot_sync'): + # # 下发删除信息 + # iot_id = self[0].attendance_iot_id.name + # # 如果是主动下发的客户,则使用 employee_id.id 作为用户的编码 + # self.env['iot.message'].create([{ + # 'name': '删除用户', + # 'topic': f'iot/device/{iot_id}', + # 'device_sn': iot_id, + # 'message_data': json.dumps({ + # 'cmd': 'delMultiUser', + # 'user_ids': [x.iot_user_id if x.iot_user_id else f'bd{x.employee_id.mobile_phone}' for x in self] + # }, ensure_ascii=False) + # }]) + # return super(AttendanceIotUser, self).unlink() @api.model_create_multi From 3008ab03d0cfe0ef339f3f29e3f4b1481f5c0213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Fri, 25 Jul 2025 08:50:09 +0800 Subject: [PATCH 2/2] 1 --- attendance_iot/models/attendance_iot_user.py | 4 +++- attendance_iot/views/attendance_iot_user_views.xml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/attendance_iot/models/attendance_iot_user.py b/attendance_iot/models/attendance_iot_user.py index a648a308b..a973432fb 100644 --- a/attendance_iot/models/attendance_iot_user.py +++ b/attendance_iot/models/attendance_iot_user.py @@ -14,7 +14,9 @@ class AttendanceIotUser(models.Model): company_id = fields.Many2one(related='employee_id.company_id', string="公司") id_valid = fields.Date(string="有效日期") # 从 employee_id 获取. - image_1920 = fields.Many2one('ir.attachment', string="一寸照") + image_1920 = fields.Many2one('ir.attachment', related='employee_id.avatar_image', string="一寸照") + department_id = fields.Many2one('hr.department_id', related='employee_id.department_id', string="部门") + mobile_phone = fields.Char('hr.department_id', related='employee_id.company_id', string="电话") iot_user_id = fields.Char(string='设备上用户的编码') _sql_constraints = [('unique','UNIQUE(attendance_iot_id,employee_id)','一台设备不允许上传相同的员工信息')] diff --git a/attendance_iot/views/attendance_iot_user_views.xml b/attendance_iot/views/attendance_iot_user_views.xml index f2182902c..ce4e9cf63 100644 --- a/attendance_iot/views/attendance_iot_user_views.xml +++ b/attendance_iot/views/attendance_iot_user_views.xml @@ -9,9 +9,11 @@