From 150c40f9b1441874a83442f4d3cda063394d8764 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Fri, 11 Aug 2023 16:55:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=95=B0=E6=8E=A7?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=20name?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sf_base/models/base.py b/sf_base/models/base.py index c679ac74..3d5dcda5 100644 --- a/sf_base/models/base.py +++ b/sf_base/models/base.py @@ -21,7 +21,7 @@ class MachineControlSystem(models.Model): _description = '控制系统' code = fields.Char('编码', size=10) - name = fields.Char('名称', size=10) + name = fields.Char('名称') brand_id = fields.Many2one('sf.machine.brand', '品牌') active = fields.Boolean('有效', default=True) From ce3ffb75ae39e917a476d340089b33f94b8ade9f Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Fri, 11 Aug 2023 17:06:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0=E4=B8=A2=E5=A4=B1=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/base.py | 1 + sf_base/views/base_view.xml | 1 + sf_mrs_connect/models/sync_common.py | 1 + 3 files changed, 3 insertions(+) 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'],