diff --git a/sf_base/models/base.py b/sf_base/models/base.py index 3d5dcda5..1d8be5da 100644 --- a/sf_base/models/base.py +++ b/sf_base/models/base.py @@ -22,6 +22,7 @@ class MachineControlSystem(models.Model): code = fields.Char('编码', size=10) name = fields.Char('名称') + remark = fields.Char('备注') brand_id = fields.Many2one('sf.machine.brand', '品牌') active = fields.Boolean('有效', default=True) diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml index 6d10b4e9..52d8950f 100644 --- a/sf_base/views/base_view.xml +++ b/sf_base/views/base_view.xml @@ -452,6 +452,7 @@ + diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index bd7b1cdd..d103b6fb 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -489,6 +489,7 @@ class MachineControlSystem(models.Model): "id": item['id'], "name": item['name'], "code": item['code'], + "remark": item['remark'], 'brand_id': self.env['sf.machine.brand'].search([('code', '=', item['brand_id'])]).id, "active": item['active'],