From 76293f5cca2c2d91ccc2bc9aebb835f76786ef32 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Mon, 21 Aug 2023 17:22:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=9Dtable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_maintenance/views/maintenance_request_views.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sf_maintenance/views/maintenance_request_views.xml b/sf_maintenance/views/maintenance_request_views.xml index c942deac..39c82384 100644 --- a/sf_maintenance/views/maintenance_request_views.xml +++ b/sf_maintenance/views/maintenance_request_views.xml @@ -21,7 +21,7 @@ - + From cd33fb9fb9862281108513e9fc8883c2304b3246 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Wed, 23 Aug 2023 10:09:47 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A4=B9=E5=85=B7=E5=9E=8B=E5=8F=B7?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/base.py | 7 +++++++ sf_base/models/fixture.py | 5 +++++ sf_mrs_connect/models/sync_common.py | 19 +++++++++++-------- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/sf_base/models/base.py b/sf_base/models/base.py index bb225b9b..02c569ba 100644 --- a/sf_base/models/base.py +++ b/sf_base/models/base.py @@ -308,6 +308,13 @@ class MachineToolType(models.Model): active = fields.Boolean('有效', default=True) code = fields.Char('编码') + def _get_ids(self, machine_tool_type_code): + machine_tool_type_ids = [] + for item in machine_tool_type_code: + machine_tool_type = self.search([('code', '=', item)]) + machine_tool_type_ids.append(machine_tool_type.id) + return [(6, 0, machine_tool_type_ids)] + class MachineToolCategory(models.Model): _name = 'sf.machine_tool.category' diff --git a/sf_base/models/fixture.py b/sf_base/models/fixture.py index db22b8d6..727f58bc 100644 --- a/sf_base/models/fixture.py +++ b/sf_base/models/fixture.py @@ -53,5 +53,10 @@ class FixtureModel(models.Model): screw_size = fields.Integer(string="螺牙大小[mm]", size=6) active = fields.Boolean('有效', default=True) + # @api.model + # def create(self, vals): + # obj = super(FixtureModel, self).create(vals) + # return obj + diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index 6c2003ff..892a2eed 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -1519,10 +1519,11 @@ class SyncFixtureModel(models.Model): "materials_model_id": self.env['sf.materials.model'].search( [('materials_no', '=', item['materials_model_code'])]).id, "driving_way": item['driving_way'], - "apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search( - [('code', '=', item['apply_machine_tool_type_code'])]).id, + "apply_machine_tool_type_ids": self.env['sf.machine_tool.type'].sudo()._get_ids( + item['apply_machine_tool_type_code']).id, "through_hole_size": item['through_hole_size'], "screw_size": item['screw_size'], + "active": item['active'], }) else: fixture_model.write({ @@ -1548,10 +1549,11 @@ class SyncFixtureModel(models.Model): "materials_model_id": self.env['sf.materials.model'].search( [('materials_no', '=', item['materials_model_code'])]).id, "driving_way": item['driving_way'], - "apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search( - [('code', '=', item['apply_machine_tool_type_code'])]).id, + "apply_machine_tool_type_ids": self.env['sf.machine_tool.type'].sudo()._get_ids( + item['apply_machine_tool_type_code']).id, "through_hole_size": item['through_hole_size'], "screw_size": item['screw_size'], + "active": item['active'], }) else: raise ValidationError("认证未通过") @@ -1599,10 +1601,11 @@ class SyncFixtureModel(models.Model): "materials_model_id": self.env['sf.materials.model'].search( [('materials_no', '=', item['materials_model_code'])]).id, "driving_way": item['driving_way'], - "apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search( - [('code', '=', item['apply_machine_tool_type_code'])]).id, + "apply_machine_tool_type_ids": self.env['sf.machine_tool.type'].sudo()._get_ids( + item['apply_machine_tool_type_code']).id, "through_hole_size": item['through_hole_size'], "screw_size": item['screw_size'], + "active": item['active'], }) else: fixture_model.write({ @@ -1628,8 +1631,8 @@ class SyncFixtureModel(models.Model): "materials_model_id": self.env['sf.materials.model'].search( [('materials_no', '=', item['materials_model_code'])]).id, "driving_way": item['driving_way'], - "apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search( - [('code', '=', item['apply_machine_tool_type_code'])]).id, + "apply_machine_tool_type_ids": self.env['sf.machine_tool.type'].sudo()._get_ids( + item['apply_machine_tool_type_code']).id, "through_hole_size": item['through_hole_size'], "screw_size": item['screw_size'], "active": item['active'], From 2ae7b2c8ecd7c7bbad84c4e9aaae092ec431df29 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Wed, 23 Aug 2023 10:28:54 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=8A=A0=E5=A4=A7=E9=86=92=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/views/base_view.xml | 22 +++++++++++----------- sf_base/views/common_view.xml | 16 ++++++++-------- sf_base/views/fixture_view.xml | 8 ++++---- sf_base/views/functional_fixture_view.xml | 4 ++-- sf_base/views/tool_views.xml | 4 ++-- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml index 88a2dd86..4e7e5290 100644 --- a/sf_base/views/base_view.xml +++ b/sf_base/views/base_view.xml @@ -41,16 +41,16 @@
-

- +

+
- +

- +

-